From d6d7e528a6efd8c29653c5c51a430480425ddba2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 2 Feb 2020 21:30:46 +0200 Subject: [PATCH 0001/1326] 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 99a23c459ed25993f717b59338f95cac368a6aaf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 2 Feb 2020 21:36:32 +0200 Subject: [PATCH 0002/1326] 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 c3c0a1c4db0a687b35721d8ac61a1209a01e48c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 15:12:48 +0200 Subject: [PATCH 0003/1326] 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 9de39fde972ccbcb6f18b1ebde0a44bcc3278bcd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:11 +0200 Subject: [PATCH 0004/1326] 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 25813f6680d42e791da57a76e89eefb87000b292 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:26 +0200 Subject: [PATCH 0005/1326] 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 5273fd2432d3bd59b05110252e214e93f3c4d3c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:21:43 +0200 Subject: [PATCH 0006/1326] 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 3b374a70d545be712c41df39438df31b4e3d34ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:23:04 +0200 Subject: [PATCH 0007/1326] 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 0e08dea809b905f7facf4b8189e94e7137553d5c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:25:15 +0200 Subject: [PATCH 0008/1326] 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 6a086f709ee3566e89b83fdfc40fb5cadbf0e9d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Feb 2020 17:25:37 +0200 Subject: [PATCH 0009/1326] 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 124325abbf00a017bee79ca917fea86ea1f3e568 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Feb 2020 17:27:58 +0200 Subject: [PATCH 0010/1326] 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 fbdb0b7a11d936132fc8fc44ddd1adfa84a1b0a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:20:41 +0200 Subject: [PATCH 0011/1326] 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 9954836be09b8584ddbed495b8ff5605989f7062 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:31:05 +0200 Subject: [PATCH 0012/1326] 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 fa36bb058cfae0da92cfaf9cf943c5b5d8bcb960 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:32:53 +0200 Subject: [PATCH 0013/1326] 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 a1c04bbb78ebc75dd15452e176854cec3034dbdb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:49:20 +0200 Subject: [PATCH 0014/1326] 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 fb4d4b2ab9955e3ff2756f3d2e98cf3b7955b83e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 00:55:58 +0200 Subject: [PATCH 0015/1326] 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 7c1efbd74c49bdb15394b3ab3cef5adc8a7dbd0d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2020 11:40:46 +0200 Subject: [PATCH 0016/1326] 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 345af1bd4a7d0dcad8111bdb4df9ae5ecf7233c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:15:07 +0200 Subject: [PATCH 0017/1326] 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 85b6ae70933d693be86a540795b3a6e3a64b5914 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:35:16 +0200 Subject: [PATCH 0018/1326] 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 49b8c9df0755c96d3552f006e9f81bf4e02b919b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 19:45:25 +0200 Subject: [PATCH 0019/1326] 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 5b31eff960a3b4cbb1183cb8cd833113429e90ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:15:16 +0200 Subject: [PATCH 0020/1326] 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 2ffe5b1cdc872c3f537f8f30d32774b03d2d2b1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:18:20 +0200 Subject: [PATCH 0021/1326] 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 a19656cb59d6d7ca83fe37787a4712d38f66c7e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 20:22:05 +0200 Subject: [PATCH 0022/1326] 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 029eceb92e44170e6c938fbb33e66e3700797c8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 21:24:50 +0200 Subject: [PATCH 0023/1326] 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 7fb89281ee5b399c79aee7cc9715c02adef365ab Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2020 23:57:30 +0200 Subject: [PATCH 0024/1326] 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 16ad69644e7f6f36ec062e90464314b61d457249 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:32:56 +0200 Subject: [PATCH 0025/1326] 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 2d843fa4292129259e05972587808ec40a2e1d51 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:42:37 +0200 Subject: [PATCH 0026/1326] 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 1627d59a24b2d7766f3fabbcc364bfba9d3fcb17 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 00:44:51 +0200 Subject: [PATCH 0027/1326] 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 78dc41b64a899def026cf29e8024c15e842debc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:11:23 +0200 Subject: [PATCH 0028/1326] 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 2afba83f047972ffd2084bb98bcd8ddf11fc8f49 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:26:00 +0200 Subject: [PATCH 0029/1326] 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 ae226bca736345eb89ff4d20e8359fd7d2725aee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:26:50 +0200 Subject: [PATCH 0030/1326] 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 3d2a507daafc3a218edb84490cdaa57184940b19 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:27:47 +0200 Subject: [PATCH 0031/1326] 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 60c7b48c59b9bdf3474a33b262ed2cbbcc867ba2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:28:41 +0200 Subject: [PATCH 0032/1326] 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 83f1de447d7fa250440810d086579db2c6649dd4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 01:32:04 +0200 Subject: [PATCH 0033/1326] 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 cf0a4ca9c952c4de5025d584465c7c3687b6f3cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Feb 2020 02:29:28 +0200 Subject: [PATCH 0034/1326] 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 57ceac9dbc9e4a57069cda2b6afb093013baa549 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 14:44:37 +0200 Subject: [PATCH 0035/1326] 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 cc44e0654a047081522dbedb1c77bacc6fc3e8e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 15:20:11 +0200 Subject: [PATCH 0036/1326] 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 37e2aad2cbdc12233619521fe281805d15a489c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:23:15 +0200 Subject: [PATCH 0037/1326] 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 f6bba18a8b423bfbd86ec43edbf57a59a07b50b8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:25:29 +0200 Subject: [PATCH 0038/1326] 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 efd7a318fb38221e7eded2701ea2a05c828cd5f7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 17:27:55 +0200 Subject: [PATCH 0039/1326] 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 cfd6385c7a284f86c6510795ae7f97541d5e3691 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 18:21:38 +0200 Subject: [PATCH 0040/1326] 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 9e03c1989f7ef5a9205e8c94c6d9d3eeefc369cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 18:22:28 +0200 Subject: [PATCH 0041/1326] 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 52666e524889d34129a183b125b646bf4879f3f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:03:07 +0200 Subject: [PATCH 0042/1326] 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 ee39c7da310caeb4ff3250de368e8480a33f431c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:03:42 +0200 Subject: [PATCH 0043/1326] 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 5d876bce724ff9beb6037840b8b9ac65e5f10110 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:09:02 +0200 Subject: [PATCH 0044/1326] 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 e2977cea92ec37cfe121dfaba95dcc6f953317e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:11:32 +0200 Subject: [PATCH 0045/1326] 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 4014bd76714c8ada6c6fe6fec402bc664bb7645b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Feb 2020 22:15:54 +0200 Subject: [PATCH 0046/1326] 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 2da55dc5bdb7462bd4c939dda742e21d1c3e04ce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:22:21 +0200 Subject: [PATCH 0047/1326] 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 dae594005d70b4841b04e22bcb3d171f885dad10 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:24:50 +0200 Subject: [PATCH 0048/1326] 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 a27e4a1fc93920d1706c1bde606ebe82f7854f26 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:27:33 +0200 Subject: [PATCH 0049/1326] 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 ecaf14ecb8e1c02505b6b8f82870b51b7c619d68 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:38:52 +0200 Subject: [PATCH 0050/1326] 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 eed7aabf01b3b2cfd088359415dfb3a1a8a0aaec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 13:52:25 +0200 Subject: [PATCH 0051/1326] 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 6649ff205cb57c7b986072c7c384d967117dde43 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:09:09 +0200 Subject: [PATCH 0052/1326] 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 1ef8f794ea391f41b54467e8cfe0cf7768e3f149 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:10:24 +0200 Subject: [PATCH 0053/1326] 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 90dcc0b6ee612f248464cc34d183e239e34337db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:12:40 +0200 Subject: [PATCH 0054/1326] 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 5ebe2facced14abf29d005b1562051a27ae20dd0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:19:53 +0200 Subject: [PATCH 0055/1326] 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 20e5f252fa82a6ab89ab63747fee28b627634925 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 15:20:46 +0200 Subject: [PATCH 0056/1326] 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 0965d9a259cad16e6ceb0e5c46d71154b988d52b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:43:57 +0200 Subject: [PATCH 0057/1326] 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 76fe9f2e6b70e59b32e29f4c061f7f0aa32216da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:45:16 +0200 Subject: [PATCH 0058/1326] 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 0b27ec5d29af2884bc92017b532316a98ec0c639 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Feb 2020 23:52:40 +0200 Subject: [PATCH 0059/1326] 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 6c11af2f2c2c53b55a6873c84bb972b4966c98d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 00:01:55 +0200 Subject: [PATCH 0060/1326] 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 7e2ada839d6203292772a899f54eea8f921e4ffd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:16:41 +0200 Subject: [PATCH 0061/1326] 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 5ee48f1ecb309ff590f79a1493d359a7fc9c1942 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:23:24 +0200 Subject: [PATCH 0062/1326] 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 07efd74874494471649216578f6caa074a4ac0c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:24:40 +0200 Subject: [PATCH 0063/1326] 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 6d6fd98060cf05f9955a0f51828cc07bb22f81e2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:26:15 +0200 Subject: [PATCH 0064/1326] 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 cab85033bbbdd92199cf8ad82f0f67a7f3bb9ae3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:28:18 +0200 Subject: [PATCH 0065/1326] 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 fa6fa78418d63d2149e1a128ed45b5b5a75c7b45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:29:49 +0200 Subject: [PATCH 0066/1326] 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 1d7b00931c9654f61a4a2ed0b43015c98b6bcf26 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Feb 2020 15:44:17 +0200 Subject: [PATCH 0067/1326] 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 90fc7f56ec36dc8b161f8cc5ff243f137002395d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 20:33:15 +0200 Subject: [PATCH 0068/1326] 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 c78f77e290c3bd04bfa97d12f519d6223b9c9511 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 22:31:51 +0200 Subject: [PATCH 0069/1326] 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 476a684319d63b730f7bae58ac6c9911c3393676 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Feb 2020 22:32:28 +0200 Subject: [PATCH 0070/1326] 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 bc80c516a98eb3a2fcf2be8c161b86012ef60e3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:29:54 +0200 Subject: [PATCH 0071/1326] 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 44c060ed43b14490353fff74e4710fd8a7ff1661 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:30:13 +0200 Subject: [PATCH 0072/1326] 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 07c7f7ce7c5caac1bef7b423b173a3d42a62d916 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:31:00 +0200 Subject: [PATCH 0073/1326] 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 eccaabea5762d245671c9d85a72f2e0d9399b885 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Feb 2020 13:31:57 +0200 Subject: [PATCH 0074/1326] 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 4990dd964500044fb633de7e55fcb84b6182c0a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Feb 2020 16:26:15 +0200 Subject: [PATCH 0075/1326] 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 cd57e22c9827a7c10dd3ef47040d0032e759c7dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:13:02 +0200 Subject: [PATCH 0076/1326] 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 5a219b0949ac0819186c944c6f3d77bf9d9cae53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:14:13 +0200 Subject: [PATCH 0077/1326] 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 4df82f90c285aad3865a6c859e0a84e3f76335aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:17:54 +0200 Subject: [PATCH 0078/1326] 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 3b09dda0a50d9c85ecc5ec92cf948acf62974f7f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 18:27:47 +0200 Subject: [PATCH 0079/1326] 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 a3de0e2713cd51df1b1899c00ecf4936978d2512 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Feb 2020 19:44:55 +0200 Subject: [PATCH 0080/1326] 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 5e247a343a5d4abefc57f29c296efb266a5899e0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 12:42:31 +0200 Subject: [PATCH 0081/1326] 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 8a0f94f8ccdb36ebc765ae1cbcea057a37249951 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:09:51 +0200 Subject: [PATCH 0082/1326] 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 917911cf77e079339b6e0c1c27361e9b8e6ad95d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:10:49 +0200 Subject: [PATCH 0083/1326] 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 db06e4e081e157341a219fd6d4771d705a0cd5ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:17:33 +0200 Subject: [PATCH 0084/1326] 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 9eb2379017b85ad9a767189a688f230f6005e719 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:20:29 +0200 Subject: [PATCH 0085/1326] 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 86fb836bb2176f3415dec3e027c6bb9faa130b38 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:43:18 +0200 Subject: [PATCH 0086/1326] 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 e72e2e45dff2487239b98f1ae30c5e1c218ffb1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:44:39 +0200 Subject: [PATCH 0087/1326] 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 a453cf59483dc53e203e6490b5833e4992466c06 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Feb 2020 13:46:37 +0200 Subject: [PATCH 0088/1326] 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 ed3ef91c56db6dfb373246d140d42d1b94610803 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:37:48 +0200 Subject: [PATCH 0089/1326] 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 f88680995d53cd3f4007f7794ff47dff4083a63d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:38:10 +0200 Subject: [PATCH 0090/1326] 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 6e324e4c6b6d209381c22e43e4427df277ff8727 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:38:33 +0200 Subject: [PATCH 0091/1326] 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 a275c099b6acd5978229f44ea79c0d1d6c3c6373 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:43:38 +0200 Subject: [PATCH 0092/1326] 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 5d031ac2497d1461328c2c8b574820803326e957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:48:34 +0200 Subject: [PATCH 0093/1326] 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 26069003d8a06e9a48d9126126c6fc3c72899c6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Mar 2020 21:49:14 +0200 Subject: [PATCH 0094/1326] 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 fde871f4104d13b452e08783846b6badbb04da9a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:29:23 +0200 Subject: [PATCH 0095/1326] 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 a2cc1c585edd7b0168350163d0f34f39aff6b6a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:30:03 +0200 Subject: [PATCH 0096/1326] 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 253cea241836988fb0ce7b83cd5be93179178e36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:30:19 +0200 Subject: [PATCH 0097/1326] 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 e1eb5a38d16cacfb080c0f843291ce97d46908f9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 13:51:13 +0200 Subject: [PATCH 0098/1326] 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 cb917178373050c49b6216750a4bbb18afaf1199 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:13 +0200 Subject: [PATCH 0099/1326] 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 b93f052019ddd4261c2fa748695a3da68c47f0fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:32 +0200 Subject: [PATCH 0100/1326] 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 35fa6f4d9c4331cab0ddb2ebfe4b564f5c191388 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 16:54:47 +0200 Subject: [PATCH 0101/1326] 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 0fca4f134242670490087a44a3b825aaa6adede1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:43:40 +0200 Subject: [PATCH 0102/1326] 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 05cc525b97ebb940d2b4545d3ce7066808a462fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:46:20 +0200 Subject: [PATCH 0103/1326] 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 09dd181a017f1b95cbc4e28fc967b3be2b47d157 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Mar 2020 17:47:06 +0200 Subject: [PATCH 0104/1326] 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 5de85b9174dc7f463931f69691922928591b3817 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 5 Mar 2020 14:04:13 +0200 Subject: [PATCH 0105/1326] 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 65a60d5cae55a588ee7465e9523c51a3f8f0d9e0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 5 Mar 2020 21:28:10 +0200 Subject: [PATCH 0106/1326] 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 57bd8a6636e9b7a9776ff261576851d25553664c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:48:16 +0200 Subject: [PATCH 0107/1326] 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 c7e86884aee648bc3849e3411af2de99e76f105d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:48:35 +0200 Subject: [PATCH 0108/1326] 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 12ec0215b7eb1f124a9630e2c3415dd60072f0d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:49:38 +0200 Subject: [PATCH 0109/1326] 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 4b5494821befbe0a0a982c4c6d0ac45efa6ac806 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Mar 2020 11:59:47 +0200 Subject: [PATCH 0110/1326] 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 223205856d1288f3803392cfb0291e070e16c1ac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:02 +0200 Subject: [PATCH 0111/1326] 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 1d60c6cc55e1b7e0ff018475e8c22c250b9710bc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:32 +0200 Subject: [PATCH 0112/1326] 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 b7ff6de76e644805c8456834feee316f6dd8f25c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:45:52 +0200 Subject: [PATCH 0113/1326] 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 3dabf533df379d2a83d189535ada378472aa2581 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Mar 2020 18:46:18 +0200 Subject: [PATCH 0114/1326] 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 34ad966e124478958a1a38447227b0a41b168ae8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:43:19 +0200 Subject: [PATCH 0115/1326] 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 c91415653426f2e7652992a3b717af178856fc15 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:43:40 +0200 Subject: [PATCH 0116/1326] 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 a2a9b9d1f9131b2e676225eeb7d3fdcfcbcb43a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:44:05 +0200 Subject: [PATCH 0117/1326] 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 cb16407646356759fb53f789b2dac31321b0c5b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Mar 2020 10:44:34 +0200 Subject: [PATCH 0118/1326] 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 1df6812cf131b9f8f7808d52e0a2626aacccfe77 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:19:55 +0300 Subject: [PATCH 0119/1326] 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 d222003be70b57588f6a61680b62a6a0dca6a9f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:00 +0300 Subject: [PATCH 0120/1326] 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 05b9ccfaa26c6e0b11b9300ea8eff001128aa272 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:16 +0300 Subject: [PATCH 0121/1326] 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 d95f12900fa7969619659b606a8e3e2e99daf64c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Mar 2020 18:21:34 +0300 Subject: [PATCH 0122/1326] 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 afd34f841166c790dc9f5c0de7ea64e986c91fb4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:30:12 +0300 Subject: [PATCH 0123/1326] 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 6d81ef9d8b49425c095d37e0b11cb40f7e7e76c1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:30:43 +0300 Subject: [PATCH 0124/1326] 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 be4be91cd499e1b6b0edad5315d71fcc5a5c5a7a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:31:11 +0300 Subject: [PATCH 0125/1326] 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 124ac1dce8a550a2ce8775e07bc8bfa29097a5ab Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:33:25 +0300 Subject: [PATCH 0126/1326] 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 ed38479befecb31c80f5311bfc55705a558ea940 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:38:39 +0300 Subject: [PATCH 0127/1326] 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 404a25c690dded71d29a5e93a2122054bbe1fc93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:39:00 +0300 Subject: [PATCH 0128/1326] 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 77952b0622ab11784f1364d5fd61c305ef274fda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Apr 2020 11:39:08 +0300 Subject: [PATCH 0129/1326] 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 2b15ddf18e8cbd658409ff062f0c452bb3495917 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:28:12 +0300 Subject: [PATCH 0130/1326] 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 8b06f68da787b2d2d93e72cca1e1569309bffd78 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:29:13 +0300 Subject: [PATCH 0131/1326] 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 fdfb45921ff12bfc789fea88cbf9348be1f8da65 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Apr 2020 13:29:53 +0300 Subject: [PATCH 0132/1326] 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 29a4de93dc853b4d5cdafc3c88f0ab992592a1b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:23:51 +0300 Subject: [PATCH 0133/1326] 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 9f5b20897c540da8eddbed7a32ee390cd0c5d05d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:24:05 +0300 Subject: [PATCH 0134/1326] 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 f089b14ec6dcc46025f20ef37242bfc0baf4b38a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Apr 2020 16:24:20 +0300 Subject: [PATCH 0135/1326] 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 5586cbc9ef5435e2273ff942ed38b773b05ed2ec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Apr 2020 13:04:36 +0300 Subject: [PATCH 0136/1326] 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 a5ae6ab883eb39927603cb66b73967d78510a261 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Apr 2020 13:44:15 +0300 Subject: [PATCH 0137/1326] 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 5e35d9e8f428efdfbc3f63ee6593d9fd840dcdaa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:23:39 +0300 Subject: [PATCH 0138/1326] 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 9a1e2a35de0857e8d039524da6eb5722237980a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:20 +0300 Subject: [PATCH 0139/1326] 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 d83921a29bc9d7b7566ba9737831850372986db5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:37 +0300 Subject: [PATCH 0140/1326] 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 6db33545c3d311a288dc1b2d257b0d6e5bcab16d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 Apr 2020 13:24:46 +0300 Subject: [PATCH 0141/1326] 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 ecd25a0d448e4c3bfdc1b453a28855f1230f8ffe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 10:27:39 +0300 Subject: [PATCH 0142/1326] 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 cf48709744d597780666f2bc636a46cc3138e2aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:36:52 +0300 Subject: [PATCH 0143/1326] 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 e7656b50bd34e881736fb3cbf2b21358969c9323 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:37:19 +0300 Subject: [PATCH 0144/1326] 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 aa9dfd099833da40918b0c47b8c474fca464b254 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 12:40:57 +0300 Subject: [PATCH 0145/1326] 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 2f3338404680b05a1eb89e5810733e1febcc1c32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 13:36:42 +0300 Subject: [PATCH 0146/1326] 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 d0264df887b70c43356370bf7ac350e7b0035298 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 13:37:25 +0300 Subject: [PATCH 0147/1326] 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 13d5c540121542f5cd54a1fa2b1c8f93f2ea1cd5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:03:21 +0300 Subject: [PATCH 0148/1326] 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 cfd8e0e9332ea8ba2762604e1f03190d412ca1f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:04:22 +0300 Subject: [PATCH 0149/1326] 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 93b7a41cc664d70d2ebb8704618113904003a8ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:38:51 +0300 Subject: [PATCH 0150/1326] 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 3d6aaee81de6321a908f0bb477eb09509a1057ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 14:44:16 +0300 Subject: [PATCH 0151/1326] 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 0e80996300e185ee4f03fef8d2377dc5b938399d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 15:05:05 +0300 Subject: [PATCH 0152/1326] 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 76cad1cb1c9a3e51552f39b6cf8e2bd52513bb40 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:34:56 +0300 Subject: [PATCH 0153/1326] 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 c62b2c98bc4c17f664c5877fdfff2582dee98fc6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:41:49 +0300 Subject: [PATCH 0154/1326] 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 cf1128622f810df24d3396e70a878afde67b8df4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 22:43:59 +0300 Subject: [PATCH 0155/1326] 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 ab5f5f7899b190fbf4a5a4be46be624911bee8d8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Apr 2020 23:28:13 +0300 Subject: [PATCH 0156/1326] 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 d003263cb6c316fbdcb2c01b360a369fde071292 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Apr 2020 13:09:11 +0300 Subject: [PATCH 0157/1326] 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 02642f9dc6861f34aa9d4a35474f71630bf06d9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Apr 2020 10:36:41 +0300 Subject: [PATCH 0158/1326] 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 b15d213ff57c0faddb27ba943c66f72f524873f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Apr 2020 10:45:33 +0300 Subject: [PATCH 0159/1326] 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 3b418809dd6d20bd1e0598cf1e29ad84e63a3a94 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:40:46 +0300 Subject: [PATCH 0160/1326] 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 f402f21cd2e4a3f45428ce35268d61c4b4f788e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:41:00 +0300 Subject: [PATCH 0161/1326] 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 8310e6943c648be0210856a19a1b0a89559f38cb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Apr 2020 13:41:09 +0300 Subject: [PATCH 0162/1326] 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 d107cf44ec60a0522c3ddf1aee35ef8b82a6fe6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Apr 2020 11:54:48 +0300 Subject: [PATCH 0163/1326] 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 3958470ab9db72cefafe690a1745f6c858ed0e3c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Apr 2020 21:51:00 +0300 Subject: [PATCH 0164/1326] 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 880145c186f6569434f2711ba809b946c6bc375f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 13:13:12 +0300 Subject: [PATCH 0165/1326] 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 3318d7504e6be86b7f3f2ce61a304569ecc90742 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:20:47 +0300 Subject: [PATCH 0166/1326] 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 58708c1e834be4c053c440d48b2d17005ef6599f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:24:34 +0300 Subject: [PATCH 0167/1326] 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 d04e13e6ddf30a46e49c504c616ded1a93b1ce6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:29:22 +0300 Subject: [PATCH 0168/1326] 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 5b1c6c49f597a4995d6fa829a6e900cf58e748cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:29:35 +0300 Subject: [PATCH 0169/1326] 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 59a80c8b2f4ea1f4f1fd064c56e5afcd8e9300e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 Apr 2020 14:30:43 +0300 Subject: [PATCH 0170/1326] 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 99b5d215c2906db5c6dbd5d231770ee31416c3fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 12:08:35 +0300 Subject: [PATCH 0171/1326] 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 1dd15d1484a99b1577d6db77550ba073ed12537c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 12:16:02 +0300 Subject: [PATCH 0172/1326] 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 fea318ad8994bb3af58669443dde5d217fbb03b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 Apr 2020 13:22:08 +0300 Subject: [PATCH 0173/1326] 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 139da63a824a4b542b2ce9f6ceed458b9dd8df83 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 May 2020 09:47:03 +0300 Subject: [PATCH 0174/1326] 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 a4edad2a049c06ac6beecd8436580ca583b2cda5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 May 2020 20:15:52 +0300 Subject: [PATCH 0175/1326] 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 5d58b35f67b067f01a1acee0870ba65ed7f26c6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 May 2020 20:18:52 +0300 Subject: [PATCH 0176/1326] 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 285a1512ccd8372444df07d6daefda40893836f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 May 2020 16:30:34 +0300 Subject: [PATCH 0177/1326] 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 10a961dfe614ed76dc123c0228d041961a24588a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 08:47:01 +0300 Subject: [PATCH 0178/1326] 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 1dd24e6dde83a9bb8c54ee003ad43c78fd5d1326 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:01:34 +0300 Subject: [PATCH 0179/1326] 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 b5de5b73f65ad5bdfdb93f82869bbbb15dce641c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:07:02 +0300 Subject: [PATCH 0180/1326] 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 d266fd979e6d99059a3eea10df2995aa29a145b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:15:18 +0300 Subject: [PATCH 0181/1326] 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 9915958ccc2d909c36a7b3ed4f708f4c8405a219 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:18:17 +0300 Subject: [PATCH 0182/1326] 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 5077ff09c6d7d3f7e280bebdd8f5b4ffe9090078 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 09:24:48 +0300 Subject: [PATCH 0183/1326] 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 038b83473891ce784a7b88fa10a40efb47f8a593 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 31 May 2020 13:12:44 +0300 Subject: [PATCH 0184/1326] 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 c7eb1ecf762cc0ff55ab0b345a6a2dc2bf32fffb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:37:48 +0300 Subject: [PATCH 0185/1326] 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 1666275218e57d04d6e5b8c9b1f57a4bad1bb04e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:38:40 +0300 Subject: [PATCH 0186/1326] 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 564af1ac5de8b4c0afd92295bfd856c4cdb088c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:48:03 +0300 Subject: [PATCH 0187/1326] 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 283b7539aa7137d441e8e4366412bcdb7c75149c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:51:02 +0300 Subject: [PATCH 0188/1326] 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 6dd6d660dfa100ca510a0be22e1729f1ffb57810 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 10:59:24 +0300 Subject: [PATCH 0189/1326] 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 af93bdf66058aee85f2d6dbe34191c592f963cca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:02:01 +0300 Subject: [PATCH 0190/1326] 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 bf870de435b1e81e029abd4aa637a0f929006b49 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:04:29 +0300 Subject: [PATCH 0191/1326] 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 a761409cefa1ba66898be31dd3dcd65a7d4f8a55 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:07:51 +0300 Subject: [PATCH 0192/1326] 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 2fe179099f63f2605dc04a7a863b120167d34e83 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:12:45 +0300 Subject: [PATCH 0193/1326] 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 27a940264b6ac0ed4aab0bcca6d2f7b2763ccd37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:21:20 +0300 Subject: [PATCH 0194/1326] 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 9d74f42f96ebc5abea5f98127ae2e173b8b058fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:26:25 +0300 Subject: [PATCH 0195/1326] 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 acd7873899c1a96829f875f9f5e76192690a5dfb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:32:36 +0300 Subject: [PATCH 0196/1326] 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 c7de6ce5c59221d1fb4d5a25c2fe824468b8a187 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Jun 2020 11:34:42 +0300 Subject: [PATCH 0197/1326] 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 794250db3b9de3986a4f5f44102b96cfef8e094a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jun 2020 15:06:09 +0300 Subject: [PATCH 0198/1326] 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 e55e17b669894a26890ad35f33adaa93a84e0ea4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jun 2020 15:28:40 +0300 Subject: [PATCH 0199/1326] 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 4821ee8e01b22d4475b969813020d60bdc4da0ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 11:21:34 +0300 Subject: [PATCH 0200/1326] 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 00ef02f104b18befd6c0cebd654d0757be38062b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 11:23:53 +0300 Subject: [PATCH 0201/1326] 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 94bfc8da66c17cb2151cbb6a3c10f36aec1c3579 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:02:51 +0300 Subject: [PATCH 0202/1326] 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 8816d19522903cf1ebeec955156f6ba58bd735a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:13:51 +0300 Subject: [PATCH 0203/1326] 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 f3ee112016ac6463d4fab1ac43d2c4382c02d4e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:14:15 +0300 Subject: [PATCH 0204/1326] 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 7a27b957fad7996297a53f8a0ddc136aa3dcd64a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:15:18 +0300 Subject: [PATCH 0205/1326] 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 8daae1002f1532c6e86117c0fcecacd4b6986965 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Jul 2020 12:17:03 +0300 Subject: [PATCH 0206/1326] 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 c0981d57817d84e1649f708e59b632b3d8d75d75 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jul 2020 11:18:16 +0300 Subject: [PATCH 0207/1326] 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 731ce88fa662fcb751800d2003608a0d260756d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:21:32 +0300 Subject: [PATCH 0208/1326] 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 543bf3be0c492bf64feb81ee22ce01cbed3ae0d5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:24:17 +0300 Subject: [PATCH 0209/1326] 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 6d4f7373140fbd024c02e33aded61307714c7ee6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:27:16 +0300 Subject: [PATCH 0210/1326] 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 24b192907e14aaf6ce4c90ff7ac65a84a08b02ce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:30:49 +0300 Subject: [PATCH 0211/1326] 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 466cf7f15d92f4ce1997c5631ab4b7757d9382d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:32:00 +0300 Subject: [PATCH 0212/1326] 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 b7cd414a41369d453b6516b537ec28ffd236e1ca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:33:26 +0300 Subject: [PATCH 0213/1326] 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 8109d3f9eac74c8d29fd469955a2b6e70e9c32f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 12:34:04 +0300 Subject: [PATCH 0214/1326] 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 82fa54bbed2496c2c38b2789ef8f54a8e39d3e66 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:00:48 +0300 Subject: [PATCH 0215/1326] 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 6bde663d0310aad1d50f3e2ce9acfc89030a062f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:36:40 +0300 Subject: [PATCH 0216/1326] 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 f348349405eb490b9983d2e7cf56155095e08064 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:45:05 +0300 Subject: [PATCH 0217/1326] 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 908cce8a3aa38a30e9e0536f22e4b2527406a718 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 13:52:37 +0300 Subject: [PATCH 0218/1326] 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 7fe16d336569cc44ef567d4a9d8800f313350ee7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:00:27 +0300 Subject: [PATCH 0219/1326] 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 1a1a829ddfecc8f5e4a710354a87ffe047bce734 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:15:50 +0300 Subject: [PATCH 0220/1326] 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 8ebf1663e3e5c01dd92911753e15ea6be36c2cbb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jul 2020 14:24:47 +0300 Subject: [PATCH 0221/1326] 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 3a8dc03148b72c8793317db7ae5684fc1e05a6f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 11:29:58 +0300 Subject: [PATCH 0222/1326] 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 b9517b4c024c0ced6030f69e937ddb336804d5d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 11:59:30 +0300 Subject: [PATCH 0223/1326] 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 ee5b40ac9da38c667ef598009750727da82da744 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 12:01:46 +0300 Subject: [PATCH 0224/1326] 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 d14f802f396cac6d8e2cb174402a2456d0a46740 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 12:03:24 +0300 Subject: [PATCH 0225/1326] 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 bfa7a1b99b8147b4c8187d3c879ebbfd5c621942 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:23:18 +0300 Subject: [PATCH 0226/1326] 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 b2afc34ea37a808cb90288e7124ccf1ce41c76b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:27:17 +0300 Subject: [PATCH 0227/1326] 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 0666124f401152b639eaf5aebe2eaae5b1f849e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:28:02 +0300 Subject: [PATCH 0228/1326] 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 eb0505c848da18fdd5381ab1c0f82278ecb5cd23 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:32:27 +0300 Subject: [PATCH 0229/1326] 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 1abd2a40a33ae8ddd462b90b0bd98d0004df6dfe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 13:45:12 +0300 Subject: [PATCH 0230/1326] 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 eafb70c69e4d240dd6185aadf2602d3cdfe17bc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 14:03:41 +0300 Subject: [PATCH 0231/1326] 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 52a3ff6fda4aee729a1481563b553daf1a587cdd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 Jul 2020 14:04:53 +0300 Subject: [PATCH 0232/1326] 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 1249e2731f7116d55b0cefb09f34984093417b5d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Jul 2020 16:08:30 +0300 Subject: [PATCH 0233/1326] 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 b2f5ca123c04f11de538dc37b78635e61a2a1420 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Aug 2020 00:56:21 +0300 Subject: [PATCH 0234/1326] 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 8ab3e18ac6eddfa8aa9c03f21ba85b72300316e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:26:58 +0300 Subject: [PATCH 0235/1326] 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 bf52dbe408cf1bbf539bb394096bf55b0fa446ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:27:31 +0300 Subject: [PATCH 0236/1326] 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 1108939904f910066c6ba805453e0e6a1b247e8c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Sep 2020 23:28:06 +0300 Subject: [PATCH 0237/1326] 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 d7cc370c5b9caf77f3979894c0edf8dba9325334 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Oct 2020 20:38:15 +0300 Subject: [PATCH 0238/1326] 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 5ad2dff0650f86da07b66511f90d29eecfe027c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Oct 2020 11:53:27 +0300 Subject: [PATCH 0239/1326] 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 6da8cff4cae206c925e7b30f5bb94cb13a15e0ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Oct 2020 12:31:03 +0300 Subject: [PATCH 0240/1326] 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 14968517ceefa8f9e7a7c7eb1d7834d13fe60627 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Oct 2020 17:21:24 +0300 Subject: [PATCH 0241/1326] 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 954c08f2d02c240b315e08c22e2a3d84e71db10a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Oct 2020 23:03:43 +0300 Subject: [PATCH 0242/1326] 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 377e745ca7205522f999aaeddcf09dc34bdb76e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:27:35 +0200 Subject: [PATCH 0243/1326] 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 ce2bfc821df73686e90aed7aa1a651bdd3abf1ec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:27:52 +0200 Subject: [PATCH 0244/1326] 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 18bb002436a84ed61b55928cba328fd6125aba9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 12:30:01 +0200 Subject: [PATCH 0245/1326] 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 5dee3fd36b08f83738ffb1e48c5994167719e628 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 13:01:43 +0200 Subject: [PATCH 0246/1326] 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 8381065d02136f968f3ba4ec13b6f552e535eec7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 14:05:58 +0200 Subject: [PATCH 0247/1326] 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 6c7a10e1f0f8d5ca4ae129598161e0c6f819c303 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Oct 2020 14:07:26 +0200 Subject: [PATCH 0248/1326] 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 cfc0dfdfbd2d35e9332b7e2346b68f1bd1fd308b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Nov 2020 17:43:18 +0200 Subject: [PATCH 0249/1326] 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 a48f147daeaaa754a479b25057fcf835dd3e5d96 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Nov 2020 11:50:40 +0200 Subject: [PATCH 0250/1326] 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 7bf992b40996487e2eaf16678a881f15fe0ce0d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Nov 2020 18:34:29 +0200 Subject: [PATCH 0251/1326] 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 9f44d02ed66b26007a62a3e3cee4a351c65ed9dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 20 Nov 2020 00:23:02 +0200 Subject: [PATCH 0252/1326] 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 f81ffb448084071c6424714ecb0dabdfba6748c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 13:02:03 +0200 Subject: [PATCH 0253/1326] 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 c8afa83400be74b1005e2d540dae2d65c8cabe36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 13:23:01 +0200 Subject: [PATCH 0254/1326] 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 6df6755198d2cd6b59e5b126eb3b4cc35694ee96 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 14:52:26 +0200 Subject: [PATCH 0255/1326] 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 d78c648118fabb207dd132dc2b3a4050533c00ca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 14:55:13 +0200 Subject: [PATCH 0256/1326] 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 a636b35727f9ac5d7bf1c511fbe43225b5fd711e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:36:35 +0200 Subject: [PATCH 0257/1326] 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 4f1b4b54d3d65685ae0a79933e5229b75405d863 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:36:57 +0200 Subject: [PATCH 0258/1326] 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 4bdd1ca610e436b687883c6107a5707a11204a79 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:37:58 +0200 Subject: [PATCH 0259/1326] 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 fc01fdc58395219397bb362bc79b6af1407aa797 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:57:41 +0200 Subject: [PATCH 0260/1326] 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 34f56ecda5fca93244ec556786b9cba12f37863c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 15:59:54 +0200 Subject: [PATCH 0261/1326] 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 cdcdad9e338f850cac1c95449eb0e708440a9be0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 21 Nov 2020 17:41:44 +0200 Subject: [PATCH 0262/1326] 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 91836193e71b988dfd137b06953589e70ada4b1d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 24 Nov 2020 19:48:51 +0200 Subject: [PATCH 0263/1326] 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 bf10ef8645217cfc6dee2300a73912b1663fa030 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 25 Nov 2020 10:06:19 +0200 Subject: [PATCH 0264/1326] 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 979861cd6b16dcb106f6d0813a2fb69fa0da660b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 25 Nov 2020 10:19:18 +0200 Subject: [PATCH 0265/1326] 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 106d651980a524d9d2eabd125aaee0fab6ad7085 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Dec 2020 18:03:30 +0200 Subject: [PATCH 0266/1326] 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 cf6d03573b2fab71303caaff497fee5c2e88403b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Dec 2020 20:33:43 +0200 Subject: [PATCH 0267/1326] 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 784ee8526eaeaa67d22fd6493473a304832a43f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Dec 2020 10:41:08 +0200 Subject: [PATCH 0268/1326] 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 6fe85ac768a2d67ddc452e4cd31de2ffe5787d92 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:36:01 +0200 Subject: [PATCH 0269/1326] 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 da8bc2153fcc9f1861470dc6bf2f5e19503c8f0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:37:14 +0200 Subject: [PATCH 0270/1326] 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 e25601f71ed745e4f43570faecd4d3d87e9ad293 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:39:02 +0200 Subject: [PATCH 0271/1326] 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 5749b6bc597970a84b07023c82409bd357fa5627 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 11:44:07 +0200 Subject: [PATCH 0272/1326] 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 d5b3c28e8df43fe38ad28d7f5b3f98b05a0b9e73 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:43:17 +0200 Subject: [PATCH 0273/1326] 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 8b3c279ee239787a8d13503593677ee3bfd7ac87 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:49:29 +0200 Subject: [PATCH 0274/1326] 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 266bb5e575683ce2e4d973d649a30ad4e6e6b87c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 12:52:08 +0200 Subject: [PATCH 0275/1326] 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 0c11135ed9e1572f148e494b6a0b5236b70a4b2f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Dec 2020 14:48:53 +0200 Subject: [PATCH 0276/1326] 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 576e6a255b9a8bb1d10cf18f04c96f06f98cc41f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 16:55:23 +0200 Subject: [PATCH 0277/1326] 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 36ba76894446781602b5f8c8fead6b168da9e54e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 16:56:06 +0200 Subject: [PATCH 0278/1326] 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 23365905c8a9f00843407245e0040d0366bc4731 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Dec 2020 19:00:08 +0200 Subject: [PATCH 0279/1326] 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 62fb238425d7154b1c6609ee328a29b7fc56bb32 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 17:07:24 +0200 Subject: [PATCH 0280/1326] 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 0a138f5c615e27dc475d8367a4e7582e7a05cbc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 18:06:56 +0200 Subject: [PATCH 0281/1326] 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 b29400e51980b7339a074d44a0a2360a1b289235 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Dec 2020 21:32:24 +0200 Subject: [PATCH 0282/1326] 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 9115ab83d54830e3c9a2f63438628b03de061892 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Dec 2020 00:03:06 +0200 Subject: [PATCH 0283/1326] 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 9fef0b7dede7c936fe2a1a54f7621c576a886ebe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Dec 2020 00:08:23 +0200 Subject: [PATCH 0284/1326] 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 f0a539efab4f4baa84f7b5cf087c145f864a7b58 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 20 Dec 2020 12:05:48 +0200 Subject: [PATCH 0285/1326] 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 996436c1cdefc02296bd5f2e928b444f932dc327 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 20 Dec 2020 15:34:07 +0200 Subject: [PATCH 0286/1326] 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 3a451f753809d8f053a5a8cdc885fd199277d4ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 10:59:03 +0200 Subject: [PATCH 0287/1326] 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 6cba0b727d9360763974aed73520e82c2277707b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:05:49 +0200 Subject: [PATCH 0288/1326] 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 9cf26407064a0531fb0258b710ab914fbe85e2e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:11:53 +0200 Subject: [PATCH 0289/1326] 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 f7fe7f92407b95820621f107dc5804bbc8cc21f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:46:44 +0200 Subject: [PATCH 0290/1326] 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 cf1359f6ba42fbf3642c1bf8c5a85eec62498a50 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 11:49:03 +0200 Subject: [PATCH 0291/1326] 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 b7e1f224d308d69538a92adf4631355195bea1f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Dec 2020 14:39:12 +0200 Subject: [PATCH 0292/1326] 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 e8fddc9938466bd45d8afde350ecfa47ba31f37c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 30 Dec 2020 10:58:25 +0200 Subject: [PATCH 0293/1326] 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 f8252e440183b59e52cb71d3c41dbdb80b646b4b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 13:47:13 +0200 Subject: [PATCH 0294/1326] 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 52d85bc160439ae61f3d70983b68a7658f9910e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 13:51:59 +0200 Subject: [PATCH 0295/1326] 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 a7b48d6b9cdf79dd8cc7cc571f3de05953fff583 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Jan 2021 14:03:30 +0200 Subject: [PATCH 0296/1326] 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 48c865b7066b62cb0f2ffb5a4ed281a626251fec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Jan 2021 21:34:03 +0200 Subject: [PATCH 0297/1326] 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 8754b128dbee00bb55b930a84ba0264051329587 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Jan 2021 22:10:35 +0200 Subject: [PATCH 0298/1326] 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 5148815f423a3788eb53c0411c4049bc5152b30c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Jan 2021 22:14:56 +0200 Subject: [PATCH 0299/1326] 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 8500294bf77a928a2dc5ab6794ef5d5bb3699696 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:08 +0200 Subject: [PATCH 0300/1326] 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 5a04ce912a03ec0ccc8258c4455de6d6ab114513 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 11:47:26 +0200 Subject: [PATCH 0301/1326] 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 78d5eddfc158006030bc1a6bbcaf43004744e5ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 12:14:05 +0200 Subject: [PATCH 0302/1326] 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 8268daeb9b95773d5f5e4dcaf37aa88f08ef1ee8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:40:57 +0200 Subject: [PATCH 0303/1326] 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 10aff5d999c165dfecfac63d2824ca47bd30c131 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Jan 2021 13:41:25 +0200 Subject: [PATCH 0304/1326] 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 60188ea0d31bf02693a75f91fee188ccbf1b655f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:07:38 +0200 Subject: [PATCH 0305/1326] 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 0306/1326] 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 c1762007fc7cd0a41677152e670bb21c42394179 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:10:24 +0200 Subject: [PATCH 0307/1326] 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 31edb64dbbb2aad476b722d3527096639e845a9f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:13:33 +0200 Subject: [PATCH 0308/1326] 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 dfd5b5082ca7096936c6e3523e339d2e67d37b8a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 12:14:40 +0200 Subject: [PATCH 0309/1326] 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 a1cf3d89434b214f3d7cf0c5b8e27e16c4f34278 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:24:45 +0200 Subject: [PATCH 0310/1326] 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 479c072fc5e3063915e99736b956a8cdcded93f6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:26:46 +0200 Subject: [PATCH 0311/1326] 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 2254c618c46cfc01fff170e3a1501bdfe8004155 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:30:24 +0200 Subject: [PATCH 0312/1326] 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 0107d1c4defa1db50789b9b41b8526338d882399 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:32:34 +0200 Subject: [PATCH 0313/1326] 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 8978b8c328ee43eaa28520fed2cfa26030a61880 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:46:00 +0200 Subject: [PATCH 0314/1326] 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 b055113c390c9eb5cd1c56a25d8098e3ccf94a8a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:50:35 +0200 Subject: [PATCH 0315/1326] 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 aa3ab82769e28d1bd8b81a659d0491702a54c2f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Jan 2021 14:58:54 +0200 Subject: [PATCH 0316/1326] 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 fdadd3671fd591dda08f65c72e72d27172033be7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Jan 2021 18:40:44 +0200 Subject: [PATCH 0317/1326] 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 6f64e8296c391d10f199d457b7d03db59fb17e8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:22:45 +0200 Subject: [PATCH 0318/1326] 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 c9674bc9ad930c79f6ef76c8e895820cc73d4cd9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:23:00 +0200 Subject: [PATCH 0319/1326] 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 26e09764538d9858c22f8808822d4f999e035424 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 11:46:02 +0200 Subject: [PATCH 0320/1326] 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 7bd5b0b9e71faec67bce73c515dcb2d7fc362698 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 30 Jan 2021 12:18:54 +0200 Subject: [PATCH 0321/1326] 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 1ea8ff0cdd91cda853388dc17008dc28b8f7738c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Feb 2021 22:05:52 +0200 Subject: [PATCH 0322/1326] 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 776945ac7009b96f5490738f10161617f2547dca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 10 Feb 2021 17:59:26 +0200 Subject: [PATCH 0323/1326] 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 0632f9e75e1ccae82f36805f0c544856db816ee4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Feb 2021 17:24:26 +0200 Subject: [PATCH 0324/1326] 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 977bf2de1d1c7c2ee12a508d242bff709e73555c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Feb 2021 17:25:18 +0200 Subject: [PATCH 0325/1326] 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 13f7c3dd4d0f7dbdb55e909b7becbeeba99c584d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Feb 2021 19:06:24 +0200 Subject: [PATCH 0326/1326] 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 6fe89e101667619e371d09960425c44b028d0af9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Feb 2021 19:06:35 +0200 Subject: [PATCH 0327/1326] 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 24dd62e0aa4300fb4d0d9914b966fd2356eb84f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Feb 2021 17:06:27 +0200 Subject: [PATCH 0328/1326] 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 2775d4183059998f7793cb5d963595fd34d20959 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 17:47:10 +0200 Subject: [PATCH 0329/1326] 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 c31598ccb01c5c563b306b483b552c887c514e19 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:18:09 +0200 Subject: [PATCH 0330/1326] 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 1c345857bf0fb0367dca10da90765145e6c0a801 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:29:40 +0200 Subject: [PATCH 0331/1326] 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 bc3e5550742160848305beefbd5e7f6745928a3d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:54:26 +0200 Subject: [PATCH 0332/1326] 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 49ad3bb40c397e9f6c89353d041f4a137f864b81 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 18:54:50 +0200 Subject: [PATCH 0333/1326] 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 0334/1326] 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 233c31601957509a6a4777c7390381a943569684 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Feb 2021 19:05:53 +0200 Subject: [PATCH 0335/1326] 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 0336/1326] 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 828b889625c02396725b9f19a23135be54eb65a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:49:51 +0200 Subject: [PATCH 0337/1326] 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 9b68f61d88deae6bcddec7a0212cc9bc80c8969c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:49:59 +0200 Subject: [PATCH 0338/1326] 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 798d849e6e21150f99f7621c6a79cc7d78eec6fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 11:53:19 +0200 Subject: [PATCH 0339/1326] 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 c0044a88e3352b4c8a87a1e52de67ed595f59db5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Feb 2021 12:28:19 +0200 Subject: [PATCH 0340/1326] 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 7cc75c912d097689ecb46711c5e27aade4c4df31 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Mar 2021 20:47:47 +0200 Subject: [PATCH 0341/1326] 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 87fd6fed1aa149466112c322a55a636246e8c6b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Mar 2021 18:43:52 +0200 Subject: [PATCH 0342/1326] 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 9e0adbc3c5ab57e70b4871b4bd7c45786f88d04f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Mar 2021 12:50:10 +0200 Subject: [PATCH 0343/1326] 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 f00b0d9a3703127bd9e34b40c1bc9b164c151123 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Mar 2021 12:50:41 +0200 Subject: [PATCH 0344/1326] 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 afa761e3df361d5e55aa80e064a6e64ea32da37c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Apr 2021 21:02:47 +0300 Subject: [PATCH 0345/1326] 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 a7fd9883e3f107ec8b925ea57b74594bde1e41a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Apr 2021 10:42:33 +0300 Subject: [PATCH 0346/1326] 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 02afcbc241e02d12caaecb09c1421dfeb30050c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:17:45 +0300 Subject: [PATCH 0347/1326] =?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 87d442cf262c3353f95818f6fc00281c62779d42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:19:14 +0300 Subject: [PATCH 0348/1326] 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 326941dcf844fef6ad86d0df2076482d0fa46af7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:19:41 +0300 Subject: [PATCH 0349/1326] 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 30ffb809cd9243c95055bb20ef61151fd6f2872e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:20:21 +0300 Subject: [PATCH 0350/1326] 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 57f60ce7e2de27de512e66a23378bb0a8f6562fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:20:55 +0300 Subject: [PATCH 0351/1326] 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 240f18b25a13c143fadfe37a790f809a11a5cc89 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:21:19 +0300 Subject: [PATCH 0352/1326] 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 8fd0c78fe0eca7177d6e33d937bd0c1ee5bee671 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Apr 2021 20:22:23 +0300 Subject: [PATCH 0353/1326] 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 30a2ef11ffa98ed9035713ee0cb643957faa62f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Apr 2021 17:15:30 +0300 Subject: [PATCH 0354/1326] 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 2f1317359c917722c2ef15356e228094d573da18 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Apr 2021 17:46:54 +0300 Subject: [PATCH 0355/1326] 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 a2b19f120a46d1fd0c365ddbfed31c04edeac515 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Apr 2021 18:00:22 +0300 Subject: [PATCH 0356/1326] 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 5d13d202c0876cab5ecbfa813f97bf57c967abc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Apr 2021 18:35:03 +0300 Subject: [PATCH 0357/1326] 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 570435b227e14d7fc852e71566a8a6e398e95fc0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 May 2021 12:06:36 +0300 Subject: [PATCH 0358/1326] 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 19c7cb93ca42da735c8291c508e89dd12d9f50a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 May 2021 09:03:12 +0300 Subject: [PATCH 0359/1326] 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 d3c14c0ef7c51f86f55ace532f898a9245c2af58 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 May 2021 09:03:34 +0300 Subject: [PATCH 0360/1326] 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 af2950badcbd77b011bfc5df4def136999d385e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 10 Jun 2021 10:14:42 +0300 Subject: [PATCH 0361/1326] 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 64fc8d9c0da9063bbd3177a5efdead83c7d1937f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Jun 2021 10:53:35 +0300 Subject: [PATCH 0362/1326] 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 a64d1345ee27a4e0d24e4e268f92fcaf910c13d5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Jun 2021 10:55:55 +0300 Subject: [PATCH 0363/1326] 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 e778278a7245a56e9504433c3635fa74809bb5c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Jun 2021 13:04:58 +0300 Subject: [PATCH 0364/1326] 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 08e1e091113bb40f39014740b06c803f8446aa09 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Jun 2021 13:05:17 +0300 Subject: [PATCH 0365/1326] 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 f404f5c758b29753f2869263c1dd92bc99699d95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Jul 2021 13:11:21 +0300 Subject: [PATCH 0366/1326] 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 aa7280dac28bc9a4f087ad7722b43dacfcdfa398 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Jul 2021 13:11:29 +0300 Subject: [PATCH 0367/1326] 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 e67f95431e9ed38cc533e626179b8b96292b01bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:28:34 +0300 Subject: [PATCH 0368/1326] 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 6d1ed94046ed42f32c0d920c63486b9fc58dc225 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:28:57 +0300 Subject: [PATCH 0369/1326] 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 881c8afadc7464677fdf39dc962c7cb3d465a05b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:29:14 +0300 Subject: [PATCH 0370/1326] 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 80728aa90fbac1f3931e873c14826f3324d7b9fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Jul 2021 11:29:24 +0300 Subject: [PATCH 0371/1326] 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 5764bcc6cbc4750ee9ddc478ee5cb5407d8bf52b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Jul 2021 12:11:27 +0300 Subject: [PATCH 0372/1326] 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 18074cde8bdd66d15c4f89b3e6718acfb29e944b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 09:18:40 +0300 Subject: [PATCH 0373/1326] 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 3bd0ce5af72addaa399a6c2af7824e3c9d087fd0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 10:28:11 +0300 Subject: [PATCH 0374/1326] 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 24f4d3fc423599d9699f281bce8de65903e59cb8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jul 2021 10:28:21 +0300 Subject: [PATCH 0375/1326] 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 ec490c0d32d6e6831e4d2b85de0775ef85a72c03 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 29 Jul 2021 22:41:28 +0300 Subject: [PATCH 0376/1326] 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 924cc4f80737bbe4bd0befe8f923147590e1845f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Aug 2021 12:03:39 +0300 Subject: [PATCH 0377/1326] 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 9cdd992f20c442564cc4d93afc62327c70d4d4b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:22:24 +0300 Subject: [PATCH 0378/1326] 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 9d4cea56a4eab277cb4c2ff32a94f2092095c9a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:22:54 +0300 Subject: [PATCH 0379/1326] 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 b4f2b570605b27b4ab9cd59002703f25f34f7b24 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:25:20 +0300 Subject: [PATCH 0380/1326] 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 95a99aa1bfcf4b05357d1588347cafdcf9663817 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:33:23 +0300 Subject: [PATCH 0381/1326] 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 55187f9675c361abf979d8af405fdea6f486acd7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 8 Aug 2021 15:41:23 +0300 Subject: [PATCH 0382/1326] 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 bbad1c4253de48f3cdc3618243c4ba8ed2ef917a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 10 Aug 2021 11:31:19 +0300 Subject: [PATCH 0383/1326] 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 3ea614cc214c6ff62923c3b8b1820cde2f0e2002 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 12 Aug 2021 09:37:45 +0300 Subject: [PATCH 0384/1326] 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 cb3ef3651576f5207767380d6f986db19c0ccdb6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:30:50 +0300 Subject: [PATCH 0385/1326] 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 ff7e505a60ca90c421002489d6dd9f4a4f3e4424 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:32:37 +0300 Subject: [PATCH 0386/1326] 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 f6cf8443e4d0c48acbd21296065ab3ffbe96eada Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:33:11 +0300 Subject: [PATCH 0387/1326] 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 b55b6468d1cd394e30aaf9017522c9d30af29ebd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 22:33:24 +0300 Subject: [PATCH 0388/1326] 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 b301ede52aa64720d487e55bd00dd73b0a2e98ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 16 Aug 2021 23:05:32 +0300 Subject: [PATCH 0389/1326] 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 e5d07324a5cc13cbbe40c08a9dfefde1619ab77e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 17:41:52 +0300 Subject: [PATCH 0390/1326] 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 9d3972a54a70715b25f8578ae47b73ee415c3ad5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 17:43:30 +0300 Subject: [PATCH 0391/1326] 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 270a580e8ec49938d15f1251cc81147d7e1b0463 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 19:17:38 +0300 Subject: [PATCH 0392/1326] 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 0f653f785f5c1534b1028924f7181284ed19cf9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 19:36:11 +0300 Subject: [PATCH 0393/1326] 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 02508766494e48c6f8977e35cdd94e09c4cdd781 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 20:32:46 +0300 Subject: [PATCH 0394/1326] 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 da9abb7282280752329080a75a2579ecc0d253b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 20:54:45 +0300 Subject: [PATCH 0395/1326] 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 b6b878e461b4d154365fd5343f78b4e58c182cbd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 21:02:58 +0300 Subject: [PATCH 0396/1326] 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 a824b29e717f6646cac08cb74498eef362d26bd1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 21:26:05 +0300 Subject: [PATCH 0397/1326] 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 c3dd70706cdc3a1730a9b0c832f69f1c8bd4a79b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 Aug 2021 22:36:48 +0300 Subject: [PATCH 0398/1326] 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 80fb138fc14ea61edd5322aa947547b94f00715a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:29:44 +0300 Subject: [PATCH 0399/1326] 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 21c0c53c95086a0d90232a9f7760c36aa440b528 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:30:09 +0300 Subject: [PATCH 0400/1326] 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 bdf01fdae1673d2274e3d25ad41932d64a8c13ce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:30:21 +0300 Subject: [PATCH 0401/1326] 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 58a7a64346d351d4cadc1ed300f9140f70e2594b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 09:31:32 +0300 Subject: [PATCH 0402/1326] 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 cd62b162b8827d42d43cd100947c5200549fc953 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 14:17:19 +0300 Subject: [PATCH 0403/1326] 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 e18f384d4189c78ff496c87de7962c4c756bc0db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Aug 2021 21:20:20 +0300 Subject: [PATCH 0404/1326] 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 34ec6271729fdedcb279d34ebd9f5b64f83a7ecb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:32:40 +0300 Subject: [PATCH 0405/1326] 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 e32190aa3018974e101f2f0731f6ef2590b5b1d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:33:15 +0300 Subject: [PATCH 0406/1326] 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 0370e045b94b4926387ed1316be6929322bd604d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:34:40 +0300 Subject: [PATCH 0407/1326] 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 d1b217a506b02ec38c21637a17e08b6eec7ab7e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 11:36:58 +0300 Subject: [PATCH 0408/1326] 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 859e9b66987dcffe3f5f851d3be7835953c266f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:10:14 +0300 Subject: [PATCH 0409/1326] 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 21a89943de5b528a043e774c4970c46cc76af891 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:11:05 +0300 Subject: [PATCH 0410/1326] 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 f750d718fa926d10801ff513e1831a4b9da1f0bc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:16:06 +0300 Subject: [PATCH 0411/1326] 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 c67776feb9edafbb56ab943aa554ce9c33f10f79 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:23:07 +0300 Subject: [PATCH 0412/1326] 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 6b2755f1aecb3c0fc3126e1f80477f88f11c02e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 22 Aug 2021 19:50:35 +0300 Subject: [PATCH 0413/1326] 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 bb848dc70f16ca5c20fda94ae2ee3177eb000ed9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:08:27 +0300 Subject: [PATCH 0414/1326] 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 1afe0f59cf5f037a341ff2de41315f56419fe7ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:08:38 +0300 Subject: [PATCH 0415/1326] 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 e94a2ed26b4f640803bef2949e557f45163287ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Aug 2021 16:10:01 +0300 Subject: [PATCH 0416/1326] 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 d0d51f9ea6126b6d02e4b20fe49b889259003ed1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Aug 2021 16:41:57 +0300 Subject: [PATCH 0417/1326] 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 d2e54b7ef5cfbab2eec24cdf17d57e19fa3a39d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Aug 2021 16:42:06 +0300 Subject: [PATCH 0418/1326] 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 d7ce6319b46ca9107f6e6e9d9a952a798ea2c810 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Sep 2021 15:16:18 +0300 Subject: [PATCH 0419/1326] 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 f8b538e2757c4c040e16597667877a46101fb229 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Sep 2021 15:45:13 +0300 Subject: [PATCH 0420/1326] 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 33460617b7425b9f7c787fc05ebcbdb64c4951c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Sep 2021 13:22:04 +0300 Subject: [PATCH 0421/1326] 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 00df564e7777b298acfe53bc03103479c353877c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Sep 2021 13:22:19 +0300 Subject: [PATCH 0422/1326] 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 85b6500c194898bafe9f77e6e4dee18b567d2462 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Sep 2021 18:04:08 +0300 Subject: [PATCH 0423/1326] 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 c6639a94919df46325461313ae667d3d01e36d9b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Sep 2021 18:19:54 +0300 Subject: [PATCH 0424/1326] 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 fcc5cc64de25afa21db1e7df76a17194a80415cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 Sep 2021 13:01:34 +0300 Subject: [PATCH 0425/1326] 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 fe6dbaaa601fa73cd01e55326216dbb29fc51f16 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 16:31:09 +0300 Subject: [PATCH 0426/1326] 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 cff0adb487ed7e9c9d46866404a190b39c60f2b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 16:31:28 +0300 Subject: [PATCH 0427/1326] 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 027049acedc84e813b91a5c9d883ea726c7244fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 19:08:11 +0300 Subject: [PATCH 0428/1326] 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 77c42375cac533368c9c15283af2bb7c0cd01e5d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 20:55:50 +0300 Subject: [PATCH 0429/1326] 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 36d787125675c49c75e05880f65101b4963f3ae7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 21:26:24 +0300 Subject: [PATCH 0430/1326] 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 cad211b2f89bfda13ade12c3c4cac499581c4d6b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Oct 2021 21:37:23 +0300 Subject: [PATCH 0431/1326] 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 945c76548addc3ff5e9db7ef1d03a09272c85022 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 16 Oct 2021 10:59:23 +0300 Subject: [PATCH 0432/1326] 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 3b085c6187b9e1832013132f40b03a73ca57504d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:20:08 +0200 Subject: [PATCH 0433/1326] 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 143a3c0e8513623d566c0bb5b86f7d54941fe950 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:20:28 +0200 Subject: [PATCH 0434/1326] 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 8782924ac5a8c89d3fc6c6a6f3b797ed095d3315 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:25:05 +0200 Subject: [PATCH 0435/1326] 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 42abc35be531a95f206cb2343fbd32ed9deec478 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Nov 2021 10:21:51 +0200 Subject: [PATCH 0436/1326] 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 574807279abad3a2faaa0c08d43b633a856e6fe9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:39:58 +0200 Subject: [PATCH 0437/1326] 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 81a21eab7718315ff0b93e91fd359c214d794aea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:40:11 +0200 Subject: [PATCH 0438/1326] 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 c2f4868930b3dc839c8389ba4aaa7854922ead8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:43:52 +0200 Subject: [PATCH 0439/1326] 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 69b09d2604c435a3638f23394eb82bd7595b18fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 12:55:32 +0200 Subject: [PATCH 0440/1326] 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 662e63dfb37021d9c63f91052309bf501c63f72e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Nov 2021 13:07:50 +0200 Subject: [PATCH 0441/1326] 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 855b95e542a767c599f318f6905f30b58ab4452b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 19 Nov 2021 19:23:25 +0200 Subject: [PATCH 0442/1326] 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 1a8fbdccf7c8972f2d76bb794609332c37d3a8c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:12:58 +0200 Subject: [PATCH 0443/1326] 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 bb12b93d0903d223ae4717224ed71673918efd08 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:30 +0200 Subject: [PATCH 0444/1326] 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 32a7755325c5d2e15aac19ff3b7f5496762b835d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:39 +0200 Subject: [PATCH 0445/1326] 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 f1719ac87a9ba99181d251d35eaae26d98a4ab81 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 12:13:59 +0200 Subject: [PATCH 0446/1326] 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 82aff6d99c2f21106395a1b2fdc1522e321caf92 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 15:32:02 +0200 Subject: [PATCH 0447/1326] 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 8a92f7da5f3cea6963455a2ed9e4499354afd7de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 15:33:27 +0200 Subject: [PATCH 0448/1326] 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 e5ae761829a7b0aae43de2ff0e182e53d07020b9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 17:09:32 +0200 Subject: [PATCH 0449/1326] 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 308b43adcdc2ed0028ccc63cf389234a4b8b1898 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Nov 2021 18:43:09 +0200 Subject: [PATCH 0450/1326] 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 3702e129860bd1de29edc018ea54ce348b5b78f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Nov 2021 19:49:27 +0200 Subject: [PATCH 0451/1326] 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 5f84ac78a3d92345c65a67f4d7dabf07cac1292f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 17:18:15 +0200 Subject: [PATCH 0452/1326] 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 65c6c66dc84079fba0b0c1a6a037c57bfaa9cda7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 17:19:23 +0200 Subject: [PATCH 0453/1326] 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 91b671057e4a160df296a8938dae006949f95276 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Nov 2021 18:19:36 +0200 Subject: [PATCH 0454/1326] 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 68393225eeadf721c96edb7aa90c53f1ef73c64c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 10:25:59 +0200 Subject: [PATCH 0455/1326] 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 453efbd4ec23c2266ed3c3865dc77fbd2ede2d85 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 10:27:32 +0200 Subject: [PATCH 0456/1326] 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 f44300cb33efb06f1e368af959a0c01e0225efc8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:36:31 +0200 Subject: [PATCH 0457/1326] 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 70c2f6831873022707d8689a280bc127093fbab6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:37:16 +0200 Subject: [PATCH 0458/1326] 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 8b7a8f13e965ca7e9d53e90b65059e6792b8db3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 27 Nov 2021 17:37:31 +0200 Subject: [PATCH 0459/1326] 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 c2ff13e6f70519dc794b307e4359f48cdc87c9c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Nov 2021 16:19:53 +0200 Subject: [PATCH 0460/1326] 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 62e3e6d8583246678e4c6d7b7a6722ff0f303123 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 16:56:15 +0200 Subject: [PATCH 0461/1326] 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 1b669c06fc7ac6f085ca75f4c809337a19d2b911 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:07 +0200 Subject: [PATCH 0462/1326] 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 0931c0b2e48f5e4ff7a615bbef6b7874d25f2810 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:23 +0200 Subject: [PATCH 0463/1326] 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 f6c715be637e0f57cb30295f2fb9fa7f3a6afa0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:36:37 +0200 Subject: [PATCH 0464/1326] 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 67610fa7e8e6f9549fbc208b0849e08ce40a9049 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:37:43 +0200 Subject: [PATCH 0465/1326] 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 6573316fba9a0067c6cd2a5153c67a50210e6afb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Nov 2021 17:38:54 +0200 Subject: [PATCH 0466/1326] 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 bf1c9234e2a0284489b7c6beffe6c34bcc3bef68 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 09:30:27 +0200 Subject: [PATCH 0467/1326] 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 f0b03ebd137e789afcebd8ec12ca22255a69fa7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 09:32:42 +0200 Subject: [PATCH 0468/1326] 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 4aeaf540b7c1d051a7a4a46104b4c0ac66a410c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 3 Dec 2021 20:13:12 +0200 Subject: [PATCH 0469/1326] 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 432ee57180fb6151eb13d51e4a11c150114df934 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 4 Dec 2021 11:43:26 +0200 Subject: [PATCH 0470/1326] 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 eead44d29e448273b3916d423b9e2fab684b4e5f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Dec 2021 16:38:50 +0200 Subject: [PATCH 0471/1326] 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 71582b9bdf17a457e44938a350335a15cfc56633 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Dec 2021 16:43:56 +0200 Subject: [PATCH 0472/1326] 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 2b20c0e4f76f4ef2a22b1f6caf1a8ce864e6a573 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:12:24 +0200 Subject: [PATCH 0473/1326] 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 c7bdd8a74065bad87c88a0be5e92af30e22de505 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:12:45 +0200 Subject: [PATCH 0474/1326] 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 0052ea28f8c5163b3ae6966403e9b6d908f8c957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:13:32 +0200 Subject: [PATCH 0475/1326] 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 5411c2f5e72f05076dcf176e1d0587a1b16a95d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Dec 2021 00:19:49 +0200 Subject: [PATCH 0476/1326] 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 34e9c50de8f34cc642f0087b7e87db38af8f5401 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 6 Jan 2022 12:47:07 +0200 Subject: [PATCH 0477/1326] 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 8427208a2aefd360bd4b0e81a6a16b051a8f8879 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 6 Jan 2022 12:53:18 +0200 Subject: [PATCH 0478/1326] 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 02f546deb51d526fbd204274df54a1621cf84e59 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 15 Jan 2022 12:31:34 +0200 Subject: [PATCH 0479/1326] 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 6b79ec86f886769ea566ad01d0c7002d531f96c2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 15 Jan 2022 12:32:28 +0200 Subject: [PATCH 0480/1326] 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 fe04b45973b2748c7a3682d9edf3d163703cd235 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Jan 2022 14:37:56 +0200 Subject: [PATCH 0481/1326] 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 b1007062bee1b77662400a7955fd4f070c83ccb2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Jan 2022 14:38:02 +0200 Subject: [PATCH 0482/1326] 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 8b0bc829a2bc8f4b343ce408025764121fc07108 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Feb 2022 16:42:52 +0200 Subject: [PATCH 0483/1326] 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 495f8dd9190c24e70696c6cf2b7edea9138ca050 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Feb 2022 16:43:13 +0200 Subject: [PATCH 0484/1326] 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 0e97eb8fbdd242e33e7eed30509a3907b5ed7452 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 3 Feb 2022 11:12:23 +0200 Subject: [PATCH 0485/1326] 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 ca071c11d164812dff469a3e74bf1ddff9054ae9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 3 Feb 2022 11:26:12 +0200 Subject: [PATCH 0486/1326] 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 de043c126a087fe11a8cd2a519a88985d128070e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:55:29 +0200 Subject: [PATCH 0487/1326] 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 64de63a92ab8b2da45e8cf5587cdc03d47213cc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:56:33 +0200 Subject: [PATCH 0488/1326] 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 848d3899d9cc7c1f08618adbd986effc428044e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Feb 2022 19:56:50 +0200 Subject: [PATCH 0489/1326] 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 ee401aacb9c959ded749a526896a3849d3cece93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Feb 2022 10:12:39 +0200 Subject: [PATCH 0490/1326] 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 efbc653977c3480ef045fc9e1d1a55941206aefc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Feb 2022 22:12:49 +0200 Subject: [PATCH 0491/1326] 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 4f2c3b5e7e1ca98f9333de3f6c2326fd474fc015 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Feb 2022 11:24:36 +0200 Subject: [PATCH 0492/1326] 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 de518419ce3dd9554ab259e944505cbebb30a89c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Feb 2022 17:14:42 +0200 Subject: [PATCH 0493/1326] 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 c14bf488c4911f2805b8634d6cfe4318ac05119e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 17:27:30 +0200 Subject: [PATCH 0494/1326] 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 d695658146205c0f3b11f3c937390fd5bcd9f7b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 17:27:49 +0200 Subject: [PATCH 0495/1326] 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 9e0399fbedb6c31964e2f52463adfa36f22c461f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 18:08:59 +0200 Subject: [PATCH 0496/1326] =?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 347b6c1f50da50b6536d1258ce82d97c9ef35fff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Feb 2022 18:10:37 +0200 Subject: [PATCH 0497/1326] 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 c8c3cf39492112239520673b915e21e336ffe923 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 11:30:35 +0200 Subject: [PATCH 0498/1326] 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 7ad76e5ba774153bfd95d14b0ea0fc148911fb62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 11:31:38 +0200 Subject: [PATCH 0499/1326] 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 e93b6a99fd3a16cbb85805936bcdf24d5d7b8b35 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 12:16:04 +0200 Subject: [PATCH 0500/1326] 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 8aaa911e199c2cf579bc502d467abe59b8089cb5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:18:03 +0200 Subject: [PATCH 0501/1326] 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 d793734621f19f59f1348005e37697c01277823b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:25:54 +0200 Subject: [PATCH 0502/1326] 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 853dbf724ab472dec199939d31399f4961ceb643 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 13:51:51 +0200 Subject: [PATCH 0503/1326] 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 1745422371aab3d05b7c4b3b2d53a34814b2e3b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 26 Feb 2022 14:00:39 +0200 Subject: [PATCH 0504/1326] 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 034580ebdaf1ae9d7222dd051a714ebb51c1f042 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:31:05 +0200 Subject: [PATCH 0505/1326] 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 901bccab0d0afc891ed3b69d375ac97116e2a814 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:37:46 +0200 Subject: [PATCH 0506/1326] 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 7b13a37d2b5622dc39ecd4c59b1ebcb7a4ae4b4e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 17:50:32 +0200 Subject: [PATCH 0507/1326] 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 57955894165980d5b97c89a9eee7d2c4190c620c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 18:00:05 +0200 Subject: [PATCH 0508/1326] 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 277f6c0120f3096f2e1433d6103272930377350e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 19:23:18 +0200 Subject: [PATCH 0509/1326] 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 894ee7c2dd351e88309e717930c37c8771033fa5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 19:54:45 +0200 Subject: [PATCH 0510/1326] 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 05fb156293eb00d3e5e9f015650cd009c10969f8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 20:19:11 +0200 Subject: [PATCH 0511/1326] 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 687e9942666c1739ffa035f0eb3e2954eda4be1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 23:15:00 +0200 Subject: [PATCH 0512/1326] 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 8f10c4cf0cd6a1da1b97de239a5b5db30614d16f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Mar 2022 23:16:25 +0200 Subject: [PATCH 0513/1326] 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 c7ea081db8644b169e27c110226596f3594f907d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 5 Mar 2022 08:38:19 +0200 Subject: [PATCH 0514/1326] 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 ea1a4a130a6d0a163827f522a1a3b7e1a4262f8a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:13:34 +0200 Subject: [PATCH 0515/1326] 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 b3841fec56ec3497f849c96418567aac170a95b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:14:02 +0200 Subject: [PATCH 0516/1326] 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 c19fab21b3b12a0036627ef771b199d6f8661374 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Mar 2022 18:14:21 +0200 Subject: [PATCH 0517/1326] 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 662491e11a3b14b673722a9d8fcde591c0cd88b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 18:40:44 +0200 Subject: [PATCH 0518/1326] 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 0929a5d356fcf9f2df94f3a3e83227d5fd0bb201 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 22:25:23 +0200 Subject: [PATCH 0519/1326] 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 6e1b1e6e1b609506438035989383bc0e6d81649c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Mar 2022 22:25:37 +0200 Subject: [PATCH 0520/1326] 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 3f6dfe393dfd1347fbebb552c70f24ef7ef0a7dd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:23:53 +0200 Subject: [PATCH 0521/1326] 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 b00c5cb72555e854d8800a26839658edc016e36b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:24:01 +0200 Subject: [PATCH 0522/1326] 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 befa0180f9706171a16cdc07ef645d2bf29f78f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:24:15 +0200 Subject: [PATCH 0523/1326] 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 2e58dde61012a6dfa20650a998c5e16b69d41f00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Mar 2022 08:26:29 +0200 Subject: [PATCH 0524/1326] 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 b8e593b4660d458bb7ad3f3061de6efe98854678 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Mar 2022 18:44:59 +0200 Subject: [PATCH 0525/1326] 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 687199810c27b0a0527bcea0e0440d9c029b8c63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 23 Mar 2022 23:08:30 +0200 Subject: [PATCH 0526/1326] 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 d79a88870a832225865acc48c8d0740157daf2c4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 10:26:23 +0200 Subject: [PATCH 0527/1326] 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 2229cf8cf288bc0ab9a18eea879690fe8fbae8ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 12:19:29 +0200 Subject: [PATCH 0528/1326] 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 cfc9ac3abebfd8004de121c5bdbdad391845c700 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:29:33 +0200 Subject: [PATCH 0529/1326] 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 d5d5aeb8468ab6e3c6d525bdd13f48ac95c0a84e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:30:24 +0200 Subject: [PATCH 0530/1326] 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 cf6f338737dd119cf73a69f9e21038a98ffc9974 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:32:02 +0200 Subject: [PATCH 0531/1326] 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 d9201743d92ef566c7df8269ee205ab144ff0766 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:33:22 +0200 Subject: [PATCH 0532/1326] 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 bd6baa981318c591e714131c7f032cbf148570e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 15:35:11 +0200 Subject: [PATCH 0533/1326] 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 59399c376e827c224951a66028b7f8258f3cb4e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 21:03:57 +0200 Subject: [PATCH 0534/1326] 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 9bc5c5c70fe155e1d06bc3ede0d7bac87596b1d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 24 Mar 2022 22:14:12 +0200 Subject: [PATCH 0535/1326] 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 fc3ca78d895d546cd51cd9b49e4d639e1d61c157 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Mar 2022 18:09:30 +0200 Subject: [PATCH 0536/1326] 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 d7bb322417ff876c30931d7f489fe25f832ef5ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 28 Mar 2022 15:42:00 +0300 Subject: [PATCH 0537/1326] 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 c141a867a94212d585aa3b3929e3a969ce144d21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:00:50 +0300 Subject: [PATCH 0538/1326] 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 af41ce5fc99c80dbd1ae9d0735a429302155e61e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:02:07 +0300 Subject: [PATCH 0539/1326] 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 e87aabba1ddbbded8e0739ba828cb06e47cbf256 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 29 Mar 2022 23:05:30 +0300 Subject: [PATCH 0540/1326] 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 db0c4ac401b3646ff73746627b6632b88e025da5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:15:17 +0300 Subject: [PATCH 0541/1326] 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 55ca4721fb0184b8979a3774179d11148c5c42e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:15:40 +0300 Subject: [PATCH 0542/1326] 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 b6c3651c8c1fd8552bf8b470a9ccee8691d7f9e2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:16:45 +0300 Subject: [PATCH 0543/1326] 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 65f8f5f1dccd2ee88e3a9be69ae1a21e95420165 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:16:57 +0300 Subject: [PATCH 0544/1326] 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 175d906fe1e359173f610eecf9f82fc062c8f4a7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 13:28:26 +0300 Subject: [PATCH 0545/1326] 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 f9798c3dae6f5f9d4998042620ef3d16a37d8f96 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 14:21:26 +0300 Subject: [PATCH 0546/1326] 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 af64a8b08d54d4a197d31b9e71577f0cb14de84e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 10 Apr 2022 14:23:59 +0300 Subject: [PATCH 0547/1326] 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 294032a79a43d64b2f69a4b166907baf19f7fd9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Apr 2022 15:52:25 +0300 Subject: [PATCH 0548/1326] 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 c96240e2690cf22853fff9e89f839d52ca66d48e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 14 Apr 2022 10:57:51 +0300 Subject: [PATCH 0549/1326] 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 f629ee960f309a3f0eb4f6b9f0db8510d1d870b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Apr 2022 23:23:53 +0300 Subject: [PATCH 0550/1326] 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 756041b63fbad8e79aa5fb942ceeaac1dc59b3c4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Apr 2022 23:26:36 +0300 Subject: [PATCH 0551/1326] 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 cf60df7dddfee501056fdc6e74a9c793f4a31a48 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Apr 2022 15:26:48 +0300 Subject: [PATCH 0552/1326] 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 bcbda7ec987de3e3abaa19635c0c99ff52e480b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Apr 2022 15:27:05 +0300 Subject: [PATCH 0553/1326] 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 77c5a93d603dad0eb3866f209d511cf9483c7d9c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Apr 2022 09:09:26 +0300 Subject: [PATCH 0554/1326] 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 ca059fcb8cbd85df61971f6dbdb48d1839cb6f27 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Apr 2022 09:09:43 +0300 Subject: [PATCH 0555/1326] 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 bcbd819cdb57e9013b99bd845d72299ae9cc37bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Apr 2022 09:49:47 +0300 Subject: [PATCH 0556/1326] 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 bf0c005444fd566833ecb33a69efc73782b5befd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Apr 2022 09:50:18 +0300 Subject: [PATCH 0557/1326] 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 ff359ffee9696bfdd0b71400b6aea7aacd7a1677 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Apr 2022 19:30:41 +0300 Subject: [PATCH 0558/1326] 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 785ab635d0d611af2834388ebf07a6d6681c4550 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 26 Apr 2022 13:45:16 +0300 Subject: [PATCH 0559/1326] 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 df65e0b783a7e9780517aa688ad65cccefcb6577 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 6 May 2022 13:32:32 +0300 Subject: [PATCH 0560/1326] 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 fcbeb8b7cfc9e646d729d55cf8a4985c5f597ed9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 17 May 2022 15:20:01 +0300 Subject: [PATCH 0561/1326] 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 b8460b5ae4a2693102de8b891bd1b3b49bb0ced6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 29 May 2022 09:57:26 +0300 Subject: [PATCH 0562/1326] 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 875f1cae6a924e3db83341a0609170953329e174 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 29 May 2022 10:39:22 +0300 Subject: [PATCH 0563/1326] 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 ca56b6d9a12ad19dd56093cb1d269274462bba63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 May 2022 17:04:21 +0300 Subject: [PATCH 0564/1326] 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 fb9bb347da542972a409efcfc0bcce9f332349b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 May 2022 17:08:07 +0300 Subject: [PATCH 0565/1326] 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 2fa242c8b1cdf967fd3ca390c19d9efaa5850cdc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 15:55:45 +0300 Subject: [PATCH 0566/1326] 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 06cb90d61356b9c2d607ac41ad72ee5d50e7ba94 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:25:44 +0300 Subject: [PATCH 0567/1326] 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 3b6c015a0d19b058057ab8a7b8a164c6d40388a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:34:06 +0300 Subject: [PATCH 0568/1326] 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 4f67d03bee18ec5df6110e3068547ac432d309ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Jun 2022 22:34:35 +0300 Subject: [PATCH 0569/1326] 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 9cdd87fbd3520d50b44dad6acd43276a8cb9c571 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jun 2022 10:29:43 +0300 Subject: [PATCH 0570/1326] 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 a9ae55911557901b7ec0ec50513ce0d0c5b8cd1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Jun 2022 20:17:56 +0300 Subject: [PATCH 0571/1326] 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 772b9510cc640b87da5bf2eb1a44acc4cfae042e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:13:05 +0300 Subject: [PATCH 0572/1326] 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 b42171c2c2beb55dd955a5ea4c32572018e8d8d8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:14:35 +0300 Subject: [PATCH 0573/1326] 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 dc353672e4543d8c19011ce855d67828c8b13d88 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 19:58:15 +0300 Subject: [PATCH 0574/1326] 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 a8a86778c4aaf3835cd5cb5eb20c501c13013ff1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Jun 2022 23:33:21 +0300 Subject: [PATCH 0575/1326] 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 a1bbcd7da19fb08b257f86ae4cc1bd6d758f0754 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Jun 2022 18:27:37 +0300 Subject: [PATCH 0576/1326] 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 7e8e8d4a4d66dbb2e48de5182cd640f6fd864057 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Jun 2022 10:03:37 +0300 Subject: [PATCH 0577/1326] 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 12215b5c0f97dfe06c9973f318c4089db361d4d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Jun 2022 09:07:26 +0300 Subject: [PATCH 0578/1326] 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 4275764c80dfd49ab0b930c3541f65b4fcd4d4b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 30 Jun 2022 19:19:21 +0300 Subject: [PATCH 0579/1326] 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 9264b9c3ef9c8468c7246433a4d1a2f02c5f2ee1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Jul 2022 22:37:35 +0300 Subject: [PATCH 0580/1326] 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 053f4bb39a4b4392e3edae34f2bdeaaefa4c54f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Jul 2022 22:37:56 +0300 Subject: [PATCH 0581/1326] 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 b8a89ed59e3651889c33496013aaf984b6762954 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 14:57:05 +0300 Subject: [PATCH 0582/1326] 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 0dd8c5c44de3dc32579cec261ca788d5aa02a657 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 15:07:50 +0300 Subject: [PATCH 0583/1326] 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 99adba52d38345de8ab2f4b6af352cd02616271f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 25 Jul 2022 16:23:26 +0300 Subject: [PATCH 0584/1326] 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 69cabe05e5ab9b6d3f3d0f64159d7e53a7a841b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Aug 2022 11:15:30 +0300 Subject: [PATCH 0585/1326] 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 c0d8b72f0ef13561b51e7a08e551b6e9ddb01e47 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 Aug 2022 17:12:18 +0300 Subject: [PATCH 0586/1326] 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 60375ed18a3d5417dceb33ace84635b8cee614d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Aug 2022 09:41:20 +0300 Subject: [PATCH 0587/1326] 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 8fe76f19c0aadfd864ae9de341cbb59a54c80425 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Aug 2022 09:47:44 +0300 Subject: [PATCH 0588/1326] 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 2a0b4dd306c78879c05cfa93b323b63e636201f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Aug 2022 09:37:38 +0300 Subject: [PATCH 0589/1326] 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 5e277ce5602f7b8d3c8087c733cf0236ac9ceb62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Aug 2022 09:38:06 +0300 Subject: [PATCH 0590/1326] 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 b5e3c8097567480bf188d582e62e71ad1efbcf67 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Aug 2022 12:18:43 +0300 Subject: [PATCH 0591/1326] 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 a15643e686ab8c9ba6037268a95612f3ff45cfbd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Aug 2022 12:19:48 +0300 Subject: [PATCH 0592/1326] 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 cac76497fe0a9b88747e5febc9e1c92627511efa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 Aug 2022 14:32:07 +0300 Subject: [PATCH 0593/1326] 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 0d1d7dc09d683fb3515f3c328624cd5b7690ac42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Aug 2022 23:53:18 +0300 Subject: [PATCH 0594/1326] 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 81639311835ffe1bac14d546ffcc3aa40e9c0265 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 00:36:32 +0300 Subject: [PATCH 0595/1326] 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 dcd00e7b9857fd6b3fb79378fce300bb25722f01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 19:41:22 +0300 Subject: [PATCH 0596/1326] 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 c578871998f9fc30e6e161c05f3a04b9fd7a33b0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 20:36:32 +0300 Subject: [PATCH 0597/1326] 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 e89683ff771345fe2b9d4fbb1f5b703c81488882 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 14 Aug 2022 20:38:38 +0300 Subject: [PATCH 0598/1326] 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 2a6196c2f7f499b2d275e7188f4ce517dfec1338 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Aug 2022 13:52:10 +0300 Subject: [PATCH 0599/1326] 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 27fb6f64a3892e41d6aefc2db853368f55af0ae2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 16 Aug 2022 20:43:44 +0300 Subject: [PATCH 0600/1326] 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 0a14b90d3dd55170b8120d314123976117b9b6a8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:28:02 +0300 Subject: [PATCH 0601/1326] 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 13a6ab2293ac1eb0d0e23162969143e19780b723 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:28:28 +0300 Subject: [PATCH 0602/1326] 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 eb93f02f6666dac5423645b9b1081bcd6df19e6c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:36:26 +0300 Subject: [PATCH 0603/1326] 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 914df5f4366e9bbeb0382287dc62c89381f651ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 14:41:50 +0300 Subject: [PATCH 0604/1326] 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 6523521f4827804601070c6041f5a59529820012 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:37:52 +0300 Subject: [PATCH 0605/1326] 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 d4b172e203634600dd901c3f833f72ef96bd7462 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:39:27 +0300 Subject: [PATCH 0606/1326] 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 31ab7306c03897e10f979502582a14828e752a45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:41:14 +0300 Subject: [PATCH 0607/1326] 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 8daff27305a4ea9fca1ed2b08bc7eeebe3916c9a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:44:39 +0300 Subject: [PATCH 0608/1326] 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 481f32d82e45369810e64056298467310f6a7db0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:45:14 +0300 Subject: [PATCH 0609/1326] 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 d4a8a624e891dc0790c17b9854c00911de38f775 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:46:24 +0300 Subject: [PATCH 0610/1326] 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 95af23121009b8c5eca1b94b6e37b28fd7fb10b3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 21:57:49 +0300 Subject: [PATCH 0611/1326] 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 0e39efb2cf22290a3a0f8610047bc0e3c770d975 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Aug 2022 22:02:56 +0300 Subject: [PATCH 0612/1326] 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 fa625e50c90aedcacfd451722d042070fc9f8eb6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Aug 2022 10:01:59 +0300 Subject: [PATCH 0613/1326] 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 23d573ea6dc0101d03b019267d60bf8c5af03b49 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Aug 2022 13:09:26 +0300 Subject: [PATCH 0614/1326] 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 3138316af809748ba23a0b83ec35880963a24a05 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 14:34:12 +0300 Subject: [PATCH 0615/1326] 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 1b277bf8875acf0e16debbf40ecd8eb3ebd14bc0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 14:57:24 +0300 Subject: [PATCH 0616/1326] 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 9e5df50795a98628d94b9ccab79fca438304f755 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Aug 2022 15:01:18 +0300 Subject: [PATCH 0617/1326] 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 6e52e8a4fb9187741f95fbdc52d518d56deea3cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:27:43 +0300 Subject: [PATCH 0618/1326] 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 64d984edb8184c77180d7e07b8eda0cf57457633 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:28:07 +0300 Subject: [PATCH 0619/1326] 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 d3665749894a1203ee0c364efd19fc59340b7647 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 09:41:00 +0300 Subject: [PATCH 0620/1326] 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 58b1563a8be6fcd21226329bedf6e76239f088fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 10:14:44 +0300 Subject: [PATCH 0621/1326] 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 b945ce338eda479e6bc580f12c65cd59d1c0a444 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 11:45:28 +0300 Subject: [PATCH 0622/1326] 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 413a8fb1fb21249087c35c3ec3be08e21244c815 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 12:17:21 +0300 Subject: [PATCH 0623/1326] 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 f4216ae0ba7972aa7cdb436c5d85067d62d697cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 17:56:24 +0300 Subject: [PATCH 0624/1326] 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 f4036b818d2d7e08c10218b44755bb9317443574 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:14:09 +0300 Subject: [PATCH 0625/1326] 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 4ff89f6825ebf6a06c0b5e4237cb0cf49b1595bf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:21:38 +0300 Subject: [PATCH 0626/1326] 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 1f5ebafcb36c3151cb00ccdfc7f6f663636ae814 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:22:35 +0300 Subject: [PATCH 0627/1326] 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 9c69c01f36b60d9e429cd35e0acca40d7cb35341 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:35:56 +0300 Subject: [PATCH 0628/1326] 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 df03e639b7c93bf31d34f0d0e832e793ab5c1c5e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 19:36:35 +0300 Subject: [PATCH 0629/1326] 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 315f2a817f7346404b73f8e2df2647cf4e085289 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:12:01 +0300 Subject: [PATCH 0630/1326] 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 a3fab5a6bbafe0d1a85832dae5c242415e1176b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:15:18 +0300 Subject: [PATCH 0631/1326] 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 322128cc83d9cd77fa90f1bc2d0e8f02f6cfdc02 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:18:57 +0300 Subject: [PATCH 0632/1326] 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 c2d846dd29957535a7889ddccd905945e6d7a3c5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Aug 2022 22:38:49 +0300 Subject: [PATCH 0633/1326] 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 493660374d69f3ead6523fc1ff866a55b243e562 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 00:01:06 +0300 Subject: [PATCH 0634/1326] 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 09e109164a605eec3d0bdcba2b9817db00383f71 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 00:38:10 +0300 Subject: [PATCH 0635/1326] 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 8d9d84eb7f5502032d6041c1db9c8d51c705464d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:07:21 +0300 Subject: [PATCH 0636/1326] 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 bb0aab93bab5406d7b5b21eaa379501baed292e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:31 +0300 Subject: [PATCH 0637/1326] 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 96d05236ed67ab5f4ccae86028e1dc7afa0328c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:50 +0300 Subject: [PATCH 0638/1326] 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 302d6ba9203080b1da89f317af84a2dc34d7ef5e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Aug 2022 12:09:59 +0300 Subject: [PATCH 0639/1326] 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 797755d32370005c292bdeb106d10c74c55f9e3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Aug 2022 10:42:06 +0300 Subject: [PATCH 0640/1326] 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 9897f2c331b510a6195ae60f95c1b82bd51f35f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Aug 2022 21:36:22 +0300 Subject: [PATCH 0641/1326] 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 a21f410dcd6a6d237e2b838370c309a4e3a85491 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:09:51 +0300 Subject: [PATCH 0642/1326] 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 20bc67ba4f8718bff2a6819f00a45955fe85a6de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:10:03 +0300 Subject: [PATCH 0643/1326] 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 3e8a76600da50fb38d36ab89c82fb644c29df2d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:21:42 +0300 Subject: [PATCH 0644/1326] 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 5d8b849ee2cda3c67719600a4a59c0b0d1f79e6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Aug 2022 13:23:27 +0300 Subject: [PATCH 0645/1326] 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 7bc12404545cb57e70849cabea92c8f6d30abb93 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 19:28:03 +0300 Subject: [PATCH 0646/1326] 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 a0fd25e2001b6e4bd6a02df9c17a9312d5c1ac30 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 19:34:43 +0300 Subject: [PATCH 0647/1326] 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 1d22f518dafff378bb72a259817ae788ebc20747 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 23:49:27 +0300 Subject: [PATCH 0648/1326] 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 c473cb5d9a6a51f2bcc8d98d49880af61e49b525 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Aug 2022 23:58:31 +0300 Subject: [PATCH 0649/1326] 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 ae89052aefdf8f87a5a84e971ad14b326b257391 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 00:03:04 +0300 Subject: [PATCH 0650/1326] 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 fcf8969b0169745188e498b8f7c2181b3b58c992 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 00:10:06 +0300 Subject: [PATCH 0651/1326] 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 6bf637f964dc65cd3c8f800b727cdda0408558e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 09:55:51 +0300 Subject: [PATCH 0652/1326] 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 d9f852bed8ef9af775f7099f6c0cba52b1dfed84 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 11:57:49 +0300 Subject: [PATCH 0653/1326] 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 95bb42aa72e1464205de62465bfc2dc9be69715b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 11:59:49 +0300 Subject: [PATCH 0654/1326] 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 e3f197456bee27e766d016bf5a6e656feb2970c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 12:06:07 +0300 Subject: [PATCH 0655/1326] 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 929e4a0bfc2757220d63bb7878c734a267faa95c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:33:59 +0300 Subject: [PATCH 0656/1326] 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 e6bd26af9c7e7bc0b2c85f3547f96cd8b60bc489 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:34:19 +0300 Subject: [PATCH 0657/1326] 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 0ed3009e7add53f5aa1e8d6e7a6e809231e50459 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 29 Aug 2022 20:45:07 +0300 Subject: [PATCH 0658/1326] 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 46cc7da21b1748a1acc01f28a93bbd638a8869a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 31 Aug 2022 10:09:34 +0300 Subject: [PATCH 0659/1326] 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 2aeb6e5bc0f16525f6ef0c802031b0f5650c44c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 31 Aug 2022 10:09:50 +0300 Subject: [PATCH 0660/1326] 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 a3138355094f11ac17a05f0c3bb880acac69267c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Sep 2022 18:04:00 +0300 Subject: [PATCH 0661/1326] 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 db2ef6e4347ae44bb14617d073eefae37f34341e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 08:58:00 +0300 Subject: [PATCH 0662/1326] 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 dab1d82be28e93e77988404964f8c49b244b5083 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:48:41 +0300 Subject: [PATCH 0663/1326] 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 2d5fb0d4dcf71f82f3fec1f0c0204499f4257935 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:49:56 +0300 Subject: [PATCH 0664/1326] 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 38c985ebfa13ed466ff3695a2a91b5f65c883ee6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 2 Sep 2022 23:59:51 +0300 Subject: [PATCH 0665/1326] 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 78c8196daa95ad449cc8dae142c9bf681c7ffc53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:01:15 +0300 Subject: [PATCH 0666/1326] 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 3d74bd9a2afb9a0f9a69f533e1e05eb58e4cd5d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:01:50 +0300 Subject: [PATCH 0667/1326] 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 3d64f03d95cd19f68ad0c6a14a890fae8bd1f4c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:02:04 +0300 Subject: [PATCH 0668/1326] 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 9ded15386151fecde6beb1832010b8787d3594c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:11:25 +0300 Subject: [PATCH 0669/1326] 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 ebed5b1f998f7651a609c5904698fb9adcdc7640 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:11:56 +0300 Subject: [PATCH 0670/1326] 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 09bdc5b94b929f8514ab1a585773d59aedbcf00b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:33:55 +0300 Subject: [PATCH 0671/1326] 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 ac0cdcf839af4a598df0d180ec579c52a106e911 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:55:10 +0300 Subject: [PATCH 0672/1326] 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 f781e4b0c90e0cef512888a8e837413c40e596d8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 00:56:46 +0300 Subject: [PATCH 0673/1326] 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 76b50dbe6fd965d831cf91638a99c347c48c032e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 12:24:59 +0300 Subject: [PATCH 0674/1326] 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 ffba40b027dec34d3bf48097e4b4deb1e5bb174b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 12:31:38 +0300 Subject: [PATCH 0675/1326] 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 1b394b23f77db52902e0cc57b3fbb7367ce1b863 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:05:25 +0300 Subject: [PATCH 0676/1326] 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 c134cdce6cae834f8702741fdb94ccb58d46f063 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:05:40 +0300 Subject: [PATCH 0677/1326] 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 1ae2219d8aa6051f86028a1ae076cb5f0a4d3a70 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:11:09 +0300 Subject: [PATCH 0678/1326] 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 71a0d125cc2ea7b03e88e1ab31c1ee2884d16245 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:11:53 +0300 Subject: [PATCH 0679/1326] 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 cc98aec0f7806b74e2e8830f1500e9c52b85002c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:15:05 +0300 Subject: [PATCH 0680/1326] 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 08c6d7694fec1c2a6e3b9eb91910fb9c7555658d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 14:41:13 +0300 Subject: [PATCH 0681/1326] 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 884c678e43c71a73123f50854c390b43de0f2475 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:07:54 +0300 Subject: [PATCH 0682/1326] 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 65f2fd46a2516858d6e7bd28d9e5fa2c492a4a3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:42:34 +0300 Subject: [PATCH 0683/1326] 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 fe2ee02badec2c9ac82100667c49919271880e0b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 15:51:09 +0300 Subject: [PATCH 0684/1326] 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 f3953befe33921c2eaaef637f78ecc3abdc91a13 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:19:22 +0300 Subject: [PATCH 0685/1326] 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 1151b87fadf970a0399afe4a74a68f7478034a1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:19:47 +0300 Subject: [PATCH 0686/1326] 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 8b9aa920a627185af0c95192427b9d9bae9c1b13 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Sep 2022 16:21:02 +0300 Subject: [PATCH 0687/1326] 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 2d7890154e504dba0c3d20d11d52227f041caf41 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Sep 2022 13:00:01 +0300 Subject: [PATCH 0688/1326] 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 fe679061ba2047302b48cdc395d882552ba9c892 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Sep 2022 15:56:08 +0300 Subject: [PATCH 0689/1326] 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 ca2412143fbb3fc4d159bdc3b35cf30336537bb1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 11:31:10 +0300 Subject: [PATCH 0690/1326] 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 5c6d81c7ffad7f6a562d109200bcf3323a2b201f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 11:38:00 +0300 Subject: [PATCH 0691/1326] 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 19fbc933dfacdc476fcd3e3ad029b7b39aa5aa4a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 16:37:50 +0300 Subject: [PATCH 0692/1326] 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 a96a438dda45935337b6dfa220df0a4d2e3f2bf0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 16:58:43 +0300 Subject: [PATCH 0693/1326] 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 6eee824bdd3fc03dd284284656eda4cc32059680 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 19:00:07 +0300 Subject: [PATCH 0694/1326] 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 ac829e286a68270620c20bd9ed89bcf169ebdb20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:00:11 +0300 Subject: [PATCH 0695/1326] 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 0deb2e37e0737549e923ace337bf76cd8dc7f848 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:03:48 +0300 Subject: [PATCH 0696/1326] 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 939c0c14da863496de69859363857526688902cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:10:49 +0300 Subject: [PATCH 0697/1326] 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 3cd3b232a1d9680e6545341c62ea034dbd102993 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 6 Sep 2022 20:51:34 +0300 Subject: [PATCH 0698/1326] 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 17032b95d0b1860a1b6ff4e13a3fff525e070a8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:22:33 +0300 Subject: [PATCH 0699/1326] 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 389c24e9394d5b37ca284cc65e31823407495f4c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:23:51 +0300 Subject: [PATCH 0700/1326] 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 7ae2f501495e4bc7a5a8d4b51593963e54a301e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:21 +0300 Subject: [PATCH 0701/1326] 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 f2251e87da24f617aeccad50cc9a6eae57f86e0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:32 +0300 Subject: [PATCH 0702/1326] 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 40ba3664039bc2e50982af40e927269affbb7eb3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:24:47 +0300 Subject: [PATCH 0703/1326] 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 c47d4ea4daaa0b9bed612cbedc4e58378e62f389 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 20:26:55 +0300 Subject: [PATCH 0704/1326] 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 1a54986d53f25f01c1b5fee50a5de482e3b3e26c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:12:49 +0300 Subject: [PATCH 0705/1326] 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 b7051903a28c27f0b3117db170ee61ccea6c8db7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:13:20 +0300 Subject: [PATCH 0706/1326] 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 b853a896356cd297dca7f912e2c9d1b440d6e68c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Sep 2022 23:16:53 +0300 Subject: [PATCH 0707/1326] 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 68b3fefc670654f3e7e1add56177f20fc0c6f360 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Sep 2022 11:05:36 +0300 Subject: [PATCH 0708/1326] 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 b29bf53fa191bac40a36bc79b6f3a8cc70510a10 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Sep 2022 13:34:58 +0300 Subject: [PATCH 0709/1326] 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 3f2c88998514a762775909ef37bd33f602bf3d1b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:49:31 +0300 Subject: [PATCH 0710/1326] 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 116621e4cce5478e56eae904eba1118cb9220058 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:49:49 +0300 Subject: [PATCH 0711/1326] 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 33b9d9930f3e3976d159a887b1cbad1802da15a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:50:00 +0300 Subject: [PATCH 0712/1326] 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 489e8dcfe23883c7cebdd37c2a5d66e8535d2ebf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 11 Sep 2022 12:50:14 +0300 Subject: [PATCH 0713/1326] 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 968ce1b1702e07ddfbeae5c19711510515432f42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 12 Sep 2022 12:50:16 +0300 Subject: [PATCH 0714/1326] 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 3f487ee0f3bf33582c8861137a96fb7cafcb5fd4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 12 Sep 2022 12:52:15 +0300 Subject: [PATCH 0715/1326] 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 1e54c2dd73cadc12cbf256e02e041171070ff6e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 14:54:13 +0300 Subject: [PATCH 0716/1326] 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 b436745bf1c4a58e2e150bd7870d3ab5d95738a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 14:54:23 +0300 Subject: [PATCH 0717/1326] 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 573236400f5116077706530d7b7e14d5bd17215b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:54:23 +0300 Subject: [PATCH 0718/1326] 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 1398574bb2941cf72cd3706a6c0db391493565ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:54:55 +0300 Subject: [PATCH 0719/1326] 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 ba28bba03a918d5496fa4a6ddba5e96558e02a19 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 17:58:48 +0300 Subject: [PATCH 0720/1326] 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 a97f68aeb5b3684c11d1523d283b68916c183034 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 19:37:16 +0300 Subject: [PATCH 0721/1326] 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 8ab864c3838edf3d74b7e1662d140b45120fcab5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Sep 2022 19:39:53 +0300 Subject: [PATCH 0722/1326] 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 e0e8c5ccaf85a91774c7e3e55fa53e0020bdbc60 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 16:53:16 +0300 Subject: [PATCH 0723/1326] 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 018b96f03aad345ff4c15f8a5ebfcbc609af873d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 16:53:43 +0300 Subject: [PATCH 0724/1326] 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 97b3866db277f926320bf5cb382207569d1ad3e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 19:21:54 +0300 Subject: [PATCH 0725/1326] 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 cc06f5743d6118ead3ef2cef58bf684986ebfe3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 19:45:32 +0300 Subject: [PATCH 0726/1326] 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 e45086afaeeb4d79836d10ff674793df634019db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:01:31 +0300 Subject: [PATCH 0727/1326] 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 4d323544d7922d6a9c484322af5767a628ff4b5a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:08:03 +0300 Subject: [PATCH 0728/1326] 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 12f36722c4826b98f982fd3b1080110356998bcd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:08:42 +0300 Subject: [PATCH 0729/1326] 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 72fd1108344b446623b543a41e4320fd5e104eec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:12:04 +0300 Subject: [PATCH 0730/1326] 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 0bedb49cf668f6d562dd9befb7e999d80d178dc6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:12:25 +0300 Subject: [PATCH 0731/1326] 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 973fe13743545acb836727c26f3490bf7729592d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:14:04 +0300 Subject: [PATCH 0732/1326] 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 8d6ee01d96d601109acf9d88eb2df95bfd3b752a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:18:56 +0300 Subject: [PATCH 0733/1326] 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 f18dba6fa6ad52499cda3dbc6f63e4adaa50b3d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:35:58 +0300 Subject: [PATCH 0734/1326] 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 20421fa466efeb3d3177b9d50ac75e9fb0e8e291 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:36:54 +0300 Subject: [PATCH 0735/1326] 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 085523998b7408832e4e2e0883c12d81bdd86701 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Sep 2022 20:37:39 +0300 Subject: [PATCH 0736/1326] 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 bb4d4691624f9bddf3bf2ce6eef11bb79eea6e1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 09:26:57 +0300 Subject: [PATCH 0737/1326] 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 48a51d9756db3be787a5172de8fecf96963fce8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:38:40 +0300 Subject: [PATCH 0738/1326] 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 1105f2fab04728aa67c0e427166cd260d6b8ef1f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:41:56 +0300 Subject: [PATCH 0739/1326] 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 1911c404273eb797435645a2315eb9ae9ca2fad5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:54:30 +0300 Subject: [PATCH 0740/1326] 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 5c2f6821f9b0988dd450ab1964c2e2490e7a0c89 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 17:56:55 +0300 Subject: [PATCH 0741/1326] 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 15ade99b4ad945f478c1ad49712c962afc3286bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:00:46 +0300 Subject: [PATCH 0742/1326] 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 31e61e368992fe0da2a4bc93538a97e2effe06dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:01:26 +0300 Subject: [PATCH 0743/1326] 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 eee41cbbcd4cd0b7ba0dcfb9998dd2617cbe09d5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 18:04:16 +0300 Subject: [PATCH 0744/1326] 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 b2ee402d048bea574204120cb255d1f3061410bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:20:11 +0300 Subject: [PATCH 0745/1326] 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 0105b275edd9f3c9b855babb4f9890eb3422c084 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:25:08 +0300 Subject: [PATCH 0746/1326] 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 b77d2e2a678cbec390394264cb50ce7f11e86de1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:29:13 +0300 Subject: [PATCH 0747/1326] 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 49593b02b089dfc10463fcda020ad493c5293d0e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 19:45:07 +0300 Subject: [PATCH 0748/1326] 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 527dace26c62addecb0feeab834ca25af0f9a11f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 22:55:09 +0300 Subject: [PATCH 0749/1326] 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 9fd82c7fbfb108119e055098ad64ff82e7d80740 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:00:09 +0300 Subject: [PATCH 0750/1326] 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 729a914fbd72ae08c741694a339f84a056b84064 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:03:42 +0300 Subject: [PATCH 0751/1326] 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 2c7dd4af6fbef2a18a92c1629d2298e8b725fb0c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:32:21 +0300 Subject: [PATCH 0752/1326] 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 d11e82217c6a4ea5acbb65c253927e08de762bce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:34:44 +0300 Subject: [PATCH 0753/1326] 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 14da0fcf23cf0b743733a1ca2264b2945bb27638 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:37:20 +0300 Subject: [PATCH 0754/1326] 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 6cc2fa1152689773d5cbbdb0659d90966d7419ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:47:47 +0300 Subject: [PATCH 0755/1326] 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 2743c68c726715789d6f74e3a7e252e68e65c1c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:49:40 +0300 Subject: [PATCH 0756/1326] 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 cd5e783ccfd46e2f555fbd08b7a203be9553a844 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Sep 2022 23:56:18 +0300 Subject: [PATCH 0757/1326] 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 185260c0b887adae8c6626e987fa2d7e4ecc5fda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:04:09 +0300 Subject: [PATCH 0758/1326] 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 d9e491c38208514869ea0c5cbd96b9f82fd3d366 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:08:44 +0300 Subject: [PATCH 0759/1326] 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 0f468a7af8944f1efa338b95416dc55bb12fcb0a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:18:06 +0300 Subject: [PATCH 0760/1326] 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 5b847d75ee971965dcf678b1ef6672aeb1752af9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:18:52 +0300 Subject: [PATCH 0761/1326] 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 795489715250d8d92348b6d34c26dfd5405a78c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:23:08 +0300 Subject: [PATCH 0762/1326] 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 59adfdd89e3fb9e67b1d58468baab4094e6e8b0d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 00:24:02 +0300 Subject: [PATCH 0763/1326] 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 f3f2931d57d782df18fd61d61b05106466edf064 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 21 Sep 2022 10:05:39 +0300 Subject: [PATCH 0764/1326] 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 d3f661c5790dce1d50d1b113fd98dbb709bde83b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:07:59 +0300 Subject: [PATCH 0765/1326] 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 f390a33dd8d9ec2b72b7bc935f08e22ef4036b67 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:15:18 +0300 Subject: [PATCH 0766/1326] 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 381e0af92d26034e38a6808607e85b6d90571c34 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Sep 2022 18:16:49 +0300 Subject: [PATCH 0767/1326] 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 a6db0941d39f512ff14d1041c7f50391682e87de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 13:14:33 +0300 Subject: [PATCH 0768/1326] 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 f24dfb6f2d204531f242a61d728e4f20f44e3648 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 17:01:18 +0300 Subject: [PATCH 0769/1326] 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 caa7848cb3fe514a55cc51fd597f006272db41e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Sep 2022 17:04:54 +0300 Subject: [PATCH 0770/1326] 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 1635e9fc36bab329f55840841b6e6067cb0ab632 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 18:10:59 +0300 Subject: [PATCH 0771/1326] 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 60303b00495da7a7195fd5a42f7aeeb07d3d6a67 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:04:41 +0300 Subject: [PATCH 0772/1326] 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 1f8221ff5b20704abea3455df2e20b56d27458fd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:07:23 +0300 Subject: [PATCH 0773/1326] 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 4c5b190584257bb29a8d9b8e93e4417f5aa49d90 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:08:07 +0300 Subject: [PATCH 0774/1326] 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 498a63aef4b8f5937a57b3e9efa64012d79e3b9d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:31:03 +0300 Subject: [PATCH 0775/1326] 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 6afdc9564c6f4b13b158d987342192c2598b63f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:40:32 +0300 Subject: [PATCH 0776/1326] 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 7a4bf336e8ce61370c34daf38699a80da9f6c542 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Sep 2022 22:46:45 +0300 Subject: [PATCH 0777/1326] 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 79656e86ef7942da1493265e7070b9f38a70afaa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:39:26 +0300 Subject: [PATCH 0778/1326] 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 dc18277b4dcaeaca1c5c153183968c86dc948fb9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:40:37 +0300 Subject: [PATCH 0779/1326] 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 f3da5785d64e195d0eb4a714e26a13ab205d6dd8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Sep 2022 10:41:50 +0300 Subject: [PATCH 0780/1326] 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 62558887c1afa4a57afdc060fc7c18c674999f60 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Oct 2022 10:52:21 +0300 Subject: [PATCH 0781/1326] 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 b3283de502711d7c8056b9f5f1b1f938f7c9bf44 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Oct 2022 14:05:43 +0300 Subject: [PATCH 0782/1326] 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 e83a031b1bdf7e2b32344c9228b4922f3c33089b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 7 Oct 2022 17:46:04 +0300 Subject: [PATCH 0783/1326] 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 4faffcaa73830523d6d89b482e89ab7aadd09de4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 7 Oct 2022 18:01:43 +0300 Subject: [PATCH 0784/1326] 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 5e9d4d65e6ae306008a9ab7fb55b1eda6dbd3e95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 9 Oct 2022 11:43:40 +0300 Subject: [PATCH 0785/1326] 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 447c7e11199f05fbc72616378d059f34a4e9b2bf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 9 Oct 2022 11:45:58 +0300 Subject: [PATCH 0786/1326] 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 ccdd60a353df5f6f7b252d03041e3108cb7a3006 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:25:20 +0300 Subject: [PATCH 0787/1326] 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 2388de891f4be59722028d0d55cc96b8c40d2f29 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:28:39 +0300 Subject: [PATCH 0788/1326] 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 23d23a27c93d02bb329e4f4739bb45554fc879be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Oct 2022 11:29:25 +0300 Subject: [PATCH 0789/1326] 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 923a1c73400f679898d7150e411ec360c054f76c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Oct 2022 20:32:50 +0300 Subject: [PATCH 0790/1326] 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 ceb50baf835759de4dbe385a82b01fbc167848e3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Oct 2022 20:35:19 +0300 Subject: [PATCH 0791/1326] 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 ef4d6d4650ce6c5fb4477a5d3a8bf4a90f333b07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Oct 2022 14:39:10 +0300 Subject: [PATCH 0792/1326] 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 7e6a410b86b5bf3747a1e4c1e49644556efd846f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 19 Oct 2022 10:27:35 +0300 Subject: [PATCH 0793/1326] 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 a5e1613b0736689e0278059107bc0bf3b56923e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 20 Oct 2022 11:24:54 +0300 Subject: [PATCH 0794/1326] 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 0aa8b5dd4662cb7e5136772e12ccf772ab67756f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 13:19:48 +0300 Subject: [PATCH 0795/1326] 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 c9c0f55d3170c085d3b0f63915c0246236f7bcc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 13:23:10 +0300 Subject: [PATCH 0796/1326] 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 1acfbf40cae731899e25966cf4af1283c0b517f1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 15:40:53 +0300 Subject: [PATCH 0797/1326] 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 4093651f86a26aa8bbe981ba5cdc28c6e3c7ceea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Oct 2022 16:04:25 +0300 Subject: [PATCH 0798/1326] 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 58eb8443067afeb991fdec19f4c4739b3391c8ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 13:46:43 +0300 Subject: [PATCH 0799/1326] 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 2fb929728160ce1829cbcf43ffd790ebcdd5e182 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 13:49:04 +0300 Subject: [PATCH 0800/1326] 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 16e59402c738d279b2fc8bb877806a007f5f8e3f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:08:20 +0300 Subject: [PATCH 0801/1326] 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 b114f1851e2b2913453e9e6f275fa56d949f34e1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:09:50 +0300 Subject: [PATCH 0802/1326] 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 e6aa45333bfe89836f03d1fe5131a9d27d26a457 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Oct 2022 14:13:15 +0300 Subject: [PATCH 0803/1326] 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 12c6ce7ef065cdf32c382fdb53e5709fe1cc660b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Oct 2022 09:28:22 +0200 Subject: [PATCH 0804/1326] 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 6c72a3677350ff68a028e041e12ebbe2aabd5124 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 31 Oct 2022 09:28:41 +0200 Subject: [PATCH 0805/1326] 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 2856c8f1ceff1809d71d26b57eee45bbb310712c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 1 Nov 2022 11:00:36 +0200 Subject: [PATCH 0806/1326] 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 cc3e47611a666fe411e810f2b15711e9b7a5f436 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:07:33 +0200 Subject: [PATCH 0807/1326] 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 8f2acf184f0cd95842748151471c71295bb8a87f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:03:02 +0200 Subject: [PATCH 0808/1326] 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 50399dfd649903e90600246538fdefa95780acfe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:03:54 +0200 Subject: [PATCH 0809/1326] 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 c5437fcfbdae9409bb2512ff9e947e6b471d7315 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:04:11 +0200 Subject: [PATCH 0810/1326] 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 b1bd55f0a6b265e1109983b73785cd73ffe2c061 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:04:49 +0200 Subject: [PATCH 0811/1326] 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 5c952d7c8cc5dc42f5175757408096c1326dc93f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:13:01 +0200 Subject: [PATCH 0812/1326] 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 9498a29f0a0e3abe1e73afa6dcf04fc9220f6af8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:13:16 +0200 Subject: [PATCH 0813/1326] 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 b73c8f07a6192048b42ea73ac8cf6519f3b03b14 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:15:09 +0200 Subject: [PATCH 0814/1326] 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 b04b5665e26d1bc22aaaa2e04f8c54f4cec6ae35 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:15:43 +0200 Subject: [PATCH 0815/1326] 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 a1c475da50ca28ac7a6486f093ed654278f8b8e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:33:05 +0200 Subject: [PATCH 0816/1326] 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 4bdff7d07c19029bc832826a4b0d4d524de38712 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:34:04 +0200 Subject: [PATCH 0817/1326] 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 5430b88cadf873227261658af69292388b0d12c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 2 Nov 2022 16:38:53 +0200 Subject: [PATCH 0818/1326] 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 1206df05ccd4b1ee4d735d7e29a1bfda572caa7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 12:49:22 +0200 Subject: [PATCH 0819/1326] 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 0ad3a4eb1e6e950780026dc33a260ff433a43b38 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 13:39:43 +0200 Subject: [PATCH 0820/1326] 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 393c619e2baba0b3bf513619323209fba1719fe7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 4 Nov 2022 13:43:07 +0200 Subject: [PATCH 0821/1326] 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 ca12d94a3ece1d38e6d21ea41c54a11401880bed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 09:43:20 +0200 Subject: [PATCH 0822/1326] 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 fa37e929ea80d1dcdfd44f613f434ec68e92df07 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 09:44:02 +0200 Subject: [PATCH 0823/1326] 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 204c4542b4d26eb43d5593c4b3f093bec2b02eb8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 13:25:11 +0200 Subject: [PATCH 0824/1326] 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 6d092a001ac7c7c0f3b1e2a2abf69afb4e2e4779 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:37:00 +0200 Subject: [PATCH 0825/1326] 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 14ea0031d6efef18fc09f281a76797b5044b5cc7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:37:16 +0200 Subject: [PATCH 0826/1326] 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 dcc4b2b06d062146e8a9e4feb3d8a9cf34400d5f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:49:52 +0200 Subject: [PATCH 0827/1326] 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 4c9593bcb693f36c4c424a2e42a932a05b05f957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 6 Nov 2022 17:52:02 +0200 Subject: [PATCH 0828/1326] 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 72ab88d55de39ef904c716640010b0d48f4e4bce Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 09:01:45 +0200 Subject: [PATCH 0829/1326] 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 aaec8e6067c95c2f8cd7c3e289e8d58cf87efc33 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:52:53 +0200 Subject: [PATCH 0830/1326] 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 4b4707a84e8eebec15f59fb4f366a69694773ccc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:27:34 +0200 Subject: [PATCH 0831/1326] 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 775ea90211f86ec321a136fe20ac94901224f6bc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 9 Nov 2022 15:45:24 +0200 Subject: [PATCH 0832/1326] 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 82227b7dee2cdbb00d0eced4ad2ae20141c83b69 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 11 Nov 2022 18:29:22 +0200 Subject: [PATCH 0833/1326] 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 1d8142dae2788b3cb6b3f5305e4ada8888d51392 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Nov 2022 22:06:06 +0200 Subject: [PATCH 0834/1326] 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 7c9c9f0f22b4be240970f2835592c504f03a103c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 15 Nov 2022 23:49:30 +0200 Subject: [PATCH 0835/1326] 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 40e2908af4de973394096c009c0aa049d557a103 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 00:10:27 +0200 Subject: [PATCH 0836/1326] 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 d332eaa6f56927ce337ae84aed247806ca0a7f00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 00:11:52 +0200 Subject: [PATCH 0837/1326] 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 93ce353b0056b2ea9b28c24a46a1114c1c3cbc1e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 08:38:58 +0200 Subject: [PATCH 0838/1326] 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 491577d1a1dd65666718ce452c70b9983d276ec8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 08:51:22 +0200 Subject: [PATCH 0839/1326] 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 6182b1b2b8a6e87701269e3bf2bd2fefab9215e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 16:30:23 +0200 Subject: [PATCH 0840/1326] 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 429010d85af6f931e6a265d6891f95cb0a71cf86 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 16 Nov 2022 16:31:43 +0200 Subject: [PATCH 0841/1326] 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 6fea7df990d6fca1c67415631bf831d3b9ea8e0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Nov 2022 09:18:56 +0200 Subject: [PATCH 0842/1326] 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 41751154a91ce0be80cafdc782dde03f683ba014 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 20:31:52 +0200 Subject: [PATCH 0843/1326] 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 842e6b1c9fc105b37ba2a01ab1f50ef9fbcba203 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 20:37:42 +0200 Subject: [PATCH 0844/1326] 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 ed2b649164c634a2a177a80cd909329111c450fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 21:47:09 +0200 Subject: [PATCH 0845/1326] 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 ee1f973c41f1bf672768e06a7602a0403b02816e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 18 Nov 2022 22:20:46 +0200 Subject: [PATCH 0846/1326] 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 19a35842cea4620320192ee0b68c863100c18a45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Dec 2022 21:56:56 +0200 Subject: [PATCH 0847/1326] 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 147731f693dcc70f446d5b7334868ba341eefb1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 1 Dec 2022 21:57:06 +0200 Subject: [PATCH 0848/1326] 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 9cfc894c862689cd6044c2d2394b89f201c4d301 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Dec 2022 13:40:49 +0200 Subject: [PATCH 0849/1326] 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 46400e280120959eb949142306f3c7468b2a8912 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 7 Dec 2022 10:37:21 +0200 Subject: [PATCH 0850/1326] 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 35a2a782f003552bf4e0ff3862a1da1b685c90c9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 7 Dec 2022 10:37:48 +0200 Subject: [PATCH 0851/1326] 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 717c562eecc1d3254e95cb596619e9834f347cda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Dec 2022 23:43:38 +0200 Subject: [PATCH 0852/1326] 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 0ecf1e8479c7245ed3cdad1c91083042177352c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 13:17:15 +0200 Subject: [PATCH 0853/1326] 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 305666192f9e0d39a5902f56cfc0c305bc00d0ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 14:46:53 +0200 Subject: [PATCH 0854/1326] 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 c1c1b425eca582c622ab7690f0ae44ad672da568 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:05:22 +0200 Subject: [PATCH 0855/1326] 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 dba955406965b0118a7ba258784720280f870bc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:38:48 +0200 Subject: [PATCH 0856/1326] 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 41cf3a573517807247cecf298053fd2d64405d2e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 15:41:45 +0200 Subject: [PATCH 0857/1326] 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 5c622bed80f27d312ce8a5ee85040033aa1dee19 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Dec 2022 22:15:41 +0200 Subject: [PATCH 0858/1326] 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 565b730bf1dfe27d0eea5ca732026572b26d1c87 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 00:21:21 +0200 Subject: [PATCH 0859/1326] 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 7f54f26daa4369003a7a006a78dff0a602b509af Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 01:14:59 +0200 Subject: [PATCH 0860/1326] 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 8f739a907c397da904d04161d581f2c36a2f68b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 01:16:20 +0200 Subject: [PATCH 0861/1326] 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 d4796ef581d2294a9c1ce3501105d7982af05676 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 16:47:20 +0200 Subject: [PATCH 0862/1326] 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 5f0fd57cb32d7a24e0eb05b4f7e076d6270f4a63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 18:28:15 +0200 Subject: [PATCH 0863/1326] 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 23ede601ef7551ec1badbfa9a555d17d205b1b6e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 18 Dec 2022 18:55:10 +0200 Subject: [PATCH 0864/1326] 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 cd4096e3c0e623bd7dedc9b67c8304ea3342142b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:22:12 +0200 Subject: [PATCH 0865/1326] 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 6a7afb20d2f1fe48108fe9e97c72448212482f01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:25:13 +0200 Subject: [PATCH 0866/1326] 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 3a0e4314571b8baee37fbc65f3cfc52fc7428a8e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Dec 2022 22:45:00 +0200 Subject: [PATCH 0867/1326] 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 924c957472e6533cd835c7b9caad6c7b7027b515 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Dec 2022 09:31:16 +0200 Subject: [PATCH 0868/1326] 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 7c8aba1a0646eb1d78c1af6c7a186bf55fa20c1d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Jan 2023 09:10:16 +0200 Subject: [PATCH 0869/1326] 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 a1542cd5e2ed816e1724b103ed04500712496b8c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:40:27 +0200 Subject: [PATCH 0870/1326] 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 31cb691feb1e2044c631623640f7eb21e873ff44 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:41:23 +0200 Subject: [PATCH 0871/1326] 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 8ec669e136109b428fa6b04cf8887855636a43c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 27 Jan 2023 20:57:02 +0200 Subject: [PATCH 0872/1326] 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 80c970ae7c90a6747055e6fe6004e64d86040dff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 12:34:26 +0200 Subject: [PATCH 0873/1326] 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 b8d84d1e4b7827f667325acd70af356f843be8a4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 22:38:14 +0200 Subject: [PATCH 0874/1326] 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 08bb0e0296c3439ebf7d9a15995d9c494c90a9be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Jan 2023 22:43:39 +0200 Subject: [PATCH 0875/1326] 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 47233b088f197b40edc13455cdfdc862c518546b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 19 Feb 2023 20:03:22 +0200 Subject: [PATCH 0876/1326] 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 13ad1b7e88fefbec4a429c8466cc2126d336ff64 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Feb 2023 16:10:32 +0200 Subject: [PATCH 0877/1326] 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 8f74a04d5d82d6f02bf3a487dfa86ad24a531d84 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Feb 2023 11:31:20 +0200 Subject: [PATCH 0878/1326] 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 a8211ed1d8bd88539d7003cf5e12476ff3fe3f41 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Feb 2023 11:33:35 +0200 Subject: [PATCH 0879/1326] 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 12564939a7731586d42768504b90e1ed75ae762a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 14:45:30 +0200 Subject: [PATCH 0880/1326] 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 f0750a1ad87f16fd4f96f455f2a6164edeb04503 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 17:54:39 +0200 Subject: [PATCH 0881/1326] 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 13c59cab47ad901ce22933c33bbc9651b6cca5d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 17:58:05 +0200 Subject: [PATCH 0882/1326] 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 49d5c6c92b288ecf39032cbb0a9303f7f2bb1704 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Feb 2023 18:29:01 +0200 Subject: [PATCH 0883/1326] 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 ced2b22fb42dbace17525e72bf8103d7a3d1dbca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Feb 2023 09:15:32 +0200 Subject: [PATCH 0884/1326] 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 5e04976abae9eecf215b3eda636273dc8ca5ddff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 09:29:51 +0200 Subject: [PATCH 0885/1326] 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 6e466cae8d1ff9248fcd39721b0e7dc0c9f5476c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 09:30:05 +0200 Subject: [PATCH 0886/1326] 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 6a7cf99da80dbc552be9d4f50e3a37107c7ee29b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 21:54:56 +0200 Subject: [PATCH 0887/1326] 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 e642a294c5746aa7591b7605541e04968578c9d9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Mar 2023 22:24:07 +0200 Subject: [PATCH 0888/1326] 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 81e7d2631d7ec834539d482ee9b16f9f5ceba828 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 5 Mar 2023 12:58:36 +0200 Subject: [PATCH 0889/1326] 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 b75bbba4930e799548e339308ca8042decfe0853 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 Mar 2023 21:47:51 +0200 Subject: [PATCH 0890/1326] 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 5a11d0c79e1b0d924b02c612ff0c20df6b57b432 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 8 Mar 2023 16:35:53 +0200 Subject: [PATCH 0891/1326] 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 e653ee7d18d794719235cfb2eed8e145787d8bc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Mar 2023 10:27:45 +0200 Subject: [PATCH 0892/1326] 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 fc0493d99ec9eaf9bb03f18cef367a5d75fe6de9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 9 Mar 2023 10:28:00 +0200 Subject: [PATCH 0893/1326] 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 c47a85b539260170fdb2cbc5b1646a42d33451a8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 Mar 2023 13:22:34 +0200 Subject: [PATCH 0894/1326] 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 702fdec58490fc6134e538209caadac192b615ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Mar 2023 18:30:47 +0200 Subject: [PATCH 0895/1326] 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 9ec2a8eb9bf67552d993a58162d23d131c29a675 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 13:26:22 +0200 Subject: [PATCH 0896/1326] 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 3da0c390143da10cea9c89ed04b1bfcfb094f337 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 18:36:42 +0200 Subject: [PATCH 0897/1326] 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 8065b2dab0a97a87640cd3d1f30dee6f0e6abce4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 18:36:59 +0200 Subject: [PATCH 0898/1326] 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 94b70310e40b4daf15d38283bfd9a06ad47f1e44 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 19:11:26 +0200 Subject: [PATCH 0899/1326] 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 8bb500ac4ba5e1087162438973fa64dc8c5284c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 Mar 2023 19:11:41 +0200 Subject: [PATCH 0900/1326] 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 1529ae20c74311bc2f4c6d1202ca4d31ea6c8fd8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:31:07 +0200 Subject: [PATCH 0901/1326] 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 9256c0352c88feeca4770b6348f16fca9701d00c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:32:07 +0200 Subject: [PATCH 0902/1326] 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 64f63eb156a7ea283f6e5a69892c53e0592a4152 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Mar 2023 18:59:41 +0200 Subject: [PATCH 0903/1326] 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 432328a8b43637635006347b14309c1e38572f0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Mar 2023 08:48:37 +0200 Subject: [PATCH 0904/1326] 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 690743f6d0bf162b94e69cf2cc5c3f7a531a7d1d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Mar 2023 08:50:12 +0200 Subject: [PATCH 0905/1326] 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 0f6382bfc80aed2991ae5e533c344e6243cb6dd7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Mar 2023 21:18:29 +0200 Subject: [PATCH 0906/1326] 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 bed90cc635f6d0cdab344f38525ff4e7a29caa6f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Mar 2023 23:02:55 +0200 Subject: [PATCH 0907/1326] 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 f3aff4c4e8cdf9d1ab1feece5675061f4c4eb06e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:08:41 +0200 Subject: [PATCH 0908/1326] 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 848186de59d3e90673f75ff829d90c4f27a00ab5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:16:28 +0200 Subject: [PATCH 0909/1326] 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 395e18df52678cdc9a2d6220a91be4675a603fc7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Mar 2023 11:26:43 +0200 Subject: [PATCH 0910/1326] 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 f197eccac30678b2793a829df435363a6b585868 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:27:05 +0200 Subject: [PATCH 0911/1326] 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 a500dd37b7a6e6d5637dbe121e11441c4995fb7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:27:18 +0200 Subject: [PATCH 0912/1326] 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 9169ee5b8cdbc449967494c8efb4a778fb712eb0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 12:30:32 +0200 Subject: [PATCH 0913/1326] 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 98846fc48ba857aeee4e6b0e627647784d44a96e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 20:21:00 +0200 Subject: [PATCH 0914/1326] 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 785990b7554b0b8a77e8128ce246cbe22e2b0ba6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 20:23:08 +0200 Subject: [PATCH 0915/1326] 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 87ff7ed523279bfd38389dbd2f499ee8ceabd39c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Mar 2023 22:10:12 +0200 Subject: [PATCH 0916/1326] 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 20e48f14d105a2b9e70493983eb579a9b9316a2f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 30 Mar 2023 09:01:39 +0300 Subject: [PATCH 0917/1326] 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 c0da6c96f4db3fe10cc003963cfe47f0aff2ffc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 14:10:24 +0300 Subject: [PATCH 0918/1326] 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 ae2ea3f9a6d4256d6e78a40d41c356778b6bad1c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:20:36 +0300 Subject: [PATCH 0919/1326] 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 aa00c1d36e66e41ec82312078782625ee283fb62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:24:39 +0300 Subject: [PATCH 0920/1326] 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 f469555599a717951ae783740b3c2ee0888fcde4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 3 Apr 2023 23:29:30 +0300 Subject: [PATCH 0921/1326] 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 3b1dcf4709598fc8ab0ff8a34c96056239953fb4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 00:44:54 +0300 Subject: [PATCH 0922/1326] 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 acc7aa6848076c9b0f9a01ec32dc8807b6b76af7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:00:48 +0300 Subject: [PATCH 0923/1326] 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 f4a2f1bb36c6ff3eb71a8776098997b2cb3f2c7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:03:39 +0300 Subject: [PATCH 0924/1326] 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 7290ecac2e4f3d45795a93e70e4df4ed0a03409b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:12:13 +0300 Subject: [PATCH 0925/1326] 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 1df1c2c97076bf50d9a5ffb35f6bb0ecf8689421 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:15:18 +0300 Subject: [PATCH 0926/1326] 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 73f430bea21c99e538190bd792a3abe9ddefc923 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 01:28:00 +0300 Subject: [PATCH 0927/1326] 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 e101ea9de609ac2e4eadfdad874acf23b1a07793 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Apr 2023 16:31:31 +0300 Subject: [PATCH 0928/1326] 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 feeb513f21d986f8227d192213d8f9b2e1279672 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Apr 2023 13:05:50 +0300 Subject: [PATCH 0929/1326] 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 45c13be6b0914a79670dbc63152f7ca1cf2b205a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 8 Apr 2023 13:06:56 +0300 Subject: [PATCH 0930/1326] 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 1702543f0f575a61320ece37884c67abedf6cac9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:03:28 +0300 Subject: [PATCH 0931/1326] 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 9730ee75c244b5b59501236598e80128e29534cc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:05:20 +0300 Subject: [PATCH 0932/1326] 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 a9c8c5c775e86a689843a7dd670df78bb24d8d20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Apr 2023 09:05:35 +0300 Subject: [PATCH 0933/1326] 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 70bf63b61ad2f35bae007097a15736e8262aa8c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Apr 2023 00:02:58 +0300 Subject: [PATCH 0934/1326] 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 348ab63f9992ac83cb93bd454db9b3d7ce52b7f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 14 Apr 2023 00:14:27 +0300 Subject: [PATCH 0935/1326] 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 e147459f1e71fd7cc8f64620411389b07b506ac8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 16 Apr 2023 12:50:05 +0300 Subject: [PATCH 0936/1326] 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 c15ec5ec3e1c9544f840a4647f1427bd8018c068 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 17 Apr 2023 11:47:11 +0300 Subject: [PATCH 0937/1326] 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 ed15c8fcb7462c70ee2c5a07d73cc94e104c2477 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 21 Apr 2023 18:08:48 +0300 Subject: [PATCH 0938/1326] 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 0e1ae7608a1df07fe359c9fa162809fd03348ebe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Apr 2023 17:42:03 +0300 Subject: [PATCH 0939/1326] 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 b151067a21fcc32c4912b39b1dc2104bf0a63108 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Apr 2023 17:46:32 +0300 Subject: [PATCH 0940/1326] 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 d19e5a8b6a79c77076b7c48027e4400c198a9f48 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Apr 2023 21:41:28 +0300 Subject: [PATCH 0941/1326] 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 ac221a9f9f67b8d613f1ee2647b0a7504b3504f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Apr 2023 16:02:27 +0300 Subject: [PATCH 0942/1326] 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 afe64f98bc2cb0ccff1dcfbe00ff8a78afd8c7c4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 2 May 2023 09:24:46 +0300 Subject: [PATCH 0943/1326] 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 d747f64d6383be442b0071465041e2da195468e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 May 2023 10:17:44 +0300 Subject: [PATCH 0944/1326] 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 6c65550c697d04282020fbebbb21c6abafa026ef Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 May 2023 10:17:55 +0300 Subject: [PATCH 0945/1326] 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 9d7f734d50410c8273eb0a211270ce3bc86b1010 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 11:22:05 +0300 Subject: [PATCH 0946/1326] 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 83996be539cac6c386e7a36914819ecef8326536 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 11:26:52 +0300 Subject: [PATCH 0947/1326] 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 7c2e4a67a7fcf41d2bc0bc438e44d11e55e0bab5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 17:59:45 +0300 Subject: [PATCH 0948/1326] 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 0a21e02625b04e408cfc03cbf99d8ad09806e4b4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 18:00:04 +0300 Subject: [PATCH 0949/1326] 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 955020d9f41f24c585d459dd87a527b867373fac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 8 May 2023 18:06:57 +0300 Subject: [PATCH 0950/1326] 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 310f8aa45c43c364519f8600d597c1c593bcc6c7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 9 May 2023 08:58:21 +0300 Subject: [PATCH 0951/1326] 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 639a58a437728708d8600969370e1c1b8996f2f6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 May 2023 15:11:22 +0300 Subject: [PATCH 0952/1326] 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 788e3b6e40f539705ee6dfc875e24d73a00eb02a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 May 2023 08:57:16 +0300 Subject: [PATCH 0953/1326] 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 677b16789cf93b786d4d862de4ec60036211d37b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 21:38:07 +0300 Subject: [PATCH 0954/1326] 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 d5973ea4e3f2ac19e7d327f803f0659739cc74ff Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:04:02 +0300 Subject: [PATCH 0955/1326] 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 747a44d61ebd199f5022b6f7c5d490a4ccc6fea6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:04:32 +0300 Subject: [PATCH 0956/1326] 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 aac4c7b2667726e09d1666502d9b730c24f02422 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 May 2023 22:20:27 +0300 Subject: [PATCH 0957/1326] 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 fae5908673ae8962e641ec9105cb2de9e662c6fa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 May 2023 09:16:29 +0300 Subject: [PATCH 0958/1326] 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 80b724faf9779f2b1376a4e01a158129a3e04087 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 08:41:18 +0300 Subject: [PATCH 0959/1326] 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 96db564b83665bd56e99e7c13c54751e549dfb10 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 08:44:50 +0300 Subject: [PATCH 0960/1326] 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 a7eb1024e157ee1880a21ecd101e9dc3fd9df0aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 May 2023 22:08:02 +0300 Subject: [PATCH 0961/1326] 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 718ecfa54eda20f0a053c36dc449fd610d5fe73e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 9 Jun 2023 09:06:55 +0300 Subject: [PATCH 0962/1326] 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 3e1d80c56c82e312d52189d046888acd3fe17bf3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:35:24 +0300 Subject: [PATCH 0963/1326] 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 764f2ea7f0ac7a1f35159d1f50df34fd8ce5504c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:44:09 +0300 Subject: [PATCH 0964/1326] 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 c0f87b2b42139ba533dd44d625106e8707e69d6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:44:52 +0300 Subject: [PATCH 0965/1326] 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 89d4ea3737dff4af337f72fd3ac6483b7a331877 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 17 Jun 2023 14:49:08 +0300 Subject: [PATCH 0966/1326] 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 e141efbbe4f6ceeff555b7198f81380571693df3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jun 2023 12:39:51 +0300 Subject: [PATCH 0967/1326] 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 4b3fde70d76805bcf6e5e70fd15995559d4d2143 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 27 Jun 2023 12:50:11 +0300 Subject: [PATCH 0968/1326] 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 37b5dd3bd528f200dec7a8da19f02f4cb0f76938 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Jul 2023 09:35:10 +0300 Subject: [PATCH 0969/1326] 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 c56c2473a6d01770bcc0ef95b9d39f3d5eeda362 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 11 Jul 2023 10:39:32 +0300 Subject: [PATCH 0970/1326] 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 4d5a0b8f6ee6618624a83e1016e952e1474babe0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 11 Jul 2023 14:23:13 +0300 Subject: [PATCH 0971/1326] 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 28b9999f3993092b1af6a62fcb36eacacd8660dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Jul 2023 13:46:51 +0300 Subject: [PATCH 0972/1326] 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 33ce1106e74e3988eee1bc53a1bf2b062e085549 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 12 Jul 2023 13:47:14 +0300 Subject: [PATCH 0973/1326] 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 fd625a1d8fda5a2c374c5bed7d066bdbd7018af9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 14 Aug 2023 14:17:22 +0300 Subject: [PATCH 0974/1326] 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 2df8cd814875f451ec30f9146cb26361a1726cdd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 13:20:16 +0300 Subject: [PATCH 0975/1326] 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 525031bd0a29f2c229485d2feef3aaa5dc17b72b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 13:20:31 +0300 Subject: [PATCH 0976/1326] 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 b8818d5439eebe9ba6cac5d08a9a2f07d283e2a2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 15:26:33 +0300 Subject: [PATCH 0977/1326] 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 09b1a3a47a2381c0995547f1476d97ad0efdbbac Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 21 Aug 2023 16:58:18 +0300 Subject: [PATCH 0978/1326] 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 a6e95a47196c2a23e0ea19b8620aa6a0f475d329 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 5 Sep 2023 10:22:09 +0300 Subject: [PATCH 0979/1326] 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 b1da4472cd60d4088b022eb57d0c9559625c58c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 9 Sep 2023 12:15:41 +0300 Subject: [PATCH 0980/1326] 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 c06876a990600325fb930f68174babb9c3ac7b3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:19:15 +0300 Subject: [PATCH 0981/1326] 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 a8eed9e9855798484c2e83cb75f79390e30c3f6f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:19:57 +0300 Subject: [PATCH 0982/1326] 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 be68ab02c141b5d188ed93805f977eb2f29a8046 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:21:19 +0300 Subject: [PATCH 0983/1326] 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 ae5fd10a44673206f2a5ecedb3fe4becd5f49bec Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:33:01 +0300 Subject: [PATCH 0984/1326] 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 4f3234d98afc264482f666f31c632e6e15e193a7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 11 Sep 2023 15:35:20 +0300 Subject: [PATCH 0985/1326] 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 27e7e2458efff207aab68ab72977afec15cb0d2f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 15 Sep 2023 09:54:36 +0300 Subject: [PATCH 0986/1326] 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 370ae38846cbe93b50a326e9696f50333e79b878 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 12:54:49 +0300 Subject: [PATCH 0987/1326] 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 78bff95587ff3b836ba55465c4d3837f69ca09b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 13:01:41 +0300 Subject: [PATCH 0988/1326] 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 949319f1a9ae7255349d7c4a6bd29b613f2ead0f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 16:47:46 +0300 Subject: [PATCH 0989/1326] 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 c255a9ea7f930db33d734e05f23b63e96f054e70 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Sep 2023 16:48:04 +0300 Subject: [PATCH 0990/1326] 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 7895e73ce683049e90b5b88ac80f1226cdc714d3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:23:27 +0300 Subject: [PATCH 0991/1326] 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 7330cf920ba41ea47a9749c46c688025bbf798d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:23:52 +0300 Subject: [PATCH 0992/1326] 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 72a86c007a059b18e41976babf7c9df3c438ae3d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 16:52:06 +0300 Subject: [PATCH 0993/1326] 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 dd2e8c1db21e5d85c29574db822dff0f5fa843c0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 20:58:25 +0300 Subject: [PATCH 0994/1326] 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 58736a27d46ba47abcd8211f8c76653c28adbe4a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 20:58:43 +0300 Subject: [PATCH 0995/1326] 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 8a924d17c5c354af6c0e1ac330948f47b4b8de42 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 20 Sep 2023 21:07:52 +0300 Subject: [PATCH 0996/1326] 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 82eab3ff946426818b30772e83725ac3b90842a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Sep 2023 15:39:04 +0300 Subject: [PATCH 0997/1326] 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 aa42d6ab3917fffb1008504402f3af8c0be53cfc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 21 Sep 2023 15:39:25 +0300 Subject: [PATCH 0998/1326] 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 488b3e5bf4f7d0bf0ee9b3b528195cc84695af01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 09:37:58 +0300 Subject: [PATCH 0999/1326] 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 67f4a173d968484faa6a88ebd36f136d8ee899db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 20:17:42 +0300 Subject: [PATCH 1000/1326] 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 b8f62fd19beed57f3f2dcba998ece0c69fe12c9e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 22 Sep 2023 20:20:32 +0300 Subject: [PATCH 1001/1326] 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 44b04cd35bc43680f02ce06dfca8aecd3fa24af1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 10:16:35 +0300 Subject: [PATCH 1002/1326] 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 9b4a1e15988b7482e4739e395ef9fee67cb3c101 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 10:16:46 +0300 Subject: [PATCH 1003/1326] 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 68ca9c6ab63876995f1f8571ca53fd3ef700eb9f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Sep 2023 15:06:50 +0300 Subject: [PATCH 1004/1326] 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 b170d0182aae5c7b6f1587be4f94823646d7be05 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Sep 2023 09:03:03 +0300 Subject: [PATCH 1005/1326] 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 97bbcfd517331fb195259908d327e979a675ac36 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Sep 2023 09:03:17 +0300 Subject: [PATCH 1006/1326] 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 33258e3bf35acfea9ee13faf3256c2f577431c75 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 3 Oct 2023 10:40:06 +0300 Subject: [PATCH 1007/1326] 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 0997a179d4352eabaa0944d06ea2613da092eec1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 10:27:17 +0300 Subject: [PATCH 1008/1326] 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 7d07bbfaa6a7122553f0086ff233d7e4c7740d53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 10:29:05 +0300 Subject: [PATCH 1009/1326] 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 976b2d04fbdb026cbcf4c63d56c29b114c421cea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 11:01:08 +0300 Subject: [PATCH 1010/1326] 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 5d9708d5356510fad340994f3c6a68e384eebd21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 11:04:29 +0300 Subject: [PATCH 1011/1326] 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 aef2e0a750df93d40c5d02a19b6663cb9fe121b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 4 Oct 2023 13:17:43 +0300 Subject: [PATCH 1012/1326] 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 67d4a408e26fd537a49049b83a3d00aaa4936244 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Oct 2023 09:13:32 +0300 Subject: [PATCH 1013/1326] 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 bbb67058e7a569e45a15b315ec8f94a76363472e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 9 Oct 2023 10:05:44 +0300 Subject: [PATCH 1014/1326] 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 557fba419bcf2c480b791c5432d5f7fd82118894 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 11 Oct 2023 10:44:36 +0300 Subject: [PATCH 1015/1326] 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 82e23cd6b220364de0fbb74b63ed6e55ad93ec28 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 13 Oct 2023 13:02:03 +0300 Subject: [PATCH 1016/1326] 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 12535c2ae00cf8d07f552e662b8a8d37f64be520 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 09:16:26 +0300 Subject: [PATCH 1017/1326] 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 be766e97bca87df8644b54dc1cb4afd4e35680ba Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 21:00:51 +0300 Subject: [PATCH 1018/1326] 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 88bb9f641272c540b4dcaaa88bc8d1cbedecc7c3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 18 Oct 2023 21:04:51 +0300 Subject: [PATCH 1019/1326] 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 718070963aa204332ec44ec292e1895be670548a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 22:44:36 +0200 Subject: [PATCH 1020/1326] 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 91eca4d282c4ec4d98c54f71a05697a646faa175 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 22:53:42 +0200 Subject: [PATCH 1021/1326] 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 3a3869dd775e27ec46704deaf64528eb44b29477 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 23:03:13 +0200 Subject: [PATCH 1022/1326] 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 4b6f9b19d9709e02d80e9cbfed31da62cffa0795 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Oct 2023 23:09:55 +0200 Subject: [PATCH 1023/1326] 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 8a7c780bf3d5292f015cb02011ab1c6d8b51aee6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 31 Oct 2023 13:49:38 +0200 Subject: [PATCH 1024/1326] 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 5c65dd9cb9de569e586e48db9c3b772a734fb67a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Nov 2023 16:35:23 +0200 Subject: [PATCH 1025/1326] 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 858a3cd1542e2da5592995790a7c98e1d98415cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 1 Nov 2023 16:35:55 +0200 Subject: [PATCH 1026/1326] 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 f387868de1abdadd9a4cfe7958b2f96d9b2d16e2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 2 Nov 2023 11:52:40 +0200 Subject: [PATCH 1027/1326] 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 48a1f9901f077cf5a85a3ba0352176c1ec1ac11f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Nov 2023 14:07:52 +0200 Subject: [PATCH 1028/1326] 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 2bf1f47b2ff2b7996c8b78eb42b5ade822855dc2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 7 Nov 2023 14:16:03 +0200 Subject: [PATCH 1029/1326] 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 ed43d0f48f9f07ffae70b8bbce67be0b57ba0b01 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 10:40:27 +0200 Subject: [PATCH 1030/1326] 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 a13b7829ea2ab125a11fe743096563962ed36590 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 10:51:56 +0200 Subject: [PATCH 1031/1326] 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 39ff6b0eb626aa37658fef5375cfbea2b816c77b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 15:17:00 +0200 Subject: [PATCH 1032/1326] 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 690deb51c0c23bede7cdf2e5baad77ef94b3f4ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:02:12 +0200 Subject: [PATCH 1033/1326] 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 016f11b42ddf8da0c5ca3560d66c0a2b79d020da Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:03:11 +0200 Subject: [PATCH 1034/1326] 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 b740475b5868c526cb6436599cff4f624ae3dde1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 18:03:28 +0200 Subject: [PATCH 1035/1326] 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 5326fe37b3d77f029901be37b435c2119e5d1780 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 Nov 2023 19:04:46 +0200 Subject: [PATCH 1036/1326] 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 42c81d20ddb6a8f742f5ac0d413595b573df6d00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Nov 2023 09:44:07 +0200 Subject: [PATCH 1037/1326] 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 aa1af14bfd31443edc8642a4db1efce09585e7f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 Nov 2023 09:44:43 +0200 Subject: [PATCH 1038/1326] 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 8336ec5048715dd504bebedc727b234290954324 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 08:01:52 +0200 Subject: [PATCH 1039/1326] 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 8d2e52ec5ed6e4b39bb025f42e486a2fa7a40ee2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 08:09:40 +0200 Subject: [PATCH 1040/1326] 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 0a9d36d1119a3fa141df7cf5e3bb1b27154fb2f4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:48:09 +0200 Subject: [PATCH 1041/1326] 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 e7829af03c10081bb0e6f48fc4516143d986a278 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:48:28 +0200 Subject: [PATCH 1042/1326] 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 e18faebc50ea2b1a7ce19ef62c765deb1ff8fcc9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 16:53:58 +0200 Subject: [PATCH 1043/1326] 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 69174838ad8eb40ad9f399bed08053a0189023be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 22:03:18 +0200 Subject: [PATCH 1044/1326] 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 c6391d5557b2da79c9e79dc91a6b2aef548c19b7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 17 Nov 2023 23:28:48 +0200 Subject: [PATCH 1045/1326] 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 94244ca95cdc6b77d52e55bf1d8cbd65135f8cda Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 00:21:28 +0200 Subject: [PATCH 1046/1326] 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 f44e0b3274646e1b70ea7c6b033884d150da4460 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 02:27:14 +0200 Subject: [PATCH 1047/1326] 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 e8102344308da1d139185a12436465cca4af14d2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 02:54:35 +0200 Subject: [PATCH 1048/1326] 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 b1461d75e025c3161ba0f7a550d7e21de8cfa74e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 10:09:47 +0200 Subject: [PATCH 1049/1326] 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 ad580cc29f71e0b011b5db8521399687a7f326e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 21:41:50 +0200 Subject: [PATCH 1050/1326] 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 0df316b4fb0033a66c9ed86b89798f658ff769b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:31:15 +0200 Subject: [PATCH 1051/1326] 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 43d1cf31d85fa92626806c3b59e3a2532b380e02 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:31:29 +0200 Subject: [PATCH 1052/1326] 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 2277d4d1700d6f1743ff9ed470cc547f16312d45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 22:44:34 +0200 Subject: [PATCH 1053/1326] 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 0207ba10647d963089c3337b656c428e2a9fc0ea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:04:55 +0200 Subject: [PATCH 1054/1326] 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 36a9af78dcb2bb5161a6e7dab7795d870fb4d5a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:08:00 +0200 Subject: [PATCH 1055/1326] 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 5ef4529512010d5321b80adc75a28f7211fe74cd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:11:45 +0200 Subject: [PATCH 1056/1326] 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 bbce000bcd0a5571656ce6cb1575c35c8684d1b5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 23:23:39 +0200 Subject: [PATCH 1057/1326] 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 f5e338529147a77b94b49b56250376c106e5f918 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 15:20:25 +0200 Subject: [PATCH 1058/1326] 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 53a52fb737aece7610cdcfb169e9ba832bf9d0be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 16:15:45 +0200 Subject: [PATCH 1059/1326] 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 6fbba8bf3d8f284eed4e4fcea8fe72d0bb7e7352 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 21:14:45 +0200 Subject: [PATCH 1060/1326] 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 2a0d70174629ede61d9dbd0f8fbabe7b8e86b6e6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 Nov 2023 22:08:46 +0200 Subject: [PATCH 1061/1326] 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 26d0dae2fca83b9b2a534f90b452baf451738565 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 07:52:05 +0200 Subject: [PATCH 1062/1326] 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 b5498c671d9ff6efa10a83ea5df8b23c22d7cff4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:28:54 +0200 Subject: [PATCH 1063/1326] 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 03ffc98988379ff96b1dd8e172dbbd4c59e26a86 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:29:51 +0200 Subject: [PATCH 1064/1326] 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 d89cc0c05336d7a6be5d85bbc7609e0dfd4e9bae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:31:07 +0200 Subject: [PATCH 1065/1326] 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 7f30c278c6b9a5c2b289695a157b9260b674e3ee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:32:32 +0200 Subject: [PATCH 1066/1326] 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 7b4f647d0a49e1ba6b4de9f63d4798586f029121 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Nov 2023 08:20:24 +0200 Subject: [PATCH 1067/1326] 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 825b49ad0609b674b021aba9e525673a43a9dba3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 22 Nov 2023 16:18:01 +0200 Subject: [PATCH 1068/1326] 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 5a6cdb43d630eb31b74ef8f1295000711dc4e6e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 23 Nov 2023 20:15:16 +0200 Subject: [PATCH 1069/1326] 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 c41260c67560143b71f6bdcc1693a057baed39cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 24 Nov 2023 21:52:58 +0200 Subject: [PATCH 1070/1326] 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 81f95c723119318e6692d31d1d16ce60eda8a521 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 12:22:04 +0200 Subject: [PATCH 1071/1326] 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 abf58e5fbb5f064250aa72e8d70dc56e2c012c45 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:24:17 +0200 Subject: [PATCH 1072/1326] 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 6d53b138513ba942a47d5218a6544d83be6e9f98 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:24:48 +0200 Subject: [PATCH 1073/1326] 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 448a5657528cac87b8df0f65a7f9a4a7b0fb4a95 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:31:24 +0200 Subject: [PATCH 1074/1326] 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 a88e6d2a8af39d5d31edc9edd01e207a99ccead7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:32:42 +0200 Subject: [PATCH 1075/1326] 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 527ee2093fc04f1d698873728585d9039e4edb18 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:44:23 +0200 Subject: [PATCH 1076/1326] 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 aedf8972559abd1fd0c6447c483bd3b48bf1b732 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 13:53:48 +0200 Subject: [PATCH 1077/1326] 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 fac0494df89be4dfd795c9e72b48f274cf2f75fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:13:26 +0200 Subject: [PATCH 1078/1326] 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 7bd4c6e93e376afae3a752453a20cc280d312219 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:17:43 +0200 Subject: [PATCH 1079/1326] 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 efcdb566b84dfc36af7cff3afd19d23ba7125b82 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:37:36 +0200 Subject: [PATCH 1080/1326] 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 d2f19f1cff0d6d3ffcee921a9c6642c51aeec80f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 14:58:52 +0200 Subject: [PATCH 1081/1326] 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 6afe158c3638ded7e50823897a99400512d2cc84 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 15:01:50 +0200 Subject: [PATCH 1082/1326] 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 e2cc5c3094cc5a044a19d2e30d338158b6b64021 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 15:58:35 +0200 Subject: [PATCH 1083/1326] 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 aa9160047e9bbc82ca5f1d6505a15aa861db10af Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 17:08:33 +0200 Subject: [PATCH 1084/1326] 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 a1f02beaab0274ae2172eb4cd13278060db76f90 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 Nov 2023 21:25:23 +0200 Subject: [PATCH 1085/1326] 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 e746ffb6864cf8e0c2f01b7933c2e210394a0c3e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 28 Nov 2023 15:28:20 +0200 Subject: [PATCH 1086/1326] 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 7c9c49a223e82e0f8c9ea45ee5fdee02da7ff8f7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:28:06 +0200 Subject: [PATCH 1087/1326] 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 2da1aaa4237e0b2f67c0a9f070155e020f42e338 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:30:21 +0200 Subject: [PATCH 1088/1326] 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 01289bfca15bb2f2ae2bf73b5ff750eb14cd2b5a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Nov 2023 21:40:47 +0200 Subject: [PATCH 1089/1326] 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 0e86371aa65e3afb10c771c6e6f1ef6724a514f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Dec 2023 13:12:38 +0200 Subject: [PATCH 1090/1326] 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 91339aacf125b4529d49106287193c013cdf0689 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 10:12:33 +0200 Subject: [PATCH 1091/1326] 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 21855752931edd9cac20f6272b2647e082054047 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 10:14:51 +0200 Subject: [PATCH 1092/1326] 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 a3c027d3f1cb0d9022dde4e196adc3720360b740 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Dec 2023 12:59:09 +0200 Subject: [PATCH 1093/1326] 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 d23c84d2f7ac00040c6f7ab1260f27ffd15ff98b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Dec 2023 20:20:20 +0200 Subject: [PATCH 1094/1326] 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 2c96ee40eba8eb662203045ecf10cfb6069b9a6c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Dec 2023 20:21:40 +0200 Subject: [PATCH 1095/1326] 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 29c8f2dbd4256261566786cce0613469acedefdb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 18 Dec 2023 15:41:04 +0200 Subject: [PATCH 1096/1326] 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 4f63196ec09d3ecbd82d971a69a4e52af11a7460 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Dec 2023 10:02:55 +0200 Subject: [PATCH 1097/1326] 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 f8f8687fb5acb580f6d9ee3fefdcacc729e10ecb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 27 Dec 2023 14:50:20 +0200 Subject: [PATCH 1098/1326] 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 e67dfedbe5c4f2758680cd9d40e5ae67be2fd738 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Dec 2023 19:29:56 +0200 Subject: [PATCH 1099/1326] 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 81dcb8771bb7914819fc2a380c7fe339306bcc35 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 29 Dec 2023 19:30:08 +0200 Subject: [PATCH 1100/1326] 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 24a65922dd79a0a6f3599625c811056431239619 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Jan 2024 14:06:45 +0200 Subject: [PATCH 1101/1326] 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 ed0abc6dbe3e730b227775d5e4057d4c69f9dddb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 5 Jan 2024 14:06:52 +0200 Subject: [PATCH 1102/1326] 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 a39971efe0966e26b68a1079dffddc1fa3558c22 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 11 Jan 2024 10:09:10 +0200 Subject: [PATCH 1103/1326] 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 fb152b40c8b8fc1d5bba16f5f383a5a2dbca8dc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 11:41:13 +0200 Subject: [PATCH 1104/1326] 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 bbf9d29e21ec273fd6c5ec7cd5ec95b68e9632f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 11:51:01 +0200 Subject: [PATCH 1105/1326] 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 d36fd68030340cc3080a35996bc24ed74901ec74 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 12 Jan 2024 12:00:52 +0200 Subject: [PATCH 1106/1326] 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 3c7ff8b7fbdd8855ab28316e77cb34393783c9fd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 22 Jan 2024 10:52:45 +0200 Subject: [PATCH 1107/1326] 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 4994c68d83965545519ebbf69ed7914917301d06 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jan 2024 09:21:25 +0200 Subject: [PATCH 1108/1326] 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 c8ff860c421ca62c5165dd324de783a2a3856083 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 09:59:37 +0200 Subject: [PATCH 1109/1326] 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 bbfd741c95cfc69082e96ea12985f66f3d56254f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 09:59:52 +0200 Subject: [PATCH 1110/1326] 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 6997121c4ec27cea9dad2e7a0295928c01073a20 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 10:06:34 +0200 Subject: [PATCH 1111/1326] 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 bb75584fa2bb5a2b9878e7499fdb98d08dd598bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 13:51:39 +0200 Subject: [PATCH 1112/1326] 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 8912fed29c3c3e11609f313f2dd0c67b3fe6add9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 13:52:46 +0200 Subject: [PATCH 1113/1326] 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 5654fd6beee23a643c6b8bc8cf0cdb58569d39a7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 22:20:34 +0200 Subject: [PATCH 1114/1326] 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 26bcca97ba94501de73d5fc6f1ca4c4e40204912 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jan 2024 22:48:11 +0200 Subject: [PATCH 1115/1326] 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 f85a6425d1d3ab8ac069ef141be6f143959430f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jan 2024 08:36:38 +0200 Subject: [PATCH 1116/1326] 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 48f8b06521ed2a88b153053d24d848126bb6d6fd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jan 2024 15:30:12 +0200 Subject: [PATCH 1117/1326] 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 1cac49f5aa8d26c6d06af6d1d01558001c99a240 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 26 Jan 2024 16:47:55 +0200 Subject: [PATCH 1118/1326] 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 24ac9700ea3c8b15df1340074dd4d1281f82e5a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:12:57 +0200 Subject: [PATCH 1119/1326] 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 4aabd574ff36e09f9ebf9b21c80f417a92a0c2ca Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:13:17 +0200 Subject: [PATCH 1120/1326] 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 9e23c13bc4eeb7d5f6cf7a1743c331db44a4f1a0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:13:56 +0200 Subject: [PATCH 1121/1326] 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 90ff510799a5d0ddfa11987b705bce8c268d9cbd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 28 Jan 2024 19:14:11 +0200 Subject: [PATCH 1122/1326] 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 e4a20edda935870d95567e21452e5e01a92aa5d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:46:50 +0200 Subject: [PATCH 1123/1326] 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 48d0871acad0e9550996800befebe58e84afb8bd Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:47:13 +0200 Subject: [PATCH 1124/1326] 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 4e4975039f53035cb3ce0b20a0e1ca55de0f601d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 12:47:24 +0200 Subject: [PATCH 1125/1326] 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 91e2671ddd48ad06878ca184b8732509a064d570 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:22:32 +0200 Subject: [PATCH 1126/1326] 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 126b72166f5b367090f22e2cfeb9530f0b79f769 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:25:15 +0200 Subject: [PATCH 1127/1326] 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 3000d8bbfb23b8907e905b6162e586659c03ab9f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:36:36 +0200 Subject: [PATCH 1128/1326] 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 1d34f2128853fc52ec2824f367d72fb4744bc4a5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 13:55:54 +0200 Subject: [PATCH 1129/1326] 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 63abd4e9cd428ffd38d0d9ee49b8be8b42d43949 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Jan 2024 14:06:13 +0200 Subject: [PATCH 1130/1326] 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 df45dea14325fbf89856e44003ca77fcdd975c8c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 3 Feb 2024 19:37:08 +0200 Subject: [PATCH 1131/1326] 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 7136b447f94cc84e41aa683296aaaae7aadf097c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:15:36 +0200 Subject: [PATCH 1132/1326] 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 ea273128c60a97dad1b8af671d7b55390cb6e9b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:27:08 +0200 Subject: [PATCH 1133/1326] 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 06b5e11bb500d20c94c809ef2529885b513a2963 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 4 Feb 2024 10:56:03 +0200 Subject: [PATCH 1134/1326] 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 86e1caceade0b05cf886af8852fee672b5be836c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Feb 2024 13:02:04 +0200 Subject: [PATCH 1135/1326] 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 f935e4583d9cefa79edeab68e253f7cbf2c0dcc4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 5 Feb 2024 13:04:10 +0200 Subject: [PATCH 1136/1326] 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 abed8becf4e35abba01c7e311249aa4ccba7c8dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 20:51:10 +0200 Subject: [PATCH 1137/1326] 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 9e11157642e5aebc2ea1c2300fcb29d9e1926b6d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 20:52:51 +0200 Subject: [PATCH 1138/1326] 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 c8e751a77502054410f931e7f88d36e893692a62 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 21:22:24 +0200 Subject: [PATCH 1139/1326] 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 2cf82bbec9edb8c196b12e83f12cd047bdf93372 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Feb 2024 21:22:57 +0200 Subject: [PATCH 1140/1326] 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 3795a4910971cfd2eb83525eb473e34d100ee654 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Feb 2024 09:49:02 +0200 Subject: [PATCH 1141/1326] 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 91b071865a37a3ce9a0d835fcbb09d89285db067 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 16 Feb 2024 09:55:03 +0200 Subject: [PATCH 1142/1326] 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 41d821d0867feece5fcf9cb2313f384c64dba4dc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 19 Feb 2024 14:53:12 +0200 Subject: [PATCH 1143/1326] 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 3b7133a9979baca63c996ef0a51654117e413351 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Feb 2024 11:15:11 +0200 Subject: [PATCH 1144/1326] 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 b7f54f8dc001739c868a2eedcf1510bc6812db0a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Feb 2024 11:15:26 +0200 Subject: [PATCH 1145/1326] 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 8b39e5912b78f931903a59a40977e307bcdea1d7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 23 Feb 2024 20:17:30 +0200 Subject: [PATCH 1146/1326] 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 37366f5652a370279c69f2a98a608cdbfc90f09d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 00:39:27 +0200 Subject: [PATCH 1147/1326] 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 eae8a1dfe1792239c15ae44c023a7d90bf0df738 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 01:03:40 +0200 Subject: [PATCH 1148/1326] 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 68ac24e29f69ed60f2abdd4355abb78cbbbd04db Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 24 Feb 2024 14:29:55 +0200 Subject: [PATCH 1149/1326] 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 2b6a1b6fafd5cde8a35c02ae20f829b7c7cf1fd9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 11:24:18 +0200 Subject: [PATCH 1150/1326] 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 6c86c4a87e7a5db3d2a8cbcf7cfc4f957244d957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 12:57:44 +0200 Subject: [PATCH 1151/1326] 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 d76a6d292b8a526e2f7dd5d7fc4935968810799b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 25 Feb 2024 13:18:37 +0200 Subject: [PATCH 1152/1326] 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 f47ae0ddee721cb42c66b9bbf8195f85fd3e599f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 14:35:51 +0200 Subject: [PATCH 1153/1326] 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 032a7614ee6c05edce97c13db26f7ec765e92fea Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 18:26:49 +0200 Subject: [PATCH 1154/1326] 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 5775a8a3ba887b08b94e4e32dfe08fb598f8fbbc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 26 Feb 2024 18:26:59 +0200 Subject: [PATCH 1155/1326] 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 443da724f657cd2ee6464da4c545534baf6189b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 28 Feb 2024 09:04:56 +0200 Subject: [PATCH 1156/1326] 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 61b2e7aff25ad25d2a95d171f54391c4a8afda7e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Mar 2024 16:00:21 +0200 Subject: [PATCH 1157/1326] 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 fc27e459a21005dab0bc4bc99663d9506cc523fe Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 1 Mar 2024 17:33:06 +0200 Subject: [PATCH 1158/1326] 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 4f2f79407203f10366ee9bc4c419dedf527f7854 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Mar 2024 09:52:53 +0200 Subject: [PATCH 1159/1326] 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 8d2612203fa22e444e066a34d21ff76a719225aa Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 3 Mar 2024 09:53:37 +0200 Subject: [PATCH 1160/1326] 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 5339a3f7ba57b47af2558c74fab463b898845811 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:28:44 +0200 Subject: [PATCH 1161/1326] 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 bcfc37b2db33067eccd6228ee1dcbc0a5dbc36f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:32:53 +0200 Subject: [PATCH 1162/1326] 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 40a8b3b9f115a25f1fd5161c3b97c3ac299048c8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 6 Mar 2024 17:36:08 +0200 Subject: [PATCH 1163/1326] 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 4ac75462029d57c6172e6899a462725c4b26549e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:12:47 +0200 Subject: [PATCH 1164/1326] 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 ae2bfbbe3147e40d9056de8a17da8f6244d7f91f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:12:58 +0200 Subject: [PATCH 1165/1326] 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 ec9d9e373be5c9cc9dbcd0daed3a1c4017ddb481 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 8 Mar 2024 16:19:33 +0200 Subject: [PATCH 1166/1326] 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 f7fb8685dd442c80b1cbc9306660b78a7c8b0cee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:47:21 +0200 Subject: [PATCH 1167/1326] 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 7ba056c4624491c41e0a3dce52d2efdb5ff456e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:53:38 +0200 Subject: [PATCH 1168/1326] 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 90053ea7a486d19dcb7628af394d179802a950c6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 09:54:32 +0200 Subject: [PATCH 1169/1326] 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 0102e10ef33104e2249970518da93727db408aa7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:06:59 +0200 Subject: [PATCH 1170/1326] 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 b682fe72aa339bb507f445b07104369b123e8710 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:08 +0200 Subject: [PATCH 1171/1326] 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 a31b8a77b1c7fb8130f989dad2e329bc39248db0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:28 +0200 Subject: [PATCH 1172/1326] 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 6da6d02aa1ce17d8e4cef7f2c8886be45801cb37 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:49:42 +0200 Subject: [PATCH 1173/1326] 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 e987265041a48e5e47fdeecb59547aed085b230c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:56:50 +0200 Subject: [PATCH 1174/1326] 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 96cfeadd7db43488dfc6acee946a872cdfa26804 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 10:57:29 +0200 Subject: [PATCH 1175/1326] 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 03b262f7146cc1683cca2468b3b0eaf327096ad7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 17 Mar 2024 11:02:57 +0200 Subject: [PATCH 1176/1326] 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 3b486b15d99c319c4987cf2b29fe90e000b81659 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:14:20 +0200 Subject: [PATCH 1177/1326] 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 046fb6f7e88acabfe60770dea1d32d6dcf66763c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:19:31 +0200 Subject: [PATCH 1178/1326] 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 d74947de33780891c1df452e056ef40da44b1589 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 19 Mar 2024 21:49:21 +0200 Subject: [PATCH 1179/1326] 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 9e14c21524765480c08bd16b17743a5da94a694f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 15:27:32 +0300 Subject: [PATCH 1180/1326] 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 9fd6ff013e7d34dd6fa4b1268312ba65350c09a6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 15:27:51 +0300 Subject: [PATCH 1181/1326] 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 9e83832681a455e631988c4b9974ba0298036bb2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 16:30:36 +0300 Subject: [PATCH 1182/1326] 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 989fe4b507341f1c96312761e2a12051b3afea13 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Apr 2024 16:30:41 +0300 Subject: [PATCH 1183/1326] 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 b86c9ba8d0ffb4bce2180c4dafcd08fb21792fd9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 4 Apr 2024 19:39:02 +0300 Subject: [PATCH 1184/1326] 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 3a059aff2f805ecfd08b95d61f6bf9293b08e1de Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 15 Apr 2024 10:56:58 +0300 Subject: [PATCH 1185/1326] 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 152e05db1165c38f928964360870609b8518935f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 20 Apr 2024 10:42:57 +0300 Subject: [PATCH 1186/1326] 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 669365befd3485060ad6fc36519b333666c7949a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Apr 2024 10:25:01 +0300 Subject: [PATCH 1187/1326] 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 6ff6de2dc4720f810f5f59848cf89489ddea36a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 21 Apr 2024 19:41:55 +0300 Subject: [PATCH 1188/1326] 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 a4db9345c943ef5e82ac6505a4ae31779c1cff9c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Apr 2024 10:48:26 +0300 Subject: [PATCH 1189/1326] 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 227624d0976456dc6caec2930abe24704f1d767f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 30 Apr 2024 12:46:19 +0300 Subject: [PATCH 1190/1326] 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 4de757b465f9b3a89dc9fda953c5b02daed9c0fc Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 May 2024 09:59:44 +0300 Subject: [PATCH 1191/1326] 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 659f4337c71c682e67cfa0af42f8dd2d21d3f22e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 6 May 2024 10:00:05 +0300 Subject: [PATCH 1192/1326] 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 598ed7b7b3fa8bd698cbad11966e02e76d2807b1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 8 May 2024 09:03:22 +0300 Subject: [PATCH 1193/1326] 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 9165c4775006afae6e6b1cda0ab4ed5d5a324a63 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:27:20 +0300 Subject: [PATCH 1194/1326] 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 3e698a0edf3e00e7b6a87d8ee8622595697ac8bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 10 May 2024 21:28:53 +0300 Subject: [PATCH 1195/1326] 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 8963a40485f6b8a4ca4519c97ec759d1a8b9971d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 May 2024 17:19:16 +0300 Subject: [PATCH 1196/1326] 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 5e6e8d5f545be3c4ba72331825bafe1965f2c201 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 10:05:44 +0300 Subject: [PATCH 1197/1326] 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 f74ec7c4c4258540b43d58db6cfe69e4ea1b823e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 10:06:10 +0300 Subject: [PATCH 1198/1326] 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 3ba31fa6e7afedc0bde3527d8e342ff62a495dd2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 12:54:38 +0300 Subject: [PATCH 1199/1326] 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 483cca53598e37bfb78fce94922b5e5f45e3b9d6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 16:31:44 +0300 Subject: [PATCH 1200/1326] 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 0c8284badc7a4fb5915cff089dca356c2bb1535f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 21:55:02 +0300 Subject: [PATCH 1201/1326] 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 123104740ecc59c94375a918da5bc413b871469f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 12 May 2024 22:13:17 +0300 Subject: [PATCH 1202/1326] 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 9809d5cd32b2631b1eba8007332fb8484e7ef1e5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 13 May 2024 10:45:07 +0300 Subject: [PATCH 1203/1326] 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 39d9a343784ecab549315c23fecc1244b57dad2e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 14 May 2024 15:19:09 +0300 Subject: [PATCH 1204/1326] 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 8e1723e3e1c96c8132ef6b64b58a9bf6abcb4e73 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 May 2024 17:25:09 +0300 Subject: [PATCH 1205/1326] 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 aaa9cc67b94bd5fb86fa071fac06c304fff27be7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 15 May 2024 17:58:27 +0300 Subject: [PATCH 1206/1326] 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 66748571b89d000ff2c30dd05532c06fd45f7144 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 16 May 2024 09:05:02 +0300 Subject: [PATCH 1207/1326] 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 8920dd7657d002987698989351bd6ee0b6273643 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 May 2024 19:50:59 +0300 Subject: [PATCH 1208/1326] 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 c195635235aa2309c9eafc1b3a6cf1e56966ae21 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 May 2024 20:00:53 +0300 Subject: [PATCH 1209/1326] 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 aadfb243a0c799c54f86f41d77576018ae748491 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 May 2024 09:31:58 +0300 Subject: [PATCH 1210/1326] 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 e4b8977f6b0645c85b8048dab8bd45e8c7794888 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 20 May 2024 10:02:02 +0300 Subject: [PATCH 1211/1326] 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 b52287e25a24226583dd480d95de86237ead2b79 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 May 2024 17:11:44 +0300 Subject: [PATCH 1212/1326] 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 2c550dae6705ec964dff4121e2c25cbb8a2320f5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 25 May 2024 18:38:43 +0300 Subject: [PATCH 1213/1326] 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 15c03997e00e3a2e04662e47c0ec4473e61fee4f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 May 2024 13:20:40 +0300 Subject: [PATCH 1214/1326] 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 52e3e5f37d02ca4225bf0903b7f6792a462a2bf9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 26 May 2024 13:21:38 +0300 Subject: [PATCH 1215/1326] 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 5f586411bc46db9d88b19c705fe0b2182f5194a9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 May 2024 11:51:59 +0300 Subject: [PATCH 1216/1326] 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 4275c7705e252c1843d215989db0b9c37a9709d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 27 May 2024 22:05:38 +0300 Subject: [PATCH 1217/1326] 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 fad25a8127e17726e469bede9a78120d05b8a191 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 4 Jun 2024 10:48:13 +0300 Subject: [PATCH 1218/1326] 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 a14104a3b9399c9fceb36ec4765749ec2b615300 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 5 Jun 2024 00:19:53 +0300 Subject: [PATCH 1219/1326] 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 46cfc9deb1079cd7d6523dfb9059d5284f5456cf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 17:01:15 +0300 Subject: [PATCH 1220/1326] 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 8de560c410b58ff4ec0679e43ac1b68585fc9400 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 17:56:59 +0300 Subject: [PATCH 1221/1326] 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 65203b480b298cece6fe5fb1924c7e8ca017b8f3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 18 Jun 2024 18:24:56 +0300 Subject: [PATCH 1222/1326] 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 53c84a3200cf8946e25cbc1e7a76d3f518d1cf24 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 20 Jun 2024 22:02:05 +0300 Subject: [PATCH 1223/1326] 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 dc52aa3852dcb241b228940762133f48e0781b67 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 11:13:26 +0300 Subject: [PATCH 1224/1326] 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 dc62164e1956dfcdf295d79e063d34c53c1758c1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 11:13:50 +0300 Subject: [PATCH 1225/1326] 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 e82459e2f876924bb07ce8978ca5fd08297f0155 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 14:25:27 +0300 Subject: [PATCH 1226/1326] 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 b6af136f0bc9bc4038d08bc022ac9d7b817321e7 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 17:00:16 +0300 Subject: [PATCH 1227/1326] 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 32a7a4221849f75726a7ce64b0af0196b0388b06 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 24 Jun 2024 17:00:29 +0300 Subject: [PATCH 1228/1326] 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 765cb0ce2b2195ff1457f0cc9ebf27814f35585d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 25 Jun 2024 09:01:52 +0300 Subject: [PATCH 1229/1326] 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 08559475cf07139878626564c101f921643f606a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Jun 2024 11:34:00 +0300 Subject: [PATCH 1230/1326] 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 ec7f932e393d37cd92d3a430eb7de63b12d92662 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 26 Jun 2024 11:34:19 +0300 Subject: [PATCH 1231/1326] 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 6409e977885c9efe51480fa514480d938d98d782 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Jun 2024 12:29:42 +0300 Subject: [PATCH 1232/1326] 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 14920550cd67839512092035113f22ef89f78b5b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 29 Jun 2024 13:42:31 +0300 Subject: [PATCH 1233/1326] 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 4d451a1007db865ba4ad7c2d083e907b825cdff9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sun, 30 Jun 2024 10:56:50 +0300 Subject: [PATCH 1234/1326] 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 ff5fd33f7be0ed10d262a07b048306fa0309179a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 1 Jul 2024 09:14:32 +0300 Subject: [PATCH 1235/1326] 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 f8329b1b78eb9b0eff725dbb0b7456743c989715 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:13:01 +0300 Subject: [PATCH 1236/1326] 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 b712091b1b12a53109817e6c43dc86ce93def49b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:15:06 +0300 Subject: [PATCH 1237/1326] 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 48910eb2c60315c808c094dd7ff2db84dd2df09e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:16:39 +0300 Subject: [PATCH 1238/1326] 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 29fc562c129a0b6963056afe7ba3c9d441b3b957 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 09:23:43 +0300 Subject: [PATCH 1239/1326] 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 930321bd3e52d2620cb9834359c1c02f7839a30f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 3 Jul 2024 14:04:18 +0300 Subject: [PATCH 1240/1326] 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 45373b57faf2017c9178a5928da257d4a5b20428 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 4 Jul 2024 16:45:06 +0300 Subject: [PATCH 1241/1326] 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 b3ac1d5852c1a14012433fcfaf7febf219f0442a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Jul 2024 14:00:39 +0300 Subject: [PATCH 1242/1326] 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 762e504a890950ce99c1fa1935c24b00cb86708e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 6 Jul 2024 14:02:48 +0300 Subject: [PATCH 1243/1326] 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 165c1ee9cafeb6c37876cc3f14fab267508edaa8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Jul 2024 14:08:11 +0300 Subject: [PATCH 1244/1326] 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 44345df4a9d7a03dfdf5734e0d2e5cb0e9736c53 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 13 Jul 2024 15:49:55 +0300 Subject: [PATCH 1245/1326] 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 f71985d621b1486558e57bfbaa77da41b5d0aef5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 16 Jul 2024 09:33:39 +0300 Subject: [PATCH 1246/1326] 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 e34a84810aa4dd1f51b3183f30ab26f720ca5f52 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Jul 2024 09:13:05 +0300 Subject: [PATCH 1247/1326] 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 ac19a47faf40ba4858819e92e3b0da052b196990 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 17 Jul 2024 09:13:17 +0300 Subject: [PATCH 1248/1326] 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 812423a3cd58e1489b859d6f163a47c316c4a832 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Jul 2024 11:34:00 +0300 Subject: [PATCH 1249/1326] 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 c530a0d099d205398bb3cac2e28307ea50f15d4b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 18 Jul 2024 11:34:11 +0300 Subject: [PATCH 1250/1326] 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 fa99efa07782222d32f6f1ed3d9d2a2f3c8327d1 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:40:45 +0300 Subject: [PATCH 1251/1326] 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 e4c0bed1a888c61874595ae1159c23dfac7dfd5c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:40:59 +0300 Subject: [PATCH 1252/1326] 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 7f1e3dcd3449cf8baa320738da9ceb3ed6a7c617 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 23 Jul 2024 14:41:08 +0300 Subject: [PATCH 1253/1326] 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 d9b1dbf51253bbee2428dd33eaa8c0448dd378b6 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 24 Jul 2024 15:55:36 +0300 Subject: [PATCH 1254/1326] 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 6006c9b81f87a8f04e8984b5af7016c381d30f23 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:17:33 +0300 Subject: [PATCH 1255/1326] 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 caf00593bf2357262a99d737e0658921832015ad Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:25:06 +0300 Subject: [PATCH 1256/1326] 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 8d2b06f27bf34f8c07b036fe62ce61aa4b89b338 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 10:25:49 +0300 Subject: [PATCH 1257/1326] 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 b8b3c2106bf7ffc3e27c71367de740670098f826 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:36:52 +0300 Subject: [PATCH 1258/1326] 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 4ec9a9ada662222631aca1ce1e330cf6608c08be Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:40:20 +0300 Subject: [PATCH 1259/1326] 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 96a51205d354bf09a45747abfcd81b9fa7fc2c8f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 25 Jul 2024 13:43:30 +0300 Subject: [PATCH 1260/1326] 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 1dc452b66d016a6d2cd8bdc15deb36cd094dccbf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:45:57 +0300 Subject: [PATCH 1261/1326] 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 316dfa5137f522430424e6550e6f19f217bdac30 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:46:34 +0300 Subject: [PATCH 1262/1326] 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 0d75a242780023c04a0b3ead9b6003d9afa485ae Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:47:00 +0300 Subject: [PATCH 1263/1326] 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 da9cd3f89a03df1fe6ca8300400e3e9dfd625073 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 8 Aug 2024 11:47:17 +0300 Subject: [PATCH 1264/1326] 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 436526ffb9d9747afe48cd7b1fef56fd7e6ff612 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 15 Aug 2024 09:11:45 +0300 Subject: [PATCH 1265/1326] 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 e5f677793ddff498bea376dc1b6e8a41f7ad8c99 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 12:40:07 +0300 Subject: [PATCH 1266/1326] 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 267e7c36d5cef13c5f5163394316ffee62726753 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 12:40:38 +0300 Subject: [PATCH 1267/1326] 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 f1b28a9b2d5df7c9ba5ff7d7cebd0b3373c8ec2f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 15:15:23 +0300 Subject: [PATCH 1268/1326] 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 1db002a9cb47aed3263ad7808c213a412f8b0a23 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 20 Aug 2024 15:29:28 +0300 Subject: [PATCH 1269/1326] 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 f137e5e872fd65a6bf5aa498769f8b922b71bff4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 19 Sep 2024 10:30:01 +0300 Subject: [PATCH 1270/1326] Restore dotdrop template on git config --- home/.config/git/config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/.config/git/config b/home/.config/git/config index dde22dfc..788a7261 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -1,5 +1,9 @@ [user] +{%@@ if profile == "mko-laptop" @@%} email = marko.korhonen@rossum.fi +{%@@ else @@%} +email = marko@korhonen.cc +{%@@ endif @@%} name = Marko Korhonen signingkey = F2B9F713E7ED627336DD85E444FA3F28CD931BB0 From 0c2d089da25ea50365dec37b3304a0955b5be0a3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 19 Sep 2024 10:31:00 +0300 Subject: [PATCH 1271/1326] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 54 ++++++++++++------------- home/.config/nvim/lua/plugins/mason.lua | 4 +- home/.config/nvim/mason-lock.json | 4 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 2fd9a9b5..226af677 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, + "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "14cad96b80a07e9e92a0dcbe235092ed14113fb2" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, @@ -14,56 +14,56 @@ "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" }, + "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "d26bf92161cd70e049dc138b44ffa0246dbf7178" }, + "dropbar.nvim": { "branch": "master", "commit": "6156e07759fd8c7cbf764414f583aa7e47470368" }, "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" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, + "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, + "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, "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-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "fe573c7fb74252076d6c6d40837a92a7138dbb00" }, + "mini.nvim": { "branch": "main", "commit": "e50cf9de614500a20e47cfc50e30a100042f91c3" }, "neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "50708bea09cead374bf0b4b9c50686de68951d5c" }, - "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, + "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, "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-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" }, + "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "43200fb3a820ed1b6c526e0eb0f3e6e6edd9fd64" }, + "nvim-lspconfig": { "branch": "master", "commit": "73e0002b6f211376bbf36c31a2f812aedf6bd6b0" }, "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" }, + "nvim-tree.lua": { "branch": "master", "commit": "45a93d99794fff3064141d5b3a50db98ce352697" }, + "nvim-treesitter": { "branch": "master", "commit": "2b2ac302324f4cd2194c5dcaa59332b65e1c6403" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" }, + "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "statuscol.nvim": { "branch": "main", "commit": "93d8bcda516fc86e11c03f9ef577bae9a72fba0e" }, + "statuscol.nvim": { "branch": "main", "commit": "1022f922b77b44c36f8057ac29adbfd89ce86958" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, + "telescope-project.nvim": { "branch": "master", "commit": "796200876bb0fe8157b8eb1ce03d927d3827a052" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, + "telescope.nvim": { "branch": "master", "commit": "b5fd7f7ae0ea4537511077ed8ef4a6021cedba2f" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, + "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } + "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" } } diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index b357e5d4..c1231f88 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -40,8 +40,8 @@ return { -- Disable tsserver diagnostics diagnostics -- that come from ESLint - ["tsserver"] = function() - require("lspconfig").tsserver.setup(vim.tbl_extend("force", commonLspConfigArgs, { + ["ts_ls"] = function() + require("lspconfig").ts_ls.setup(vim.tbl_extend("force", commonLspConfigArgs, { settings = { diagnostics = { ignoredCodes = { diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 18047f30..73284f4a 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -10,12 +10,12 @@ "jdtls": "v1.38.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", - "lua-language-server": "3.10.5", + "lua-language-server": "3.10.6", "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.9.3", - "tree-sitter-cli": "v0.22.6", + "tree-sitter-cli": "v0.23.0", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" } From 40c18bbdb952d57d153379ed43c76ebb18160766 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 19 Sep 2024 10:37:00 +0300 Subject: [PATCH 1272/1326] Nvim: add nix tools --- home/.config/nvim/mason-lock.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 73284f4a..76c90739 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -11,6 +11,8 @@ "json-lsp": "4.10.0", "lemminx": "0.27.1", "lua-language-server": "3.10.6", + "nil": "2024-08-06", + "nixpkgs-fmt": "1.3.0", "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", From 79046dbd5ac177f18a6f7cfcf32d3795dfb4ecf8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 7 Oct 2024 11:38:07 +0300 Subject: [PATCH 1273/1326] 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 a0dffd6a..cdc6a5a4 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.5.0" +image = "code.forgejo.org/forgejo/runner:3.5.1" container_name = "forgejo-runner" user = "root:root" volumes = [ From 95ebca0acaa7abe259b98ffb5168ecc00961b8e9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Oct 2024 09:29:21 +0300 Subject: [PATCH 1274/1326] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 52 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 8 ++--- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 226af677..a467a95a 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, - "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "14cad96b80a07e9e92a0dcbe235092ed14113fb2" }, + "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "d365beccca05ffcb01e50109f2adca2459c3995a" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -16,54 +16,54 @@ "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "6156e07759fd8c7cbf764414f583aa7e47470368" }, - "firenvim": { "branch": "master", "commit": "bb70728c13c305ff35193586d5f6ce68668af063" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "dropbar.nvim": { "branch": "master", "commit": "35988affc74c0cebb1484bcdfccfed523c0e7267" }, + "firenvim": { "branch": "master", "commit": "64f9389b88c8b0c7667d45c171a5f25c42d852fb" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, - "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, - "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "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-extra-cmds": { "branch": "main", "commit": "606ecf0cebed0f91926558158e61725d2678d90c" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "e50cf9de614500a20e47cfc50e30a100042f91c3" }, - "neoformat": { "branch": "master", "commit": "b3b38589b39038dc12c2f5a59a828ed43439363a" }, - "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" }, + "mini.nvim": { "branch": "main", "commit": "d4ce7d025f9c7bb4d55ebc4fd88987651e632893" }, + "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" }, + "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "50708bea09cead374bf0b4b9c50686de68951d5c" }, - "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "7b8dacdcea38dad0b53b8c3ae01e7045ed6a04db" }, + "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" }, - "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, - "nvim-jdtls": { "branch": "master", "commit": "99e4b2081de1d9162666cc7b563cbeb01c26b66b" }, + "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, + "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim-jdtls": { "branch": "master", "commit": "efe813854432a314b472226dca813f0f2598d44a" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "73e0002b6f211376bbf36c31a2f812aedf6bd6b0" }, + "nvim-lspconfig": { "branch": "master", "commit": "541f3a2781de481bb84883889e4d9f0904250a56" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-tree.lua": { "branch": "master", "commit": "45a93d99794fff3064141d5b3a50db98ce352697" }, - "nvim-treesitter": { "branch": "master", "commit": "2b2ac302324f4cd2194c5dcaa59332b65e1c6403" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "bf8d2ad35d1d1a687eae6c065c3d524f7ab61b23" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, + "nvim-tree.lua": { "branch": "master", "commit": "f5f67892996b280ae78b1b0a2d07c4fa29ae0905" }, + "nvim-treesitter": { "branch": "master", "commit": "92725df6222614307c4712eb9982e5287f21aa11" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" }, - "nvim-web-devicons": { "branch": "master", "commit": "9154484705968658e9aab2b894d1b2a64bf9f83d" }, + "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "statuscol.nvim": { "branch": "main", "commit": "1022f922b77b44c36f8057ac29adbfd89ce86958" }, + "statuscol.nvim": { "branch": "main", "commit": "5998d16044159ad3779f62c45e756c555e3051f0" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-project.nvim": { "branch": "master", "commit": "796200876bb0fe8157b8eb1ce03d927d3827a052" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "b5fd7f7ae0ea4537511077ed8ef4a6021cedba2f" }, + "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" } + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } } diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 76c90739..31556341 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,23 +1,23 @@ { - "bash-language-server": "5.4.0", + "bash-language-server": "5.4.2", "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", + "google-java-format": "v1.24.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.6", + "lua-language-server": "3.11.1", "nil": "2024-08-06", "nixpkgs-fmt": "1.3.0", "prettier": "3.3.3", "prettierd": "0.25.3", "stylua": "v0.20.0", "taplo": "0.9.3", - "tree-sitter-cli": "v0.23.0", + "tree-sitter-cli": "v0.24.3", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" } From 4f496661981dd455c53e1bb064b2fde84ed9c047 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Oct 2024 09:29:41 +0300 Subject: [PATCH 1275/1326] Disable thefuck alias --- home/.config/zsh/03-plugins.zsh | 5 ----- home/.config/zsh/04-aliases.zsh | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 71655894..1a482711 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -46,11 +46,6 @@ 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 @@%} - # Generate completions at runtime zinit ice wait'2' lucid zinit light RobSis/zsh-completion-generator diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index ad1a5586..34b2d886 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -203,7 +203,7 @@ update() { {%@@ elif distro_id == "termux" @@%} pkg update && pkg upgrade --yes {%@@ endif @@%} - {%@@ if distro_id == "termux" or distro_id == "ubuntu" or distro_id == "debian" @@%} + {%@@ if distro_id == "termux" @@%} pip-update-installed cargo-update-installed {%@@ endif @@%} From 9c92e2305b10ee7b3c277f7bf2677e4c789b6533 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Oct 2024 10:04:51 +0300 Subject: [PATCH 1276/1326] Neovim: add more git keybinds --- home/.config/nvim/lua/plugins/fugitive.lua | 27 ++++++++++++++++++++++ home/.config/nvim/lua/plugins/gitsigns.lua | 6 ++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua index f6282331..b92048ed 100644 --- a/home/.config/nvim/lua/plugins/fugitive.lua +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -1,3 +1,5 @@ +local k = vim.keymap.set + -- Git commands --- @type LazyPluginSpec return { @@ -8,5 +10,30 @@ return { "https://git.korhonen.cc", "https://git.rossum.fi", } + + -- Keybinds + k("n", "gs", function() + vim.cmd("Git status") + end, { desc = "Status" }) + + k("n", "gaa", function() + vim.cmd("Git add -A") + end, { desc = "All" }) + + k("n", "gc", function() + vim.cmd("Git commit") + end, { desc = "Commit" }) + + k("n", "gu", function() + vim.cmd("Git push") + end, { desc = "Push" }) + + k("n", "gd", function() + vim.cmd("Git pull") + end, { desc = "Pull" }) + + k({ "n", "x" }, "gb", function() + vim.cmd("GBrowse") + end, { desc = "Browse" }) end, } diff --git a/home/.config/nvim/lua/plugins/gitsigns.lua b/home/.config/nvim/lua/plugins/gitsigns.lua index 000ef9d5..4cec2e48 100644 --- a/home/.config/nvim/lua/plugins/gitsigns.lua +++ b/home/.config/nvim/lua/plugins/gitsigns.lua @@ -7,6 +7,9 @@ return { local gs = require("gitsigns") gs.setup() + -- Keybinds + local opts + -- Add groups for which-key require("which-key").add({ { "g", group = "Git" }, @@ -14,9 +17,6 @@ return { { "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" }) From 04fce77606713a183e1a9c89d6591d785bbce003 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 17 Oct 2024 10:20:16 +0300 Subject: [PATCH 1277/1326] Neovim: Fix GBrowse keybind in visual mode --- home/.config/nvim/lua/plugins/fugitive.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua index b92048ed..e86feb14 100644 --- a/home/.config/nvim/lua/plugins/fugitive.lua +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -32,8 +32,6 @@ return { vim.cmd("Git pull") end, { desc = "Pull" }) - k({ "n", "x" }, "gb", function() - vim.cmd("GBrowse") - end, { desc = "Browse" }) + k({ "n", "x" }, "gb", "'<,'>GBrowse", { desc = "Browse" }) end, } From c809231c673213b90d98a9ced8ad1807348518e4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Oct 2024 09:01:54 +0300 Subject: [PATCH 1278/1326] Update comment --- home/.config/nvim/lua/plugins/fugitive.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/.config/nvim/lua/plugins/fugitive.lua b/home/.config/nvim/lua/plugins/fugitive.lua index e86feb14..a8086c6c 100644 --- a/home/.config/nvim/lua/plugins/fugitive.lua +++ b/home/.config/nvim/lua/plugins/fugitive.lua @@ -32,6 +32,6 @@ return { vim.cmd("Git pull") end, { desc = "Pull" }) - k({ "n", "x" }, "gb", "'<,'>GBrowse", { desc = "Browse" }) + k({ "n", "x" }, "gb", "'<,'>GBrowse", { desc = "Open in browser" }) end, } From e4c77d22d8340ee6bda2da9fb9279110d034000f Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 25 Oct 2024 09:02:03 +0300 Subject: [PATCH 1279/1326] 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 a467a95a..434819ce 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { - "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, + "LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" }, "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "d365beccca05ffcb01e50109f2adca2459c3995a" }, - "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, + "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, "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-git": { "branch": "main", "commit": "741b6a759dbbcc55e9e5d72e2a84099cf6f4af9c" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -14,43 +14,43 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, - "copilot.lua": { "branch": "master", "commit": "1a237cf50372830a61d92b0adf00d3b23882e0e1" }, + "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "35988affc74c0cebb1484bcdfccfed523c0e7267" }, + "dropbar.nvim": { "branch": "master", "commit": "998441a88476af2ec77d8cb1b21bae62c9f548c1" }, "firenvim": { "branch": "master", "commit": "64f9389b88c8b0c7667d45c171a5f25c42d852fb" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, - "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, + "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" }, "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, + "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, "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": "606ecf0cebed0f91926558158e61725d2678d90c" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "7446f47b3dfb7df801f31a6f6783c2ad119a6935" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "d4ce7d025f9c7bb4d55ebc4fd88987651e632893" }, + "mini.nvim": { "branch": "main", "commit": "77533e69cc4fadb7f4c25f23255ae0890a058818" }, "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" }, "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "nvim-asciidoc-preview": { "branch": "main", "commit": "7b8dacdcea38dad0b53b8c3ae01e7045ed6a04db" }, "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-jdtls": { "branch": "master", "commit": "efe813854432a314b472226dca813f0f2598d44a" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "541f3a2781de481bb84883889e4d9f0904250a56" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, + "nvim-lspconfig": { "branch": "master", "commit": "85afd4b936acd62b578c2e2d8e86541fb972c32e" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-tree.lua": { "branch": "master", "commit": "f5f67892996b280ae78b1b0a2d07c4fa29ae0905" }, - "nvim-treesitter": { "branch": "master", "commit": "92725df6222614307c4712eb9982e5287f21aa11" }, + "nvim-tree.lua": { "branch": "master", "commit": "8760d76c1d316aa46f141f3f2b80b853a2acc41e" }, + "nvim-treesitter": { "branch": "master", "commit": "377039daa260b71f304c881d1b21d643c501a261" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" }, + "nvim-ufo": { "branch": "main", "commit": "c96bb3bb853ff6253fe74f057df03e61fafd2403" }, "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 31556341..8626bee9 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -7,7 +7,7 @@ "google-java-format": "v1.24.0", "html-lsp": "4.10.0", "java-debug-adapter": "0.58.0", - "jdtls": "v1.38.0", + "jdtls": "v1.40.0", "json-lsp": "4.10.0", "lemminx": "0.27.1", "lua-language-server": "3.11.1", From 9014f87dfdfa20a8eb85ecfe8014f235843ca0e8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 31 Oct 2024 10:11:01 +0200 Subject: [PATCH 1280/1326] Fix ssh host names --- home/.ssh/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.ssh/config b/home/.ssh/config index 27720693..a0e49da5 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -8,7 +8,7 @@ host * #ControlPath ~/.ssh/%r@%h:%p.socket host moria - HostName korhonen.cc + HostName home.korhonen.cc port 221 User balrog {%@@ if distro_id != "termux" @@%} @@ -52,7 +52,7 @@ Host aur User aur host moria-unlock - HostName korhonen.cc + HostName home.korhonen.cc port 221 User root From 037967efd71689191ba6a0029f2ef4a2059efd0b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Nov 2024 10:27:12 +0200 Subject: [PATCH 1281/1326] Convert compose files to yaml toml conversion stopped working, don't want to fix it --- docker/authentik/docker-compose.toml | 78 ---------- docker/authentik/docker-compose.yaml | 85 ++++++++++ docker/backup/docker-compose.toml | 37 ----- docker/backup/docker-compose.yaml | 33 ++++ docker/caddy/docker-compose.toml | 29 ---- docker/caddy/docker-compose.yaml | 35 +++++ docker/ddns/docker-compose.toml | 8 - docker/ddns/docker-compose.yaml | 13 ++ docker/drop/docker-compose.toml | 9 -- docker/drop/docker-compose.yaml | 13 ++ docker/firefish/docker-compose.toml | 41 ----- docker/firefish/docker-compose.yaml | 48 ++++++ docker/forgejo/docker-compose.toml | 32 ---- docker/forgejo/docker-compose.yaml | 38 +++++ docker/freshrss/docker-compose.toml | 19 --- docker/freshrss/docker-compose.yaml | 25 +++ docker/headscale/docker-compose.toml | 20 --- docker/headscale/docker-compose.yaml | 23 +++ docker/homeautomation/docker-compose.toml | 111 ------------- docker/homeautomation/docker-compose.yaml | 163 ++++++++++++++++++++ docker/jellyfin/docker-compose.toml | 34 ---- docker/jellyfin/docker-compose.yaml | 33 ++++ docker/mumble/docker-compose.toml | 10 -- docker/mumble/docker-compose.yaml | 13 ++ docker/netbootxyz/docker-compose.toml | 20 --- docker/netbootxyz/docker-compose.yaml | 24 +++ docker/nextcloud/docker-compose.toml | 84 ---------- docker/nextcloud/docker-compose.yaml | 84 ++++++++++ docker/ofelia/docker-compose.toml | 9 -- docker/ofelia/docker-compose.yaml | 9 ++ docker/opentogethertube/docker-compose.toml | 38 ----- docker/opentogethertube/docker-compose.yaml | 42 +++++ docker/pihole/docker-compose.toml | 23 --- docker/pihole/docker-compose.yaml | 29 ++++ docker/postgres/docker-compose.toml | 17 -- docker/postgres/docker-compose.yaml | 19 +++ docker/searx/docker-compose.toml | 37 ----- docker/searx/docker-compose.yaml | 46 ++++++ docker/stats/docker-compose.toml | 27 ---- docker/stats/docker-compose.yaml | 30 ++++ docker/tftp/docker-compose.toml | 9 -- docker/tftp/docker-compose.yaml | 12 ++ docker/tvheadend/docker-compose.toml | 21 --- docker/tvheadend/docker-compose.yaml | 27 ++++ docker/umami/docker-compose.toml | 20 --- docker/umami/docker-compose.yaml | 21 +++ docker/watchtower/docker-compose.toml | 19 --- docker/watchtower/docker-compose.yaml | 18 +++ home/.config/zsh/04-aliases.zsh | 42 ++--- 49 files changed, 904 insertions(+), 773 deletions(-) delete mode 100644 docker/authentik/docker-compose.toml create mode 100644 docker/authentik/docker-compose.yaml delete mode 100644 docker/backup/docker-compose.toml create mode 100644 docker/backup/docker-compose.yaml delete mode 100644 docker/caddy/docker-compose.toml create mode 100644 docker/caddy/docker-compose.yaml delete mode 100644 docker/ddns/docker-compose.toml create mode 100644 docker/ddns/docker-compose.yaml delete mode 100644 docker/drop/docker-compose.toml create mode 100644 docker/drop/docker-compose.yaml delete mode 100644 docker/firefish/docker-compose.toml create mode 100644 docker/firefish/docker-compose.yaml delete mode 100644 docker/forgejo/docker-compose.toml create mode 100644 docker/forgejo/docker-compose.yaml delete mode 100644 docker/freshrss/docker-compose.toml create mode 100644 docker/freshrss/docker-compose.yaml delete mode 100644 docker/headscale/docker-compose.toml create mode 100644 docker/headscale/docker-compose.yaml delete mode 100644 docker/homeautomation/docker-compose.toml create mode 100644 docker/homeautomation/docker-compose.yaml delete mode 100644 docker/jellyfin/docker-compose.toml create mode 100644 docker/jellyfin/docker-compose.yaml delete mode 100644 docker/mumble/docker-compose.toml create mode 100644 docker/mumble/docker-compose.yaml delete mode 100644 docker/netbootxyz/docker-compose.toml create mode 100644 docker/netbootxyz/docker-compose.yaml delete mode 100644 docker/nextcloud/docker-compose.toml create mode 100644 docker/nextcloud/docker-compose.yaml delete mode 100644 docker/ofelia/docker-compose.toml create mode 100644 docker/ofelia/docker-compose.yaml delete mode 100644 docker/opentogethertube/docker-compose.toml create mode 100644 docker/opentogethertube/docker-compose.yaml delete mode 100644 docker/pihole/docker-compose.toml create mode 100644 docker/pihole/docker-compose.yaml delete mode 100644 docker/postgres/docker-compose.toml create mode 100644 docker/postgres/docker-compose.yaml delete mode 100644 docker/searx/docker-compose.toml create mode 100644 docker/searx/docker-compose.yaml delete mode 100644 docker/stats/docker-compose.toml create mode 100644 docker/stats/docker-compose.yaml delete mode 100644 docker/tftp/docker-compose.toml create mode 100644 docker/tftp/docker-compose.yaml delete mode 100644 docker/tvheadend/docker-compose.toml create mode 100644 docker/tvheadend/docker-compose.yaml delete mode 100644 docker/umami/docker-compose.toml create mode 100644 docker/umami/docker-compose.yaml delete mode 100644 docker/watchtower/docker-compose.toml create mode 100644 docker/watchtower/docker-compose.yaml diff --git a/docker/authentik/docker-compose.toml b/docker/authentik/docker-compose.toml deleted file mode 100644 index 9339e9c7..00000000 --- a/docker/authentik/docker-compose.toml +++ /dev/null @@ -1,78 +0,0 @@ -[volumes] -redis = {} -media = {} -custom_templates = {} -geoip = {} -backups = {} - -[services.redis] -image = "redis:alpine" -container_name = "authentik-redis" -networks = ["authentik"] -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 = "ghcr.io/goauthentik/server" -container_name = "authentik" -restart = "unless-stopped" -command = "server" -volumes = [ - "media:/media", - "custom_templates:/templates", - "geoip:/geoip", -] -env_file = [".env"] -networks = ["authentik", "postgres", "proxy"] - -[services.worker] -image = "ghcr.io/goauthentik/server" -container_name = "authentik-worker" -restart = "unless-stopped" -command = "worker" -user = "root" -volumes = [ - "backups:/backups", - "custom_templates:/templates", - "geoip:/geoip", - "media:/media", - "/var/run/docker.sock:/var/run/docker.sock", -] -env_file = [".env"] -networks = ["authentik", "postgres"] - -[services.geoipupdate] -image = "maxmindinc/geoipupdate" -container_name = "authentik-geoipupdate" -restart = "unless-stopped" -networks = ["authentik"] -volumes = ["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"] - -[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 new file mode 100644 index 00000000..27668a3b --- /dev/null +++ b/docker/authentik/docker-compose.yaml @@ -0,0 +1,85 @@ +volumes: + redis: {} + media: {} + custom_templates: {} + geoip: {} + backups: {} +services: + redis: + image: redis:alpine + container_name: authentik-redis + networks: + - authentik + restart: unless-stopped + volumes: + - redis:/data + healthcheck: + test: + - CMD-SHELL + - redis-cli ping | grep PONG + start_period: 20s + interval: 30s + retries: 5 + timeout: 3s + server: + image: ghcr.io/goauthentik/server + container_name: authentik + restart: unless-stopped + command: server + volumes: + - media:/media + - custom_templates:/templates + - geoip:/geoip + env_file: + - .env + networks: + - authentik + - postgres + - proxy + worker: + image: ghcr.io/goauthentik/server + container_name: authentik-worker + restart: unless-stopped + command: worker + user: root + volumes: + - backups:/backups + - custom_templates:/templates + - geoip:/geoip + - media:/media + - /var/run/docker.sock:/var/run/docker.sock + env_file: + - .env + networks: + - authentik + - postgres + geoipupdate: + image: maxmindinc/geoipupdate + container_name: authentik-geoipupdate + restart: unless-stopped + networks: + - authentik + volumes: + - geoip:/usr/share/GeoIP + env_file: + - .env + environment: + GEOIPUPDATE_EDITION_IDS: GeoLite2-City + GEOIPUPDATE_FREQUENCY: "8" + whoami-test: + image: traefik/whoami + container_name: whoami-test + restart: unless-stopped + security_opt: + - no-new-privileges:true + networks: + - proxy + environment: + - TZ +networks: + authentik: + external: true + postgres: + external: true + proxy: + external: true diff --git a/docker/backup/docker-compose.toml b/docker/backup/docker-compose.toml deleted file mode 100644 index b79bfab3..00000000 --- a/docker/backup/docker-compose.toml +++ /dev/null @@ -1,37 +0,0 @@ -[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" -restart = "unless-stopped" -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", -] diff --git a/docker/backup/docker-compose.yaml b/docker/backup/docker-compose.yaml new file mode 100644 index 00000000..adc00671 --- /dev/null +++ b/docker/backup/docker-compose.yaml @@ -0,0 +1,33 @@ +volumes: + caddy_data: + external: true + caddy_config: + external: true + caddy_wkd: + external: true + homeautomation_hass: + external: true +services: + backup: + image: offen/docker-volume-backup:v2 + container_name: volume-backup + restart: unless-stopped + 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 diff --git a/docker/caddy/docker-compose.toml b/docker/caddy/docker-compose.toml deleted file mode 100644 index d1d109f0..00000000 --- a/docker/caddy/docker-compose.toml +++ /dev/null @@ -1,29 +0,0 @@ -[volumes] -data = {} -config = {} -wkd = {} -korhonen_cc = {} - -[volumes.nextcloud_config] -external = true - -[services.caddy] -image = "git.korhonen.cc/functionalhacker/caddy" -container_name = "caddy" -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", - "nextcloud_config:/var/www/nextcloud", - "/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 diff --git a/docker/caddy/docker-compose.yaml b/docker/caddy/docker-compose.yaml new file mode 100644 index 00000000..fa7f5f9e --- /dev/null +++ b/docker/caddy/docker-compose.yaml @@ -0,0 +1,35 @@ +volumes: + data: {} + config: {} + wkd: {} + korhonen_cc: {} + nextcloud_config: + external: true +services: + caddy: + image: git.korhonen.cc/functionalhacker/caddy + container_name: caddy + 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 + - nextcloud_config:/var/www/nextcloud + - /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 diff --git a/docker/ddns/docker-compose.toml b/docker/ddns/docker-compose.toml deleted file mode 100644 index b87582c8..00000000 --- a/docker/ddns/docker-compose.toml +++ /dev/null @@ -1,8 +0,0 @@ -[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 = ["/mnt/Storage/docker/ddns/config.json:/config.json"] -restart = "unless-stopped" diff --git a/docker/ddns/docker-compose.yaml b/docker/ddns/docker-compose.yaml new file mode 100644 index 00000000..9c75b67e --- /dev/null +++ b/docker/ddns/docker-compose.yaml @@ -0,0 +1,13 @@ +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: + - /mnt/Storage/docker/ddns/config.json:/config.json + restart: unless-stopped diff --git a/docker/drop/docker-compose.toml b/docker/drop/docker-compose.toml deleted file mode 100644 index 2c07364b..00000000 --- a/docker/drop/docker-compose.toml +++ /dev/null @@ -1,9 +0,0 @@ -[services.drop] -image = "lscr.io/linuxserver/pairdrop" -container_name = "drop" -restart = "unless-stopped" -networks = ["proxy"] -environment = ["TZ=Europe/Helsinki", "IPV6_LOCALIZE=4"] - -[networks.proxy] -external = true diff --git a/docker/drop/docker-compose.yaml b/docker/drop/docker-compose.yaml new file mode 100644 index 00000000..5407b591 --- /dev/null +++ b/docker/drop/docker-compose.yaml @@ -0,0 +1,13 @@ +services: + drop: + image: lscr.io/linuxserver/pairdrop + container_name: drop + restart: unless-stopped + networks: + - proxy + environment: + - TZ=Europe/Helsinki + - IPV6_LOCALIZE=4 +networks: + proxy: + external: true diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml deleted file mode 100644 index cafcc0ce..00000000 --- a/docker/firefish/docker-compose.toml +++ /dev/null @@ -1,41 +0,0 @@ -[volumes] -files = {} -config = {} -redis = {} -db = {} - -[services.firefish] -image = "registry.firefish.dev/firefish/firefish" -container_name = "firefish" -restart = "unless-stopped" -depends_on = ["redis"] -ports = ["3084:3000"] -networks = ["firefish", "proxy"] -environment = { NODE_ENV = "production" } -volumes = ["files:/firefish/files", "config:/firefish/.config:ro"] - -[services.redis] -image = "redis" -container_name = "redis-firefish" -restart = "unless-stopped" -networks = ["firefish"] -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"] - -[services.db.healthcheck] -test = "pg_isready --user=\"firefish\" --dbname=\"firefish\"" -interval = "5s" -timeout = "5s" -retries = 5 - -[networks.firefish] -internal = true - -[networks.proxy] -external = true diff --git a/docker/firefish/docker-compose.yaml b/docker/firefish/docker-compose.yaml new file mode 100644 index 00000000..de031490 --- /dev/null +++ b/docker/firefish/docker-compose.yaml @@ -0,0 +1,48 @@ +volumes: + files: {} + config: {} + redis: {} + db: {} +services: + firefish: + image: registry.firefish.dev/firefish/firefish + container_name: firefish + restart: unless-stopped + depends_on: + - redis + ports: + - 3084:3000 + networks: + - firefish + - proxy + environment: + NODE_ENV: production + volumes: + - files:/firefish/files + - config:/firefish/.config:ro + redis: + image: redis + container_name: redis-firefish + restart: unless-stopped + networks: + - firefish + volumes: + - redis:/data + 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 + healthcheck: + test: pg_isready --user="firefish" --dbname="firefish" + interval: 5s + timeout: 5s + retries: 5 +networks: + firefish: + internal: true + proxy: + external: true diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml deleted file mode 100644 index cdc6a5a4..00000000 --- a/docker/forgejo/docker-compose.toml +++ /dev/null @@ -1,32 +0,0 @@ -[volumes] -data = {} -runner = {} - -[services.forgejo] -image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc" -container_name = "forgejo" -environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"] -restart = "unless-stopped" -networks = ["postgres", "proxy"] -ports = ["2882:22"] -volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"] - -[services.runner] -image = "code.forgejo.org/forgejo/runner:3.5.1" -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", -] -environment = ["SOCKFILE=/var/run/docker.sock"] -restart = "unless-stopped" -command = "forgejo-runner daemon -c /data/config.yaml" - -[networks.postgres] -external = true - -[networks.proxy] -external = true diff --git a/docker/forgejo/docker-compose.yaml b/docker/forgejo/docker-compose.yaml new file mode 100644 index 00000000..b88caabf --- /dev/null +++ b/docker/forgejo/docker-compose.yaml @@ -0,0 +1,38 @@ +volumes: + data: {} + runner: {} +services: + forgejo: + image: git.korhonen.cc/functionalhacker/forgejo-asciidoc + container_name: forgejo + environment: + - TZ=Europe/Helsinki + - USER_UID=1000 + - USER_GID=1000 + restart: unless-stopped + networks: + - postgres + - proxy + ports: + - "2882:22" + volumes: + - data:/data + - /etc/localtime:/etc/localtime:ro + runner: + image: code.forgejo.org/forgejo/runner:3.5.1 + 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 + environment: + - SOCKFILE=/var/run/docker.sock + restart: unless-stopped + command: forgejo-runner daemon -c /data/config.yaml +networks: + postgres: + external: true + proxy: + external: true diff --git a/docker/freshrss/docker-compose.toml b/docker/freshrss/docker-compose.toml deleted file mode 100644 index cfbbb212..00000000 --- a/docker/freshrss/docker-compose.toml +++ /dev/null @@ -1,19 +0,0 @@ -[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 = ["config:/config", "/etc/localtime:/etc/localtime:ro"] - -[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 new file mode 100644 index 00000000..b9b9b71c --- /dev/null +++ b/docker/freshrss/docker-compose.yaml @@ -0,0 +1,25 @@ +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: + - config:/config + - /etc/localtime:/etc/localtime:ro +networks: + freshrss: + external: false + postgres: + external: true + proxy: + external: true diff --git a/docker/headscale/docker-compose.toml b/docker/headscale/docker-compose.toml deleted file mode 100644 index b2c79d00..00000000 --- a/docker/headscale/docker-compose.toml +++ /dev/null @@ -1,20 +0,0 @@ -[volumes] -config = {} -data = {} - -[services.headscale] -image = "headscale/headscale:0" -container_name = "headscale" -volumes = ["config:/etc/headscale", "data:/var/lib/headscale"] -ports = ["3478:3478/udp"] -command = "headscale serve" -restart = "unless-stopped" -networks = ["postgres"] - -[services.headscale-ui] -image = "ghcr.io/gurucomputing/headscale-ui" -container_name = "headscale-ui" -restart = "unless-stopped" - -[networks.postgres] -external = true diff --git a/docker/headscale/docker-compose.yaml b/docker/headscale/docker-compose.yaml new file mode 100644 index 00000000..96d383b5 --- /dev/null +++ b/docker/headscale/docker-compose.yaml @@ -0,0 +1,23 @@ +volumes: + config: {} + data: {} +services: + headscale: + image: headscale/headscale:0 + container_name: headscale + volumes: + - config:/etc/headscale + - data:/var/lib/headscale + ports: + - 3478:3478/udp + command: headscale serve + restart: unless-stopped + networks: + - postgres + headscale-ui: + image: ghcr.io/gurucomputing/headscale-ui + container_name: headscale-ui + restart: unless-stopped +networks: + postgres: + external: true diff --git a/docker/homeautomation/docker-compose.toml b/docker/homeautomation/docker-compose.toml deleted file mode 100644 index 6c50f9c4..00000000 --- a/docker/homeautomation/docker-compose.toml +++ /dev/null @@ -1,111 +0,0 @@ -[volumes] -hass = {} -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"] -networks = ["homeautomation", "postgres", "proxy"] -ports = ["8123:8123", "8300:8300"] -extra_hosts = ["host.docker.internal:host-gateway"] - -[services.mosquitto] -container_name = "mosquitto" -image = "eclipse-mosquitto" -restart = "unless-stopped" -environment = ["TZ=Europe/Helsinki"] -networks = ["homeautomation"] -ports = ["1883:1883", "8866:8866"] -volumes = ["mosquitto:/mosquitto", "/etc/localtime:/etc/localtime:ro"] - -[services.piper_english] -container_name = "piper_english" -image = "rhasspy/wyoming-piper" -restart = "unless-stopped" -environment = ["TZ=Europe/Helsinki"] -ports = ["10200:10200"] -networks = ["homeautomation"] -command = ["--voice", "en_US-hfc_male-medium"] -volumes = ["piper_english:/data", "/etc/localtime:/etc/localtime:ro"] - -[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 - -[networks.postgres] -external = true - -[networks.proxy] -external = true diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml new file mode 100644 index 00000000..346e9660 --- /dev/null +++ b/docker/homeautomation/docker-compose.yaml @@ -0,0 +1,163 @@ +volumes: + hass: {} + 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 + networks: + - homeautomation + - postgres + - proxy + ports: + - 8123:8123 + - 8300:8300 + extra_hosts: + - host.docker.internal:host-gateway + mosquitto: + container_name: mosquitto + image: eclipse-mosquitto + restart: unless-stopped + environment: + - TZ=Europe/Helsinki + networks: + - homeautomation + ports: + - 1883:1883 + - 8866:8866 + volumes: + - mosquitto:/mosquitto + - /etc/localtime:/etc/localtime:ro + piper_english: + container_name: piper_english + image: rhasspy/wyoming-piper + restart: unless-stopped + environment: + - TZ=Europe/Helsinki + ports: + - 10200:10200 + networks: + - homeautomation + command: + - --voice + - en_US-hfc_male-medium + volumes: + - piper_english:/data + - /etc/localtime:/etc/localtime:ro + 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 + 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 + 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 + 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 + 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 + postgres: + external: true + proxy: + external: true diff --git a/docker/jellyfin/docker-compose.toml b/docker/jellyfin/docker-compose.toml deleted file mode 100644 index 661d0d2d..00000000 --- a/docker/jellyfin/docker-compose.toml +++ /dev/null @@ -1,34 +0,0 @@ -[volumes] -config = {} -cache = {} - -[volumes.media] -external = true - -[volumes.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", - "nextcloud_data:/nextcloud_data", - "/etc/localtime:/etc/localtime:ro", -] -devices = [ - "/dev/dri/renderD128:/dev/dri/renderD128", - "/dev/dri/card1:/dev/dri/card0", -] - -[networks.proxy] -external = true - -[networks.authentik] -external = true diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml new file mode 100644 index 00000000..d6edc9df --- /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 + - nextcloud_data:/nextcloud_data + - /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 deleted file mode 100644 index de0b7d26..00000000 --- a/docker/mumble/docker-compose.toml +++ /dev/null @@ -1,10 +0,0 @@ -[volumes] -config = {} - -[services.mumble] -container_name = "mumble" -image = "phlak/mumble" -environment = ["TZ=Europe/Helsinki"] -network_mode = "host" -volumes = ["config:/etc/mumble", "/etc/localtime:/etc/localtime:ro"] -restart = "unless-stopped" diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml new file mode 100644 index 00000000..6ffebe23 --- /dev/null +++ b/docker/mumble/docker-compose.yaml @@ -0,0 +1,13 @@ +volumes: + config: {} +services: + mumble: + container_name: mumble + image: phlak/mumble + environment: + - TZ=Europe/Helsinki + network_mode: host + volumes: + - config:/etc/mumble + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped diff --git a/docker/netbootxyz/docker-compose.toml b/docker/netbootxyz/docker-compose.toml deleted file mode 100644 index 8b93ec68..00000000 --- a/docker/netbootxyz/docker-compose.toml +++ /dev/null @@ -1,20 +0,0 @@ -[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"] diff --git a/docker/netbootxyz/docker-compose.yaml b/docker/netbootxyz/docker-compose.yaml new file mode 100644 index 00000000..b6cd5bea --- /dev/null +++ b/docker/netbootxyz/docker-compose.yaml @@ -0,0 +1,24 @@ +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 diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml deleted file mode 100644 index cec2461c..00000000 --- a/docker/nextcloud/docker-compose.toml +++ /dev/null @@ -1,84 +0,0 @@ -[volumes.nextcloud_config] -external = true - -[volumes.nextcloud_data] -external = true - -[services.nextcloud] -image = "nextcloud:fpm-alpine" -container_name = "nextcloud" -restart = "unless-stopped" -networks = ["nextcloud", "postgres", "proxy"] -volumes = [ - "nextcloud_config:/var/www/html", - "nextcloud_data:/var/www/html/data", - "/etc/localtime:/etc/localtime:ro", -] -environment = [ - "REDIS_HOST=redis", - "REDIS_HOST_PASSWORD=123", - "TRUSTED_PROXIES=caddy", - "NEXTCLOUD_TRUSTED_DOMAINS=cloud.korhonen.cc", - "OVERWRITEHOST=cloud.korhonen.cc", - "OVERWRITEPROTOCOL=https", -] -depends_on = ["redis"] - -[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" -container_name = "redis-nextcloud" -networks = ["nextcloud"] -restart = "unless-stopped" -command = "redis-server --requirepass 123" - -[services.coturn] -image = "instrumentisto/coturn" -container_name = "coturn" -restart = "unless-stopped" -env_file = ".env" -ports = ["3478:3478/tcp", "3478:3478/udp", "49160-49200:49160-49200/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}", -] - -[services.collabora] -image = "collabora/code" -container_name = "collabora" -restart = "unless-stopped" -env_file = ".env" -environment = [ - "username=${COLLABORA_USERNAME}", - "password=${COLLABORA_PASSWORD}", - "domain=cloud.korhonen.cc", - 'extra_params=--o:ssl.enable=false --o:ssl.termination=true', -] -networks = ["proxy"] - -[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 new file mode 100644 index 00000000..f22bc02a --- /dev/null +++ b/docker/nextcloud/docker-compose.yaml @@ -0,0 +1,84 @@ +volumes: + nextcloud_config: + external: true + nextcloud_data: + external: true +services: + nextcloud: + image: nextcloud:fpm-alpine + container_name: nextcloud + restart: unless-stopped + networks: + - nextcloud + - postgres + - proxy + volumes: + - nextcloud_config:/var/www/html + - nextcloud_data:/var/www/html/data + - /etc/localtime:/etc/localtime:ro + environment: + - REDIS_HOST=redis + - REDIS_HOST_PASSWORD=123 + - TRUSTED_PROXIES=caddy + - NEXTCLOUD_TRUSTED_DOMAINS=cloud.korhonen.cc + - OVERWRITEHOST=cloud.korhonen.cc + - 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: true + redis: + image: redis:alpine + container_name: redis-nextcloud + networks: + - nextcloud + restart: unless-stopped + command: redis-server --requirepass 123 + coturn: + image: instrumentisto/coturn + container_name: coturn + restart: unless-stopped + env_file: .env + ports: + - 3478:3478/tcp + - 3478:3478/udp + - 49160-49200:49160-49200/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} + collabora: + image: collabora/code + container_name: collabora + restart: unless-stopped + env_file: .env + environment: + - username=${COLLABORA_USERNAME} + - password=${COLLABORA_PASSWORD} + - domain=cloud.korhonen.cc + - extra_params=--o:ssl.enable=false --o:ssl.termination=true + networks: + - proxy +networks: + nextcloud: + external: false + postgres: + external: true + proxy: + external: true diff --git a/docker/ofelia/docker-compose.toml b/docker/ofelia/docker-compose.toml deleted file mode 100644 index e9e5ea0b..00000000 --- a/docker/ofelia/docker-compose.toml +++ /dev/null @@ -1,9 +0,0 @@ -[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", -] -command = "daemon --docker" diff --git a/docker/ofelia/docker-compose.yaml b/docker/ofelia/docker-compose.yaml new file mode 100644 index 00000000..00c4ba93 --- /dev/null +++ b/docker/ofelia/docker-compose.yaml @@ -0,0 +1,9 @@ +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 + command: daemon --docker diff --git a/docker/opentogethertube/docker-compose.toml b/docker/opentogethertube/docker-compose.toml deleted file mode 100644 index f1333a94..00000000 --- a/docker/opentogethertube/docker-compose.toml +++ /dev/null @@ -1,38 +0,0 @@ -[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"] -volumes = ["./production.toml:/app/env/production.toml"] - -[services.redis] -container_name = "redis-opentogethertube" -image = "redis:alpine" -restart = "unless-stopped" - -[services.redis.healthcheck] -test = "redis-cli ping" - -[networks.postgres] -external = true - -[networks.proxy] -external = true diff --git a/docker/opentogethertube/docker-compose.yaml b/docker/opentogethertube/docker-compose.yaml new file mode 100644 index 00000000..f4ed1f85 --- /dev/null +++ b/docker/opentogethertube/docker-compose.yaml @@ -0,0 +1,42 @@ +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 + volumes: + - ./production.toml:/app/env/production.toml + redis: + container_name: redis-opentogethertube + image: redis:alpine + restart: unless-stopped + healthcheck: + test: redis-cli ping +networks: + postgres: + external: true + proxy: + external: true diff --git a/docker/pihole/docker-compose.toml b/docker/pihole/docker-compose.toml deleted file mode 100644 index b9fccf3a..00000000 --- a/docker/pihole/docker-compose.toml +++ /dev/null @@ -1,23 +0,0 @@ -[volumes] -config = {} -dnsmasq = {} - -[services.pihole] -container_name = "pihole" -image = "pihole/pihole" -ports = ["53:53/tcp", "53:53/udp", "67:67/udp", "8069:80/tcp"] -networks = ["proxy"] -volumes = [ - "config:/etc/pihole/", - "dnsmasq:/etc/dnsmasq.d/", -] -dns = ["127.0.0.1", "1.1.1.1"] -cap_add = ["NET_ADMIN"] -restart = "unless-stopped" - -[services.pihole.environment] -TZ = "Europe/Helsinki" -WEBPASSWORD = "${WEBPASSWORD}" - -[networks.proxy] -external = true diff --git a/docker/pihole/docker-compose.yaml b/docker/pihole/docker-compose.yaml new file mode 100644 index 00000000..8ce68ccd --- /dev/null +++ b/docker/pihole/docker-compose.yaml @@ -0,0 +1,29 @@ +volumes: + config: {} + dnsmasq: {} +services: + pihole: + container_name: pihole + image: pihole/pihole + ports: + - 53:53/tcp + - 53:53/udp + - 67:67/udp + - 8069:80/tcp + networks: + - proxy + volumes: + - config:/etc/pihole/ + - dnsmasq:/etc/dnsmasq.d/ + dns: + - 127.0.0.1 + - 1.1.1.1 + cap_add: + - NET_ADMIN + restart: unless-stopped + environment: + TZ: Europe/Helsinki + WEBPASSWORD: ${WEBPASSWORD} +networks: + proxy: + external: true diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml deleted file mode 100644 index c9e76182..00000000 --- a/docker/postgres/docker-compose.toml +++ /dev/null @@ -1,17 +0,0 @@ -[volumes] -data = {} - -[services.postgres] -container_name = "postgres" -image = "postgres:16" -environment = ["TZ=Europe/Helsinki"] -ports = ["127.0.0.1:5432:5432"] -networks = ["postgres"] -volumes = [ - "data:/var/lib/postgresql/data", - "/etc/localtime:/etc/localtime:ro", -] -restart = "unless-stopped" - -[networks.postgres] -external = true diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml new file mode 100644 index 00000000..7c420e42 --- /dev/null +++ b/docker/postgres/docker-compose.yaml @@ -0,0 +1,19 @@ +volumes: + data: {} +services: + postgres: + container_name: postgres + image: postgres:16 + environment: + - TZ=Europe/Helsinki + ports: + - 127.0.0.1:5432:5432 + networks: + - postgres + volumes: + - data:/var/lib/postgresql/data + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped +networks: + postgres: + external: true diff --git a/docker/searx/docker-compose.toml b/docker/searx/docker-compose.toml deleted file mode 100644 index 53f082b8..00000000 --- a/docker/searx/docker-compose.toml +++ /dev/null @@ -1,37 +0,0 @@ -[volumes] -config = {} - -[services.searx] -container_name = "searx" -image = "searxng/searxng" -restart = "unless-stopped" -networks = ["searx", "proxy"] -volumes = [ - "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/"] -cap_drop = ["ALL"] -cap_add = ["CHOWN", "SETGID", "SETUID", "DAC_OVERRIDE"] - -[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 diff --git a/docker/searx/docker-compose.yaml b/docker/searx/docker-compose.yaml new file mode 100644 index 00000000..909957a6 --- /dev/null +++ b/docker/searx/docker-compose.yaml @@ -0,0 +1,46 @@ +volumes: + config: {} +services: + searx: + container_name: searx + image: searxng/searxng + restart: unless-stopped + networks: + - searx + - proxy + volumes: + - config:/etc/searxng + environment: + - SEARXNG_BASE_URL=https://search.korhonen.cc/ + cap_drop: + - ALL + cap_add: + - CHOWN + - SETGID + - SETUID + - DAC_OVERRIDE + logging: + driver: json-file + options: + max-size: 1m + max-file: "1" + 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 + proxy: + external: true diff --git a/docker/stats/docker-compose.toml b/docker/stats/docker-compose.toml deleted file mode 100644 index 15e5141d..00000000 --- a/docker/stats/docker-compose.toml +++ /dev/null @@ -1,27 +0,0 @@ -[services.grafana] -image = "grafana/grafana" -container_name = "grafana" -volumes = ["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 diff --git a/docker/stats/docker-compose.yaml b/docker/stats/docker-compose.yaml new file mode 100644 index 00000000..f5b38202 --- /dev/null +++ b/docker/stats/docker-compose.yaml @@ -0,0 +1,30 @@ +services: + grafana: + image: grafana/grafana + container_name: grafana + volumes: + - 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 + proxy: + external: true diff --git a/docker/tftp/docker-compose.toml b/docker/tftp/docker-compose.toml deleted file mode 100644 index bdb6db47..00000000 --- a/docker/tftp/docker-compose.toml +++ /dev/null @@ -1,9 +0,0 @@ -[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 new file mode 100644 index 00000000..47d6d3c0 --- /dev/null +++ b/docker/tftp/docker-compose.yaml @@ -0,0 +1,12 @@ +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/tvheadend/docker-compose.toml b/docker/tvheadend/docker-compose.toml deleted file mode 100644 index d1a3d97b..00000000 --- a/docker/tvheadend/docker-compose.toml +++ /dev/null @@ -1,21 +0,0 @@ -[volumes] -config = {} -picons = {} - -[services.tvheadend] -image = "linuxserver/tvheadend" -container_name = "tvheadend" -environment = ["TZ=Europe/Helsinki", "PUID=1000", "PGID=985"] -volumes = [ - "config:/config", - "picons:/picons", - "/mnt/Storage/Media/PVR:/recordings", - "/etc/localtime:/etc/localtime:ro", -] -ports = ["9981:9981", "9982:9982"] -devices = ["/dev/dvb:/dev/dvb"] -restart = "unless-stopped" -networks = ["proxy"] - -[networks.proxy] -external = true diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml new file mode 100644 index 00000000..64a2595c --- /dev/null +++ b/docker/tvheadend/docker-compose.yaml @@ -0,0 +1,27 @@ +volumes: + config: {} + picons: {} +services: + tvheadend: + image: linuxserver/tvheadend + container_name: tvheadend + environment: + - TZ=Europe/Helsinki + - PUID=1000 + - PGID=985 + volumes: + - config:/config + - picons:/picons + - /mnt/Storage/Media/PVR:/recordings + - /etc/localtime:/etc/localtime:ro + ports: + - 9981:9981 + - 9982:9982 + devices: + - /dev/dvb:/dev/dvb + restart: unless-stopped + networks: + - proxy +networks: + proxy: + external: true diff --git a/docker/umami/docker-compose.toml b/docker/umami/docker-compose.toml deleted file mode 100644 index adfb9642..00000000 --- a/docker/umami/docker-compose.toml +++ /dev/null @@ -1,20 +0,0 @@ -[services.umami] -image = "ghcr.io/umami-software/umami:postgresql-latest" -container_name = "umami" -restart = "unless-stopped" -networks = ["postgres", "proxy"] -env_file = ".env" - -[services.umami.environment] -DATABASE_URL = "postgresql://umami:${POSTGRES_PASS}@postgres:5432/umami" -HASH_SALT = "${HASH_SALT}" - -[services.umami.logging.options] -max-size = "10m" -max-file = "10" - -[networks.postgres] -external = true - -[networks.proxy] -external = true diff --git a/docker/umami/docker-compose.yaml b/docker/umami/docker-compose.yaml new file mode 100644 index 00000000..9f6956e9 --- /dev/null +++ b/docker/umami/docker-compose.yaml @@ -0,0 +1,21 @@ +services: + umami: + image: ghcr.io/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} + logging: + options: + max-size: 10m + max-file: "10" +networks: + postgres: + external: true + proxy: + external: true diff --git a/docker/watchtower/docker-compose.toml b/docker/watchtower/docker-compose.toml deleted file mode 100644 index cc3a5a84..00000000 --- a/docker/watchtower/docker-compose.toml +++ /dev/null @@ -1,19 +0,0 @@ -[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", -] diff --git a/docker/watchtower/docker-compose.yaml b/docker/watchtower/docker-compose.yaml new file mode 100644 index 00000000..1429c1c4 --- /dev/null +++ b/docker/watchtower/docker-compose.yaml @@ -0,0 +1,18 @@ +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 diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 34b2d886..427e8a3d 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -232,13 +232,13 @@ update() { local docker-update() { prevpwddocker=$PWD - for dir in $HOME/git/dotfiles/docker/*; do + for dir in $HOME/git/dotfiles/docker/*/; do cd $dir - if [[ -f "$dir/DISABLED" ]]; then + if [[ -f ./DISABLED ]]; then echo "$(basename $dir) stack is disabled, skipping..." else - dct -f $dir/docker-compose.toml pull - dct -f $dir/docker-compose.toml up -d + docker compose pull + docker compose up -d fi cd .. done @@ -351,23 +351,23 @@ 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 - $@ -} +# 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 /dev/stdin --env-file ./.env $@ +# } alias dslr-webcam='pkill -f gphoto2; gphoto2 --stdout --capture-movie | ffmpeg -i - -vcodec rawvideo -pix_fmt yuv420p -threads 0 -f v4l2 /dev/video0' From 393ceb36a9e35f914f65cfbe9f6291d74c820eee Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 4 Nov 2024 10:29:08 +0200 Subject: [PATCH 1282/1326] Format docker compose files --- docker/authentik/docker-compose.yaml | 2 +- docker/forgejo/docker-compose.yaml | 2 +- docker/searx/docker-compose.yaml | 2 +- docker/umami/docker-compose.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml index 27668a3b..7b620946 100644 --- a/docker/authentik/docker-compose.yaml +++ b/docker/authentik/docker-compose.yaml @@ -65,7 +65,7 @@ services: - .env environment: GEOIPUPDATE_EDITION_IDS: GeoLite2-City - GEOIPUPDATE_FREQUENCY: "8" + GEOIPUPDATE_FREQUENCY: '8' whoami-test: image: traefik/whoami container_name: whoami-test diff --git a/docker/forgejo/docker-compose.yaml b/docker/forgejo/docker-compose.yaml index b88caabf..44e2e8d6 100644 --- a/docker/forgejo/docker-compose.yaml +++ b/docker/forgejo/docker-compose.yaml @@ -14,7 +14,7 @@ services: - postgres - proxy ports: - - "2882:22" + - '2882:22' volumes: - data:/data - /etc/localtime:/etc/localtime:ro diff --git a/docker/searx/docker-compose.yaml b/docker/searx/docker-compose.yaml index 909957a6..cd419ee4 100644 --- a/docker/searx/docker-compose.yaml +++ b/docker/searx/docker-compose.yaml @@ -23,7 +23,7 @@ services: driver: json-file options: max-size: 1m - max-file: "1" + max-file: '1' redis: container_name: redis-searx image: redis:alpine diff --git a/docker/umami/docker-compose.yaml b/docker/umami/docker-compose.yaml index 9f6956e9..d92ff9d8 100644 --- a/docker/umami/docker-compose.yaml +++ b/docker/umami/docker-compose.yaml @@ -13,7 +13,7 @@ services: logging: options: max-size: 10m - max-file: "10" + max-file: '10' networks: postgres: external: true From e66af1d7ce4671bf365d00265c085c358387a868 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Dec 2024 16:14:15 +0200 Subject: [PATCH 1283/1326] Git: Add dno alias --- home/.config/git/config | 1 + 1 file changed, 1 insertion(+) diff --git a/home/.config/git/config b/home/.config/git/config index 788a7261..545f3313 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -42,6 +42,7 @@ 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 +dno = !git --no-pager diff --name-only [color] pager = no From 195c4651a34a46d30b2862d4d3c2a490d97726fb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 2 Dec 2024 16:14:30 +0200 Subject: [PATCH 1284/1326] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 68 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 15 +++---- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 434819ce..d1178d2e 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,69 +1,69 @@ { - "LuaSnip": { "branch": "master", "commit": "787dee55ca364cc9119787165418fe93b74c1842" }, - "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "d365beccca05ffcb01e50109f2adca2459c3995a" }, - "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, + "LuaSnip": { "branch": "master", "commit": "2592b91577136dbb355a4708be1e60619456b7f6" }, + "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "4531f8b2b09ed8f0b8875a706419f9cecda1d969" }, + "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "741b6a759dbbcc55e9e5d72e2a84099cf6f4af9c" }, + "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" }, "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" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "998441a88476af2ec77d8cb1b21bae62c9f548c1" }, + "dropbar.nvim": { "branch": "master", "commit": "f3b1b03cb717186c3789e8e8a509fd18df4a2d10" }, "firenvim": { "branch": "master", "commit": "64f9389b88c8b0c7667d45c171a5f25c42d852fb" }, - "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, - "gitsigns.nvim": { "branch": "main", "commit": "ee7634ab4f0a6606438fe13e16cbf2065589a5ed" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, - "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" }, - "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, + "kanagawa.nvim": { "branch": "master", "commit": "ad3dddecd606746374ba4807324a08331dfca23c" }, + "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, + "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, + "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "606ecf0cebed0f91926558158e61725d2678d90c" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7446f47b3dfb7df801f31a6f6783c2ad119a6935" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "77533e69cc4fadb7f4c25f23255ae0890a058818" }, + "mini.nvim": { "branch": "main", "commit": "ad46fda7862153107124f95d4ea0e510eafc1dd8" }, "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" }, - "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, + "noice.nvim": { "branch": "main", "commit": "c6f6fb178ebe9b4fd90383de743c3399f8c3a37c" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "7b8dacdcea38dad0b53b8c3ae01e7045ed6a04db" }, - "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, - "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "c2aa2d61a2fd8330960cb694281d886a905025f5" }, + "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, + "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, + "nvim-dap": { "branch": "master", "commit": "0a0daa796a5919a51e5e5019ffa91219c94c4fef" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, - "nvim-jdtls": { "branch": "master", "commit": "efe813854432a314b472226dca813f0f2598d44a" }, + "nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "85afd4b936acd62b578c2e2d8e86541fb972c32e" }, + "nvim-lspconfig": { "branch": "master", "commit": "f59eba2ec08edda0e09ecf34ec29ad10a429e48d" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-tree.lua": { "branch": "master", "commit": "8760d76c1d316aa46f141f3f2b80b853a2acc41e" }, - "nvim-treesitter": { "branch": "master", "commit": "377039daa260b71f304c881d1b21d643c501a261" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "0d79d169fcd45a8da464727ac893044728f121d4" }, - "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-ufo": { "branch": "main", "commit": "c96bb3bb853ff6253fe74f057df03e61fafd2403" }, - "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, + "nvim-tree.lua": { "branch": "master", "commit": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97" }, + "nvim-treesitter": { "branch": "master", "commit": "69170c93149ddb71a22bd954514806395c430c02" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, + "nvim-ts-autotag": { "branch": "main", "commit": "f2d24aca1bcbbd2c0306fd93d52e3697027b77ff" }, + "nvim-ufo": { "branch": "main", "commit": "95cbe2e99901135704aabdc8732d722cf68b12c9" }, + "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "statuscol.nvim": { "branch": "main", "commit": "5998d16044159ad3779f62c45e756c555e3051f0" }, + "statuscol.nvim": { "branch": "main", "commit": "8822f76e105549620ef9c0d96e7b95aedf14c490" }, "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, - "telescope-project.nvim": { "branch": "master", "commit": "796200876bb0fe8157b8eb1ce03d927d3827a052" }, + "telescope-project.nvim": { "branch": "master", "commit": "1d7920e799fc5001dffc7bd10909a86e0358eaf4" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, + "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, + "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } + "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" } } diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 8626bee9..404743a7 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -4,20 +4,21 @@ "docker-compose-language-service": "0.2.0", "dockerfile-language-server": "0.13.0", "eslint-lsp": "4.10.0", - "google-java-format": "v1.24.0", + "google-java-format": "v1.25.0", "html-lsp": "4.10.0", "java-debug-adapter": "0.58.0", - "jdtls": "v1.40.0", + "jdtls": "v1.41.0", "json-lsp": "4.10.0", - "lemminx": "0.27.1", - "lua-language-server": "3.11.1", + "lemminx": "0.27.2", + "lua-language-server": "3.13.2", "nil": "2024-08-06", "nixpkgs-fmt": "1.3.0", - "prettier": "3.3.3", - "prettierd": "0.25.3", + "prettier": "3.4.1", + "prettierd": "0.25.4", + "sql-formatter": "15.4.6", "stylua": "v0.20.0", "taplo": "0.9.3", - "tree-sitter-cli": "v0.24.3", + "tree-sitter-cli": "v0.24.4", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" } From 7987e3a48eb25e897347e79d41ca150ded587615 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 30 Dec 2024 09:07:22 +0200 Subject: [PATCH 1285/1326] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 60 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 18 +++++----- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index d1178d2e..7689e9ee 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "2592b91577136dbb355a4708be1e60619456b7f6" }, + "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, "auto-dark-mode.nvim": { "branch": "master", "commit": "4531f8b2b09ed8f0b8875a706419f9cecda1d969" }, "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" }, @@ -7,63 +7,63 @@ "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, - "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, - "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, + "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" }, + "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "f3b1b03cb717186c3789e8e8a509fd18df4a2d10" }, - "firenvim": { "branch": "master", "commit": "64f9389b88c8b0c7667d45c171a5f25c42d852fb" }, + "dropbar.nvim": { "branch": "master", "commit": "e5f9fb998a54c0ec1c2d25de88a3c260c494ffe1" }, + "firenvim": { "branch": "master", "commit": "dd2d6f6b3b87b3726d5ef59adfe8a6c444889dda" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, - "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, - "kanagawa.nvim": { "branch": "master", "commit": "ad3dddecd606746374ba4807324a08331dfca23c" }, - "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" }, - "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, + "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, + "kanagawa.nvim": { "branch": "master", "commit": "18ae5771b22d8f913ef541c827a8180b4cb12c8a" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "606ecf0cebed0f91926558158e61725d2678d90c" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "ad46fda7862153107124f95d4ea0e510eafc1dd8" }, + "mini.nvim": { "branch": "main", "commit": "733afb94ed88d32b839a644dc137604691e46032" }, "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" }, - "noice.nvim": { "branch": "main", "commit": "c6f6fb178ebe9b4fd90383de743c3399f8c3a37c" }, - "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "c2aa2d61a2fd8330960cb694281d886a905025f5" }, + "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "3ae4598a68bc966160a695cec127ee5cc06add02" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "ca4d3330d386e76967e53b85953c170658255ecb" }, + "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "0a0daa796a5919a51e5e5019ffa91219c94c4fef" }, - "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim-dap": { "branch": "master", "commit": "665d3569a86395fe0dab85efbdb26d7d2ee57e49" }, + "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, "nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "f59eba2ec08edda0e09ecf34ec29ad10a429e48d" }, + "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, - "nvim-tree.lua": { "branch": "master", "commit": "ca7c4c33cac2ad66ec69d45e465379716ef0cc97" }, - "nvim-treesitter": { "branch": "master", "commit": "69170c93149ddb71a22bd954514806395c430c02" }, + "nvim-notify": { "branch": "master", "commit": "1e99f4f9534ecf3b84eb7ef54a8d460230e78442" }, + "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" }, + "nvim-treesitter": { "branch": "master", "commit": "34d78baa86a37e86fe64b642860144c28ab9f0c8" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-ts-autotag": { "branch": "main", "commit": "f2d24aca1bcbbd2c0306fd93d52e3697027b77ff" }, - "nvim-ufo": { "branch": "main", "commit": "95cbe2e99901135704aabdc8732d722cf68b12c9" }, - "nvim-web-devicons": { "branch": "master", "commit": "203da76ecfbb4b192cf830665b03eb651b635c94" }, + "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, + "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" }, + "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "statuscol.nvim": { "branch": "main", "commit": "8822f76e105549620ef9c0d96e7b95aedf14c490" }, - "suda.vim": { "branch": "master", "commit": "b97fab52f9cdeabe2bbb5eb98d82356899f30829" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "statuscol.nvim": { "branch": "main", "commit": "81d1cfb47e91780f72a8d9a3529f146731864313" }, + "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, "telescope-project.nvim": { "branch": "master", "commit": "1d7920e799fc5001dffc7bd10909a86e0358eaf4" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" }, + "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "9b365a6428a9633e3eeb34dbef1b791511c54f70" } + "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } } diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 404743a7..dc885473 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,24 +1,24 @@ { "bash-language-server": "5.4.2", "css-lsp": "4.10.0", - "docker-compose-language-service": "0.2.0", + "docker-compose-language-service": "0.3.0", "dockerfile-language-server": "0.13.0", "eslint-lsp": "4.10.0", - "google-java-format": "v1.25.0", + "google-java-format": "v1.25.2", "html-lsp": "4.10.0", - "java-debug-adapter": "0.58.0", - "jdtls": "v1.41.0", + "java-debug-adapter": "0.58.1", + "jdtls": "v1.43.0", "json-lsp": "4.10.0", "lemminx": "0.27.2", - "lua-language-server": "3.13.2", + "lua-language-server": "3.13.5", "nil": "2024-08-06", "nixpkgs-fmt": "1.3.0", - "prettier": "3.4.1", + "prettier": "3.4.2", "prettierd": "0.25.4", - "sql-formatter": "15.4.6", - "stylua": "v0.20.0", + "sql-formatter": "15.4.8", + "stylua": "v2.0.2", "taplo": "0.9.3", - "tree-sitter-cli": "v0.24.4", + "tree-sitter-cli": "v0.24.6", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" } From 55db339b6742cc0fabfa7636aa4b0482ff07fcdf Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Jan 2025 14:17:16 -0600 Subject: [PATCH 1286/1326] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 62 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 16 +------- 2 files changed, 33 insertions(+), 45 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 7689e9ee..bce6f246 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { - "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" }, + "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "4531f8b2b09ed8f0b8875a706419f9cecda1d969" }, - "bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "02ef9553e2a1d6e861bc6955d58ce5883d28a6ad" }, + "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" }, + "cmp-git": { "branch": "main", "commit": "483ffb9a7471409a841df099d7c13556234365a4" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -16,54 +16,54 @@ "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "e5f9fb998a54c0ec1c2d25de88a3c260c494ffe1" }, - "firenvim": { "branch": "master", "commit": "dd2d6f6b3b87b3726d5ef59adfe8a6c444889dda" }, + "dropbar.nvim": { "branch": "master", "commit": "b27bb0353cb34bded65a8911e7d232b12100568b" }, + "firenvim": { "branch": "master", "commit": "f8a5fa6f1ed42536490acf0840497c40331c184f" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, - "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, - "kanagawa.nvim": { "branch": "master", "commit": "18ae5771b22d8f913ef541c827a8180b4cb12c8a" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, - "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" }, + "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, + "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, + "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, + "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "606ecf0cebed0f91926558158e61725d2678d90c" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "733afb94ed88d32b839a644dc137604691e46032" }, + "mini.nvim": { "branch": "main", "commit": "1f782e38109e3380fc339b794183019ac957fd21" }, "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" }, "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "3ae4598a68bc966160a695cec127ee5cc06add02" }, - "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" }, - "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "49d846e943cff8fcd78a85d6d9deca8cdd58daec" }, + "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "665d3569a86395fe0dab85efbdb26d7d2ee57e49" }, - "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, - "nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" }, + "nvim-dap": { "branch": "master", "commit": "ead0de6eac91a555b714bfd7d28959eeecfb96f9" }, + "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, + "nvim-jdtls": { "branch": "master", "commit": "3efcd0700a293efea9dada58f79c32a64850eb24" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, - "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-notify": { "branch": "master", "commit": "1e99f4f9534ecf3b84eb7ef54a8d460230e78442" }, - "nvim-tree.lua": { "branch": "master", "commit": "68fc4c20f5803444277022c681785c5edd11916d" }, - "nvim-treesitter": { "branch": "master", "commit": "34d78baa86a37e86fe64b642860144c28ab9f0c8" }, + "nvim-lspconfig": { "branch": "master", "commit": "1f941b3668151963fca3e1230922c433ea4b7b64" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, + "nvim-tree.lua": { "branch": "master", "commit": "d05881f65f0a653db8d830ccc4d2e07d6a720628" }, + "nvim-treesitter": { "branch": "master", "commit": "2206739829518c9ea59dbdb9003e0147fdaf2d1c" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" }, - "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" }, + "nvim-ufo": { "branch": "main", "commit": "edcb48240dcd0d77f3429b1858317acb7f8702b4" }, + "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "statuscol.nvim": { "branch": "main", "commit": "81d1cfb47e91780f72a8d9a3529f146731864313" }, + "statuscol.nvim": { "branch": "main", "commit": "a2a0e3ed55ba0f636ce0b2ccf61bca4050edd288" }, "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, "telescope-project.nvim": { "branch": "master", "commit": "1d7920e799fc5001dffc7bd10909a86e0358eaf4" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, + "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" }, + "vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } + "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" } } diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index dc885473..f5f3ce6b 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,24 +1,12 @@ { - "bash-language-server": "5.4.2", + "bash-language-server": "5.4.3", "css-lsp": "4.10.0", "docker-compose-language-service": "0.3.0", "dockerfile-language-server": "0.13.0", "eslint-lsp": "4.10.0", - "google-java-format": "v1.25.2", "html-lsp": "4.10.0", - "java-debug-adapter": "0.58.1", - "jdtls": "v1.43.0", "json-lsp": "4.10.0", "lemminx": "0.27.2", - "lua-language-server": "3.13.5", - "nil": "2024-08-06", - "nixpkgs-fmt": "1.3.0", - "prettier": "3.4.2", - "prettierd": "0.25.4", - "sql-formatter": "15.4.8", - "stylua": "v2.0.2", - "taplo": "0.9.3", - "tree-sitter-cli": "v0.24.6", "typescript-language-server": "4.3.3", "yaml-language-server": "1.15.0" -} +} \ No newline at end of file From c311737265b52c5b32b3af67b5f2f69860894372 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Jan 2025 14:17:32 -0600 Subject: [PATCH 1287/1326] Paru: fetch pgp --- 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 98eeaf95..063d7694 100644 --- a/home/.config/paru/paru.conf +++ b/home/.config/paru/paru.conf @@ -1,5 +1,6 @@ [options] NewsOnUpgrade +PgpFetch [bin] Sudo = doas From 4c912987f80136fe4977536d53f62562a80c4727 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Jan 2025 14:17:44 -0600 Subject: [PATCH 1288/1326] Update mirkwood root UUID --- 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 8521db9c..524f5ebb 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 vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +cryptdevice=UUID=ddc8cabe-f726-4287-8407-3a0323ec6037: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 e8dc63509add96e36e5b9e78f58b91edbdefcc8d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Jan 2025 14:22:47 -0600 Subject: [PATCH 1289/1326] Update mirkwood resume offset --- 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 524f5ebb..d3a37001 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,5 +1,5 @@ {%@@ if profile == "Mirkwood" @@%} -cryptdevice=UUID=ddc8cabe-f726-4287-8407-3a0323ec6037: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 +cryptdevice=UUID=ddc8cabe-f726-4287-8407-3a0323ec6037:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=18529853 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 f715f906ff391e86f5f5dc411f1ff86ec5b10b98 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 29 Jan 2025 14:34:34 -0600 Subject: [PATCH 1290/1326] Update nvim 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 bce6f246..c07787be 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -20,7 +20,7 @@ "firenvim": { "branch": "master", "commit": "f8a5fa6f1ed42536490acf0840497c40331c184f" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, - "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" }, + "gitsigns.nvim": { "branch": "main", "commit": "c6fedfd0b1715ee624384b134becec0a7b0a3d28" }, "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, @@ -31,7 +31,7 @@ "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "1f782e38109e3380fc339b794183019ac957fd21" }, + "mini.nvim": { "branch": "main", "commit": "12ebac8280869048c286d13bd35cfa6653e07642" }, "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" }, "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, @@ -43,14 +43,14 @@ "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, "nvim-jdtls": { "branch": "master", "commit": "3efcd0700a293efea9dada58f79c32a64850eb24" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "1f941b3668151963fca3e1230922c433ea4b7b64" }, + "nvim-lspconfig": { "branch": "master", "commit": "bf81bef7d75a0f4a0cf61462b318ea00b3c97cc8" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, "nvim-tree.lua": { "branch": "master", "commit": "d05881f65f0a653db8d830ccc4d2e07d6a720628" }, - "nvim-treesitter": { "branch": "master", "commit": "2206739829518c9ea59dbdb9003e0147fdaf2d1c" }, + "nvim-treesitter": { "branch": "master", "commit": "13f4346876f394973ff676670304a2b734174538" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-ufo": { "branch": "main", "commit": "edcb48240dcd0d77f3429b1858317acb7f8702b4" }, + "nvim-ufo": { "branch": "main", "commit": "a8e039806794ebad4f501a25c6213eb841c1949c" }, "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, @@ -65,5 +65,5 @@ "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" } + "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } } From fe6564102e3925d1ed4f2fcd3261168d0d1bddc3 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2025 16:08:34 -0600 Subject: [PATCH 1291/1326] Update ntp settings --- root/etc/systemd/timesyncd.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/systemd/timesyncd.conf b/root/etc/systemd/timesyncd.conf index 3b117f76..243bc7a3 100644 --- a/root/etc/systemd/timesyncd.conf +++ b/root/etc/systemd/timesyncd.conf @@ -1,3 +1,3 @@ [Time] -NTP=ntp.korhonen.cc -FallbackNTP=0.fi.pool.ntp.org +NTP=esgaroth.korhonen.lan +FallbackNTP=0.pool.ntp.org From 939be9f2f70846e8a9d14944f7cc45a39c878c6a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2025 16:09:02 -0600 Subject: [PATCH 1292/1326] Fix shire hibernate --- 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 d3a37001..ed9106e0 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -3,5 +3,5 @@ cryptdevice=UUID=ddc8cabe-f726-4287-8407-3a0323ec6037: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 intel_idle.max_cstate=1 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=/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 @@%} From aea4e45d2ae39a44b1b3bb69b091431b657a41f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 10 Feb 2025 16:13:53 -0600 Subject: [PATCH 1293/1326] Update neovim plugins --- home/.config/nvim/lazy-lock.json | 34 +++++++++++++++---------------- home/.config/nvim/mason-lock.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index c07787be..9562f06a 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -16,42 +16,42 @@ "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" }, "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "b27bb0353cb34bded65a8911e7d232b12100568b" }, + "dropbar.nvim": { "branch": "master", "commit": "a6239111f2988cf8789cabd89c48114fb3f8dc90" }, "firenvim": { "branch": "master", "commit": "f8a5fa6f1ed42536490acf0840497c40331c184f" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, - "gitsigns.nvim": { "branch": "main", "commit": "c6fedfd0b1715ee624384b134becec0a7b0a3d28" }, + "gitsigns.nvim": { "branch": "main", "commit": "4baa13519c2168cc9a7890a3580c50226ed018fb" }, "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, + "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" }, "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "606ecf0cebed0f91926558158e61725d2678d90c" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "12ebac8280869048c286d13bd35cfa6653e07642" }, - "neoformat": { "branch": "master", "commit": "d9d3311097eacdba9bd7a425b267d304b509e7ea" }, - "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, + "mini.nvim": { "branch": "main", "commit": "c3e3cc925217b59f1b39264c6981eb1692a86466" }, + "neoformat": { "branch": "master", "commit": "719b79b2d29067b955cd3417b88fbb0125453550" }, + "noice.nvim": { "branch": "main", "commit": "dbfc5fbab19ff1c3e29a3268ffa5eda4c09c72ce" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "49d846e943cff8fcd78a85d6d9deca8cdd58daec" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "c8aeffc20a30b1cb3aa659313d9264d291646067" }, "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "ead0de6eac91a555b714bfd7d28959eeecfb96f9" }, + "nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" }, "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, - "nvim-jdtls": { "branch": "master", "commit": "3efcd0700a293efea9dada58f79c32a64850eb24" }, + "nvim-jdtls": { "branch": "master", "commit": "3cdd09f336ab7169476b936c0825213d86d32e41" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "bf81bef7d75a0f4a0cf61462b318ea00b3c97cc8" }, + "nvim-lspconfig": { "branch": "master", "commit": "6c17f8656f667727b27f5f598463afedb7791b18" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, - "nvim-tree.lua": { "branch": "master", "commit": "d05881f65f0a653db8d830ccc4d2e07d6a720628" }, - "nvim-treesitter": { "branch": "master", "commit": "13f4346876f394973ff676670304a2b734174538" }, + "nvim-tree.lua": { "branch": "master", "commit": "80523101f0ae48b7f1990e907b685a3d79776c01" }, + "nvim-treesitter": { "branch": "master", "commit": "a840137349fcc35b5ad2c718a9b034b93012fa43" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-ufo": { "branch": "main", "commit": "a8e039806794ebad4f501a25c6213eb841c1949c" }, - "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, + "nvim-ufo": { "branch": "main", "commit": "81f5ffa6e8ba27c48403cf681d4b383d924e03e4" }, + "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, @@ -63,7 +63,7 @@ "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "d74a7cff4cfcf84f83cc7eccfa365488f3bbabc2" }, + "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } } diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index f5f3ce6b..6d3d62ad 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -8,5 +8,5 @@ "json-lsp": "4.10.0", "lemminx": "0.27.2", "typescript-language-server": "4.3.3", - "yaml-language-server": "1.15.0" + "yaml-language-server": "1.16.0" } \ No newline at end of file From 2dd4ec52b92185ab3428a7a758da75e401d76db8 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2025 12:18:30 -0600 Subject: [PATCH 1294/1326] Remove unused scripts --- scripts/autorotate.sh | 22 ---------------------- scripts/checkupdates.sh | 12 ------------ scripts/mail/notify-new-mail.sh | 23 ----------------------- scripts/media/imageviewer | 29 ----------------------------- scripts/media/imgurviewer | 11 ----------- scripts/media/mpvqueue | 30 ------------------------------ 6 files changed, 127 deletions(-) delete mode 100755 scripts/autorotate.sh delete mode 100755 scripts/checkupdates.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 diff --git a/scripts/autorotate.sh b/scripts/autorotate.sh deleted file mode 100755 index c4f6f674..00000000 --- a/scripts/autorotate.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/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 -} - -while IFS='$\n' read -r line; do - rotation="$(echo $line | sed -En "s/^.*orientation changed: (.*)/\1/p")" - [[ ! -z $rotation ]] && rotate_ms $rotation -done < <(stdbuf -oL monitor-sensor) diff --git a/scripts/checkupdates.sh b/scripts/checkupdates.sh deleted file mode 100755 index 27bd1464..00000000 --- a/scripts/checkupdates.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -checkupdates -d - -CODE=$? - -if [ $CODE -eq 2 ]; then - echo "No updates available" - exit 0 -fi - -exit $CODE diff --git a/scripts/mail/notify-new-mail.sh b/scripts/mail/notify-new-mail.sh deleted file mode 100755 index a4d2f302..00000000 --- a/scripts/mail/notify-new-mail.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/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/scripts/media/imageviewer b/scripts/media/imageviewer deleted file mode 100755 index bd14f550..00000000 --- a/scripts/media/imageviewer +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ $# -eq 1 ]; then - DIR=/tmp/images - IMGNAME=$(basename $1) - - if [ ! -d $DIR ]; then - mkdir $DIR - fi - - if [ ! -f $DIR/$IMGNAME ]; then - wget $1 -O $DIR/$IMGNAME - fi - - mimeo $DIR/$IMGNAME - -else - DIR=/tmp/images/$(basename $1) - - if [ ! -d $]; then - mkdir -p $DIR - fi - - if [ ! -f $DIR/$IMGNAME ]; then - wget -P $DIR $@ - fi - - mimeo $DIR/* -fi diff --git a/scripts/media/imgurviewer b/scripts/media/imgurviewer deleted file mode 100755 index a5a02053..00000000 --- a/scripts/media/imgurviewer +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -ALBUMNAME=$(basename $1) -ALBUMDIR=/tmp/imgur/$ALBUMNAME - -if [ ! -d $ALBUMDIR ]; then - mkdir -p $ALBUMDIR - imgur-album-downloader $1 $ALBUMDIR -fi - -mimeo $ALBUMDIR diff --git a/scripts/media/mpvqueue b/scripts/media/mpvqueue deleted file mode 100755 index 5a84bc64..00000000 --- a/scripts/media/mpvqueue +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -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 - - # pause other players - playerctl pause - - # start mpv - /usr/bin/mpv --no-terminal "$url" & disown - - # Wait for mpv to be up before adding anything else to playlist - while [ -z "$(pidof mpv)" ]; do - sleep 1 - done - $notify "Playing $url" - -else - # mpv is running, so add stuff to playlist - $notify "Adding $url" - echo "{\"command\": [\"loadfile\", \"$url\", \"append\"]}" | socat - /tmp/mpvsocket -fi From 3aa4f18abfd95ba179ad96e746d398b342fb4656 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 13 Feb 2025 12:19:36 -0600 Subject: [PATCH 1295/1326] Fix hibernate resume --- 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 cce0fe98..487401ca 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -12,9 +12,9 @@ BINARIES=() FILES=() {%@@ if profile == "Mirkwood" @@%} -HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems btrfs encrypt fsck) +HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesystems btrfs encrypt resume fsck) {%@@ elif profile == 'Moria' @@%} HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ elif profile == 'Shire' @@%} -HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block unl0kr encrypt plymouth filesystems fsck) +HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block unl0kr encrypt plymouth filesystems resume fsck) {%@@ endif @@%} From a7d3c0a6ee2af77c3a4a347c7e996d8d79426832 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 20 Mar 2025 23:34:42 -0500 Subject: [PATCH 1296/1326] Update nvim plugins --- home/.config/nvim/lazy-lock.json | 71 ++++++++++++++++--------------- home/.config/nvim/mason-lock.json | 9 ++-- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json index 9562f06a..d6d9af04 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -1,7 +1,7 @@ { "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "02ef9553e2a1d6e861bc6955d58ce5883d28a6ad" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "c31de126963ffe9403901b4b0990dde0e6999cc6" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -14,56 +14,57 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" }, - "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, + "copilot.lua": { "branch": "master", "commit": "256393d0737741c460726716cac3a605c45d1c3f" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "a6239111f2988cf8789cabd89c48114fb3f8dc90" }, + "dropbar.nvim": { "branch": "master", "commit": "a2f1b275fdf185567ab976d27749d4e8cc21fe4c" }, "firenvim": { "branch": "master", "commit": "f8a5fa6f1ed42536490acf0840497c40331c184f" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, - "gitsigns.nvim": { "branch": "main", "commit": "4baa13519c2168cc9a7890a3580c50226ed018fb" }, - "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, - "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, - "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" }, - "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, - "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, + "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, + "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, + "kanagawa.nvim": { "branch": "master", "commit": "709018d5af92d2e5780bfb8a6d36e9cad01a6402" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-extra-cmds": { "branch": "main", "commit": "606ecf0cebed0f91926558158e61725d2678d90c" }, + "mason-extra-cmds": { "branch": "main", "commit": "cc7163cb5089236042b5e351cb1a078d0905e40d" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.nvim": { "branch": "main", "commit": "c3e3cc925217b59f1b39264c6981eb1692a86466" }, - "neoformat": { "branch": "master", "commit": "719b79b2d29067b955cd3417b88fbb0125453550" }, - "noice.nvim": { "branch": "main", "commit": "dbfc5fbab19ff1c3e29a3268ffa5eda4c09c72ce" }, - "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "c8aeffc20a30b1cb3aa659313d9264d291646067" }, - "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, - "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, + "mini.nvim": { "branch": "main", "commit": "0429e9ee9d35faef51971abdbb1b26d2540b5a5f" }, + "neoformat": { "branch": "master", "commit": "874dcd0995db340278c41860e0209bef29d6ef87" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, + "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "b12e113b5f7e7522b4e412213d5498cc529f2628" }, + "nvim-autopairs": { "branch": "master", "commit": "6522027785b305269fa17088395dfc0f456cedd2" }, + "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" }, + "nvim-dap": { "branch": "master", "commit": "6a5bba0ddea5d419a783e170c20988046376090d" }, "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, - "nvim-jdtls": { "branch": "master", "commit": "3cdd09f336ab7169476b936c0825213d86d32e41" }, + "nvim-jdtls": { "branch": "master", "commit": "2f7bff9b8d2ee1918b36ca55f19547d9d335a268" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "6c17f8656f667727b27f5f598463afedb7791b18" }, + "nvim-lspconfig": { "branch": "master", "commit": "699cf2ce74e40e7c5068cf93a6bd6a74b24c5ec3" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, - "nvim-tree.lua": { "branch": "master", "commit": "80523101f0ae48b7f1990e907b685a3d79776c01" }, - "nvim-treesitter": { "branch": "master", "commit": "a840137349fcc35b5ad2c718a9b034b93012fa43" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, - "nvim-ufo": { "branch": "main", "commit": "81f5ffa6e8ba27c48403cf681d4b383d924e03e4" }, - "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, + "nvim-tree.lua": { "branch": "master", "commit": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4" }, + "nvim-treesitter": { "branch": "master", "commit": "ff553df2f4c5641be2b282e1a0a072c46cf03591" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, + "nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" }, + "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, - "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "statuscol.nvim": { "branch": "main", "commit": "a2a0e3ed55ba0f636ce0b2ccf61bca4050edd288" }, + "schemastore.nvim": { "branch": "main", "commit": "80ebdbc60432f3d4944f53451f6bf8e257c48695" }, + "statuscol.nvim": { "branch": "main", "commit": "c399884e8f64019ec9bb581251f9710915b7f996" }, "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, - "telescope-project.nvim": { "branch": "master", "commit": "1d7920e799fc5001dffc7bd10909a86e0358eaf4" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-project.nvim": { "branch": "master", "commit": "ce2c9fe209a68c7a924acde42d94ed8a2b2a52c5" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, + "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" }, + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" }, - "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/home/.config/nvim/mason-lock.json b/home/.config/nvim/mason-lock.json index 6d3d62ad..25d803af 100644 --- a/home/.config/nvim/mason-lock.json +++ b/home/.config/nvim/mason-lock.json @@ -1,12 +1,15 @@ { "bash-language-server": "5.4.3", + "bibtex-tidy": "1.14.0", "css-lsp": "4.10.0", "docker-compose-language-service": "0.3.0", "dockerfile-language-server": "0.13.0", "eslint-lsp": "4.10.0", "html-lsp": "4.10.0", "json-lsp": "4.10.0", - "lemminx": "0.27.2", - "typescript-language-server": "4.3.3", - "yaml-language-server": "1.16.0" + "lemminx": "0.28.0", + "lua-language-server": "3.13.9", + "texlab": "v5.22.1", + "typescript-language-server": "4.3.4", + "yaml-language-server": "1.17.0" } \ No newline at end of file From ce475402bcca708e6f7b202d4b81c6d8056178f2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 20 Mar 2025 23:34:54 -0500 Subject: [PATCH 1297/1326] Nvim: add json schema store Allows automatically fetching schemas in json files without specifying schema --- home/.config/nvim/lua/plugins/mason.lua | 18 ++++++++++++++++-- scripts/fhackeditor | 9 +++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100755 scripts/fhackeditor diff --git a/home/.config/nvim/lua/plugins/mason.lua b/home/.config/nvim/lua/plugins/mason.lua index c1231f88..7c727ce0 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -19,12 +19,15 @@ return { "mfussenegger/nvim-jdtls", -- Add support for LSP file operations { "antosha417/nvim-lsp-file-operations", opts = {} }, + -- Automatically fetch schemas from JSON schema store + "b0o/schemastore.nvim", }, config = function() require("mason").setup() local mlspc = require("mason-lspconfig") local lsp_utils = require("lsp_utils") + local lspconfig = require("lspconfig") local commonLspConfigArgs = { on_attach = lsp_utils.map_keys, @@ -35,13 +38,13 @@ return { mlspc.setup_handlers({ -- Default handler function(server_name) - require("lspconfig")[server_name].setup(commonLspConfigArgs) + lspconfig[server_name].setup(commonLspConfigArgs) end, -- Disable tsserver diagnostics diagnostics -- that come from ESLint ["ts_ls"] = function() - require("lspconfig").ts_ls.setup(vim.tbl_extend("force", commonLspConfigArgs, { + lspconfig.ts_ls.setup(vim.tbl_extend("force", commonLspConfigArgs, { settings = { diagnostics = { ignoredCodes = { @@ -55,6 +58,17 @@ return { -- Don't set up jdtls, it is set up by nvim-jdtls ["jdtls"] = function() end, + + ["jsonls"] = function() + lspconfig.jsonls.setup(vim.tbl_extend("force", commonLspConfigArgs, { + settings = { + json = { + schemas = require("schemastore").json.schemas(), + validate = { enable = true }, + }, + }, + })) + end, }) end, } diff --git a/scripts/fhackeditor b/scripts/fhackeditor new file mode 100755 index 00000000..7a1d4934 --- /dev/null +++ b/scripts/fhackeditor @@ -0,0 +1,9 @@ +#!/bin/sh +# Script to launch a graphical editor if in graphical mode, +# terminal editor otherwise + +if [ -n "$DISPLAY" ] || [ -n "$WAYLAND_DISPLAY" ]; then + echo "Running in graphical mode" +else + echo "Running in TTY mode" +fi From 4c574a746d854f28b119d15c00744d2077702098 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Mar 2025 14:21:49 -0500 Subject: [PATCH 1298/1326] 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 d6d9af04..1ebcf4b2 100644 --- a/home/.config/nvim/lazy-lock.json +++ b/home/.config/nvim/lazy-lock.json @@ -6,7 +6,7 @@ "cder.nvim": { "branch": "main", "commit": "0a071389bb52544ac9cf9557378aa1212dff6982" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-git": { "branch": "main", "commit": "483ffb9a7471409a841df099d7c13556234365a4" }, + "cmp-git": { "branch": "main", "commit": "d9efd00e0b9527ee05031ce7e7e55d6b118f543e" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, @@ -14,10 +14,10 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "confirm-quit.nvim": { "branch": "main", "commit": "f15f6d728d385a3d2efa22098e9a45b8a2b20144" }, "copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" }, - "copilot.lua": { "branch": "master", "commit": "256393d0737741c460726716cac3a605c45d1c3f" }, + "copilot.lua": { "branch": "master", "commit": "535ebb53880ae67e33d9e50b503d25f9ef3ca06c" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dropbar.nvim": { "branch": "master", "commit": "a2f1b275fdf185567ab976d27749d4e8cc21fe4c" }, - "firenvim": { "branch": "master", "commit": "f8a5fa6f1ed42536490acf0840497c40331c184f" }, + "dropbar.nvim": { "branch": "master", "commit": "873ba43f83398fd0e28880cf98fd89e6ce667c51" }, + "firenvim": { "branch": "master", "commit": "c4ab7d2aeb145cd93db8660cb134f771722f2b5e" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fugitive-gitea": { "branch": "master", "commit": "d93176028d13820f941c165c14039a6019744a5a" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" }, @@ -25,13 +25,13 @@ "kanagawa.nvim": { "branch": "master", "commit": "709018d5af92d2e5780bfb8a6d36e9cad01a6402" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" }, + "lualine.nvim": { "branch": "master", "commit": "1517caa8fff05e4b4999857319d3b0609a7f57fa" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-extra-cmds": { "branch": "main", "commit": "cc7163cb5089236042b5e351cb1a078d0905e40d" }, "mason-lock.nvim": { "branch": "main", "commit": "86614f76c3442fba1c5c8d79aa1efcb3ad69de1c" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.nvim": { "branch": "main", "commit": "0429e9ee9d35faef51971abdbb1b26d2540b5a5f" }, + "mini.nvim": { "branch": "main", "commit": "189010888bc37fc1c382f2dcc81b7a6441160686" }, "neoformat": { "branch": "master", "commit": "874dcd0995db340278c41860e0209bef29d6ef87" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, @@ -43,11 +43,11 @@ "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, "nvim-jdtls": { "branch": "master", "commit": "2f7bff9b8d2ee1918b36ca55f19547d9d335a268" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, - "nvim-lspconfig": { "branch": "master", "commit": "699cf2ce74e40e7c5068cf93a6bd6a74b24c5ec3" }, + "nvim-lspconfig": { "branch": "master", "commit": "85e0dd26b710e834a105d679200d01e326a3d2b0" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, - "nvim-tree.lua": { "branch": "master", "commit": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4" }, - "nvim-treesitter": { "branch": "master", "commit": "ff553df2f4c5641be2b282e1a0a072c46cf03591" }, + "nvim-tree.lua": { "branch": "master", "commit": "44d9b58f11d5a426c297aafd0be1c9d45617a849" }, + "nvim-treesitter": { "branch": "master", "commit": "da5825bf70cc2ea7eacd1e60c32c07baf19adeba" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "9937e5e356e5b227ec56d83d0a9d0a0f6bc9cad4" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ufo": { "branch": "main", "commit": "a52c92c3bbaa10f0c9b547a50adaa8c7d8b29f94" }, @@ -55,7 +55,7 @@ "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "schemastore.nvim": { "branch": "main", "commit": "80ebdbc60432f3d4944f53451f6bf8e257c48695" }, + "schemastore.nvim": { "branch": "main", "commit": "d307d291f38678d064cb987112926df6d9134de3" }, "statuscol.nvim": { "branch": "main", "commit": "c399884e8f64019ec9bb581251f9710915b7f996" }, "suda.vim": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, From b78814d8a7e72a4088c4171bf5691806c3588fe9 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Mar 2025 14:26:59 -0500 Subject: [PATCH 1299/1326] Update Shire configs after new Arch install --- config-root.toml | 7 ++++++- root/etc/kernel/cmdline | 2 +- root/etc/mkinitcpio.conf | 2 +- root/etc/pacman.conf | 13 ------------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/config-root.toml b/config-root.toml index 04a8fd24..2d1615d6 100644 --- a/config-root.toml +++ b/config-root.toml @@ -1,3 +1,6 @@ +[actions] +mkinitcpio = "mkinitcpio -P" + [config] backup = true banner = true @@ -118,6 +121,7 @@ dst = "/.ignore" [dotfiles."f_mkinitcpio.conf"] src = "etc/mkinitcpio.conf" dst = "/etc/mkinitcpio.conf" +actions = ["mkinitcpio"] [dotfiles."f_vconsole.conf"] src = "etc/vconsole.conf" @@ -146,6 +150,7 @@ dst = "/etc/mkinitcpio.d/linux.preset" [dotfiles.f_cmdline] src = "etc/kernel/cmdline" dst = "/etc/kernel/cmdline" +actions = ["mkinitcpio"] [dotfiles."f_timesyncd.conf"] src = "etc/systemd/timesyncd.conf" @@ -222,7 +227,7 @@ dotfiles = [ "f_sshd_config", "f_system.conf", ] -include = ["Locale"] +include = ["Locale", "Pacman"] [profiles.Moria] include = ["Locale", "Pacman"] diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index ed9106e0..decce6e3 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -3,5 +3,5 @@ cryptdevice=UUID=ddc8cabe-f726-4287-8407-3a0323ec6037: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=/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 +cryptdevice=UUID=8898d32c-d150-4258-ad0f-96b5afca4718:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root resume_offset=2106624 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 487401ca..546045a8 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -16,5 +16,5 @@ HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesy {%@@ elif profile == 'Moria' @@%} HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ elif profile == 'Shire' @@%} -HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block unl0kr encrypt plymouth filesystems resume fsck) +HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block bluetooth unl0kr encrypt plymouth filesystems resume fsck) {%@@ endif @@%} diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 249cd2a9..3fd79bdd 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -8,10 +8,6 @@ SigLevel = Required DatabaseOptional Architecture = auto 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 -{%@@ endif @@%} [core] Include = /etc/pacman.d/pacserve @@ -24,12 +20,3 @@ 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 @@%} - From 9fe7f5895b72a818326d5625fc0cdbb42bbb7a57 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Mar 2025 16:14:54 -0500 Subject: [PATCH 1300/1326] Add VentoyArch --- config-root.toml | 17 +++++++++++++++++ config.toml | 9 +++++++++ root/etc/kernel/cmdline | 4 +++- root/etc/mkinitcpio.conf | 2 ++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/config-root.toml b/config-root.toml index 2d1615d6..f41aa8c9 100644 --- a/config-root.toml +++ b/config-root.toml @@ -206,6 +206,23 @@ dotfiles = [ ] include = ["Locale", "Pacman"] +[profiles.VentoyArch] +dotfiles = [ + "d_bin", + "f_cmdline", + "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_system.conf", + "f_timesyncd.conf", +] +include = ["Locale", "Pacman"] + [profiles.Shire] dotfiles = [ "d_bin", diff --git a/config.toml b/config.toml index 00ecb92a..1befe335 100644 --- a/config.toml +++ b/config.toml @@ -214,6 +214,15 @@ dotfiles = [ [profiles.Mirkwood.variables] wayland = true +[profiles.VentoyArch] +include = ["pacman", "terminal", "media", "gpg"] +dotfiles = [ + "f_dconf.ini" +] + +[profiles.VentoyArch.variables] +wayland = true + [profiles.Shire] include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ diff --git a/root/etc/kernel/cmdline b/root/etc/kernel/cmdline index decce6e3..b38c85c5 100644 --- a/root/etc/kernel/cmdline +++ b/root/etc/kernel/cmdline @@ -1,7 +1,9 @@ {%@@ if profile == "Mirkwood" @@%} cryptdevice=UUID=ddc8cabe-f726-4287-8407-3a0323ec6037:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root resume=/dev/mapper/cryptroot resume_offset=18529853 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 +cryptdevice=UUID=51115cf2-6a44-4f8c-8aa2-ff9d834953d8: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 {%@@ elif profile == "Shire" @@%} cryptdevice=UUID=8898d32c-d150-4258-ad0f-96b5afca4718:cryptroot root=/dev/mapper/cryptroot rootflags=subvol=root resume_offset=2106624 intel_idle.max_cstate=1 rw quiet splash vt.global_cursor_default=0 fbcon=nodefer log_level=3 udev.log_level=3 +{%@@ elif profile == "VentoyArch" @@%} +cryptdevice=UUID=d43414f3-37e9-4f35-9d3c-2f85c36c0034:cryptroot:allow-discards root=/dev/mapper/cryptroot rootflags=subvol=root 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 546045a8..9fec8d14 100644 --- a/root/etc/mkinitcpio.conf +++ b/root/etc/mkinitcpio.conf @@ -17,4 +17,6 @@ HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block filesy HOOKS=(base udev kms keyboard autodetect microcode modconf block netconf dropbear encryptssh filesystems btrfs fsck) {%@@ elif profile == 'Shire' @@%} HOOKS=(base udev kms keyboard keymap autodetect microcode modconf block bluetooth unl0kr encrypt plymouth filesystems resume fsck) +{%@@ elif profile == "VentoyArch" @@%} +HOOKS=(base udev kms plymouth keyboard autodetect microcode modconf block ventoy filesystems btrfs encrypt resume fsck) {%@@ endif @@%} From a5336bac6136135b5e54de6b8b646e321e581803 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Mar 2025 16:20:01 -0500 Subject: [PATCH 1301/1326] Add fontconfig to VentoyArch --- config.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 1befe335..2972b4c6 100644 --- a/config.toml +++ b/config.toml @@ -217,7 +217,8 @@ wayland = true [profiles.VentoyArch] include = ["pacman", "terminal", "media", "gpg"] dotfiles = [ - "f_dconf.ini" + "f_dconf.ini", + "f_fonts.conf", ] [profiles.VentoyArch.variables] From 81a21984d8d78e735780f1861559606724f98962 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Mar 2025 16:20:12 -0500 Subject: [PATCH 1302/1326] Change fonts to new Gnome fonts --- home/.config/fontconfig/fonts.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/.config/fontconfig/fonts.conf b/home/.config/fontconfig/fonts.conf index f00c9381..a12fa719 100644 --- a/home/.config/fontconfig/fonts.conf +++ b/home/.config/fontconfig/fonts.conf @@ -4,19 +4,19 @@ sans-serif - Overpass + Adwaita Sans serif - Overpass + Adwaita Sans monospace - Hack Nerd Font Mono + Adwaita mono From e59444ae77dd3ee063ff59bccdfcd941e9891938 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 27 Mar 2025 16:23:54 -0500 Subject: [PATCH 1303/1326] Add lappeenranta to gnome world clocks --- home/.config/dconf.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.config/dconf.ini b/home/.config/dconf.ini index 15d59d20..19ccc814 100644 --- a/home/.config/dconf.ini +++ b/home/.config/dconf.ini @@ -17,10 +17,10 @@ locations=[<(uint32 2, <('Lappeenranta', 'EFLP', false, [(1.0654507804726074, 0. 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)])>)>] +locations=[<(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>, <(uint32 2, <('Lappeenranta', 'EFLP', true, [(1.0654507804726074, 0.49128594181309354)], [(1.065814402368968, 0.49189195503597105)])>)>] [org/gnome/clocks] -world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>}] +world-clocks=[{'location': <(uint32 2, <('Bangkok', 'VTBD', true, [(0.24289166005364171, 1.7558012275062955)], [(0.23998277214922031, 1.754346792280731)])>)>}, {'location': <(uint32 2, <('Lappeenranta', 'EFLP', true, [(1.0654507804726074, 0.49128594181309354)], [(1.065814402368968, 0.49189195503597105)])>)>}] [org/gnome/desktop/a11y/mouse] dwell-click-enabled=false From 2b647d527e4f3443e1f4dc06ee72d76bcf972b38 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 28 Mar 2025 21:38:16 -0500 Subject: [PATCH 1304/1326] Remove korhonen.social --- docker/caddy/Caddyfile | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index d94a84fa..9f9679d6 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -194,25 +194,3 @@ korhonen.cc, *.korhonen.cc { respond "{err.status_code} {err.status_text}" } } - -korhonen.social, *.korhonen.social { - import common_site_settings - - @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 - } - - handle { - respond "404 Not Found" 404 - } - - handle_errors { - respond "{err.status_code} {err.status_text}" - } -} From 3d99beff2308e70f456945d27b9b1eb0bbac4e4a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Fri, 28 Mar 2025 21:40:56 -0500 Subject: [PATCH 1305/1326] Home automation: Remove disabled services --- docker/homeautomation/docker-compose.yaml | 107 +++------------------- 1 file changed, 14 insertions(+), 93 deletions(-) diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 346e9660..54d09a69 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -25,20 +25,20 @@ services: - 8300:8300 extra_hosts: - host.docker.internal:host-gateway - mosquitto: - container_name: mosquitto - image: eclipse-mosquitto - restart: unless-stopped - environment: - - TZ=Europe/Helsinki - networks: - - homeautomation - ports: - - 1883:1883 - - 8866:8866 - volumes: - - mosquitto:/mosquitto - - /etc/localtime:/etc/localtime:ro + # mosquitto: + # container_name: mosquitto + # image: eclipse-mosquitto + # restart: unless-stopped + # environment: + # - TZ=Europe/Helsinki + # networks: + # - homeautomation + # ports: + # - 1883:1883 + # - 8866:8866 + # volumes: + # - mosquitto:/mosquitto + # - /etc/localtime:/etc/localtime:ro piper_english: container_name: piper_english image: rhasspy/wyoming-piper @@ -75,85 +75,6 @@ services: volumes: - whisper_english:/data - /etc/localtime:/etc/localtime:ro - 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 - 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 - 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 - 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 d95766012d6188730de09c6d0f0c96a257e82c8b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 7 Apr 2025 15:28:10 -0500 Subject: [PATCH 1306/1326] Remove obsolete files --- root/etc/pacman.conf | 13 +++++++++++++ .../system/getty@tty6.service.d/override.conf | 3 --- root/etc/systemd/system/qbittorrent.service | 10 ---------- 3 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 root/etc/systemd/system/getty@tty6.service.d/override.conf delete mode 100644 root/etc/systemd/system/qbittorrent.service diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 3fd79bdd..249cd2a9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -8,6 +8,10 @@ SigLevel = Required DatabaseOptional Architecture = auto 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 +{%@@ endif @@%} [core] Include = /etc/pacman.d/pacserve @@ -20,3 +24,12 @@ 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/systemd/system/getty@tty6.service.d/override.conf b/root/etc/systemd/system/getty@tty6.service.d/override.conf deleted file mode 100644 index b3c5c28f..00000000 --- a/root/etc/systemd/system/getty@tty6.service.d/override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=-/usr/bin/agetty --skip-login --nonewline --noissue --autologin {{@@ env['USRNAME'] @@}} --noclear %I $TERM diff --git a/root/etc/systemd/system/qbittorrent.service b/root/etc/systemd/system/qbittorrent.service deleted file mode 100644 index ed7a42c0..00000000 --- a/root/etc/systemd/system/qbittorrent.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=qBittorrent Daemon Service -After=network.target - -[Service] -User=qbtuser -ExecStart=/usr/bin/qbittorrent-nox --webui-port=8080 - -[Install] -WantedBy=multi-user.target From 9e251961c9dbf51d6937f18141862d8e31c4730c Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Mon, 7 Apr 2025 15:28:38 -0500 Subject: [PATCH 1307/1326] Convert server to LAN only mode --- docker/authentik/docker-compose.yaml | 10 - docker/caddy/Caddyfile | 251 ++++++---------------- docker/caddy/Caddyfile.old | 195 +++++++++++++++++ docker/homeautomation/docker-compose.yaml | 2 - root/etc/pacman.conf | 3 +- 5 files changed, 257 insertions(+), 204 deletions(-) create mode 100644 docker/caddy/Caddyfile.old diff --git a/docker/authentik/docker-compose.yaml b/docker/authentik/docker-compose.yaml index 7b620946..a8831667 100644 --- a/docker/authentik/docker-compose.yaml +++ b/docker/authentik/docker-compose.yaml @@ -66,16 +66,6 @@ services: environment: GEOIPUPDATE_EDITION_IDS: GeoLite2-City GEOIPUPDATE_FREQUENCY: '8' - whoami-test: - image: traefik/whoami - container_name: whoami-test - restart: unless-stopped - security_opt: - - no-new-privileges:true - networks: - - proxy - environment: - - TZ networks: authentik: external: true diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 9f9679d6..b45a08ad 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -1,196 +1,67 @@ { - order umami first + auto_https off } -(common_site_settings) { - encode zstd gzip - - tls { - dns cloudflare {$CLOUDFLARE_API_TOKEN} - resolvers 1.1.1.1 - } - - header { - Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - } +http://index.korhonen.lan { + root * /var/www/index.korhonen.cc + file_server browse } -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 - } - - @homepage-www-redir host www.korhonen.cc - handle @homepage-www-redir { - redir https://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 - } - - @wkd host openpgpkey.korhonen.cc - handle @wkd { - root * /var/www/wkd - file_server browse - header Access-Control-Allow-Origin "*" - } - - @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 - } - - @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 { - rewrite /user/login /user/oauth2/authentik - 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 - } - - @freshrss host rss.korhonen.cc - handle @freshrss { - reverse_proxy freshrss - } - - @jellyfin host jellyfin.korhonen.cc - handle @jellyfin { - reverse_proxy jellyfin:8096 - } - - @pihole host pihole.korhonen.cc - handle @pihole { - reverse_proxy pihole - } - - @umami host umami.korhonen.cc - handle @umami { - reverse_proxy umami:3000 - } - - @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 - 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 - } - - @tvheadend host tvheadend.korhonen.cc - handle @tvheadend { - reverse_proxy tvheadend:9981 - } - - @collabora host collabora.korhonen.cc - handle @collabora { - reverse_proxy collabora:9980 - } - - @grafana host grafana.korhonen.cc - handle @grafana { - reverse_proxy grafana:3000 - } - - @drop host drop.korhonen.cc - handle @drop { - reverse_proxy drop:3000 - } - - @ipvX host ipv6.korhonen.cc ipv4.korhonen.cc - handle @ipvX { - respond {remote_host} - } - - @ott host ott.korhonen.cc - handle @ott { - reverse_proxy opentogethertube:8080 - } - - handle { - respond "404 Not Found" 404 - } - - 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}" - } +http://home.korhonen.lan { + reverse_proxy home-assistant:8123 +} + +http://sso.korhonen.lan, http://sso.korhonen.cc { + reverse_proxy authentik:9000 +} + +http://git.korhonen.lan { + rewrite /user/login /user/oauth2/authentik + reverse_proxy forgejo:3000 +} + +http://search.korhonen.lan { + reverse_proxy searx:8080 +} + +http://jellyfin.korhonen.lan { + reverse_proxy jellyfin:8096 +} + +http://cloud.korhonen.lan { + # 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 + 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 +} + +http://collabora.korhonen.lan { + reverse_proxy collabora:9980 } diff --git a/docker/caddy/Caddyfile.old b/docker/caddy/Caddyfile.old new file mode 100644 index 00000000..e33bef26 --- /dev/null +++ b/docker/caddy/Caddyfile.old @@ -0,0 +1,195 @@ +# My old public configuration. +# Currently don't have a public IP so running everything in LAN +# in the current configuration + +{ + order umami first +} + +(common_site_settings) { + encode zstd gzip + + tls { + dns cloudflare {$CLOUDFLARE_API_TOKEN} + resolvers 1.1.1.1 + } + + 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 + } + + @homepage-www-redir host www.korhonen.cc + handle @homepage-www-redir { + redir https://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 + } + + @wkd host openpgpkey.korhonen.cc + handle @wkd { + root * /var/www/wkd + file_server browse + header Access-Control-Allow-Origin "*" + } + + @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 + } + + @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 { + rewrite /user/login /user/oauth2/authentik + 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 + } + + @freshrss host rss.korhonen.cc + handle @freshrss { + reverse_proxy freshrss + } + + @jellyfin host jellyfin.korhonen.cc + handle @jellyfin { + reverse_proxy jellyfin:8096 + } + + @pihole host pihole.korhonen.cc + handle @pihole { + reverse_proxy pihole + } + + @umami host umami.korhonen.cc + handle @umami { + reverse_proxy umami:3000 + } + + @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 + 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 + } + + @tvheadend host tvheadend.korhonen.cc + handle @tvheadend { + reverse_proxy tvheadend:9981 + } + + @collabora host collabora.korhonen.cc + handle @collabora { + reverse_proxy collabora:9980 + } + + @drop host drop.korhonen.cc + handle @drop { + reverse_proxy drop:3000 + } + + @ipvX host ipv6.korhonen.cc ipv4.korhonen.cc + handle @ipvX { + respond {remote_host} + } + + @ott host ott.korhonen.cc + handle @ott { + reverse_proxy opentogethertube:8080 + } + + handle { + respond "404 Not Found" 404 + } + + 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}" + } +} diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index 54d09a69..ca42998a 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -11,8 +11,6 @@ services: restart: unless-stopped environment: - TZ=Europe/Helsinki - devices: - - /dev/ttyACM0 volumes: - hass:/config - /etc/localtime:/etc/localtime:ro diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 249cd2a9..437f09b9 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -30,6 +30,5 @@ Include = /etc/pacman.d/mirrorlist 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 +Server = http://index.korhonen.lan/repo/arch_linux/$repo/$arch {%@@ endif @@%} - From d6f271a09ae43b8b2309fc3264f5acc80e6f2885 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 30 Apr 2025 16:20:59 -0500 Subject: [PATCH 1308/1326] Update some setting for new laptop --- config.toml | 3 +-- home/.config/git/config | 2 +- home/.ssh/config | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config.toml b/config.toml index 2972b4c6..affc47ca 100644 --- a/config.toml +++ b/config.toml @@ -254,12 +254,11 @@ include = ["terminal", "gpg"] include = ["pacman", "terminal"] [profiles.mko-laptop] -include = ["terminal", "media", "gpg"] +include = ["terminal", "gpg"] dotfiles = ["f_librewolf_overrides", "f_dconf.ini", "d_systemd"] [profiles.mko-laptop.variables] wayland = true -scale_factor = 1.25 [profiles.Isengard] include = ["terminal"] diff --git a/home/.config/git/config b/home/.config/git/config index 545f3313..9c8c391e 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -1,6 +1,6 @@ [user] {%@@ if profile == "mko-laptop" @@%} -email = marko.korhonen@rossum.fi +email = marko.korhonen@netforecast.com {%@@ else @@%} email = marko@korhonen.cc {%@@ endif @@%} diff --git a/home/.ssh/config b/home/.ssh/config index a0e49da5..b912590c 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,4 +1,4 @@ -Include ~/.ssh/rossum_hosts +Include ~/.ssh/netforecast_hosts host * IdentitiesOnly yes From 7f07fb2d2b5e59bd540ffc7f7dfc0a4a46e6ff00 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 14 May 2025 16:41:50 -0500 Subject: [PATCH 1309/1326] Nvim: remove java snippets, add javascript snippets --- home/.config/nvim/snippets/java.json | 14 -------------- home/.config/nvim/snippets/javascript.json | 8 ++++++++ home/.config/nvim/snippets/package.json | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 home/.config/nvim/snippets/java.json create mode 100644 home/.config/nvim/snippets/javascript.json 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/javascript.json b/home/.config/nvim/snippets/javascript.json new file mode 100644 index 00000000..7e0f1e8e --- /dev/null +++ b/home/.config/nvim/snippets/javascript.json @@ -0,0 +1,8 @@ +{ + "logVariable": { + "scope": "javascript", + "prefix": "logvar", + "description": "Log the variable under the cursor", + "body": ["console.log('$1', $1);"] + } +} diff --git a/home/.config/nvim/snippets/package.json b/home/.config/nvim/snippets/package.json index 70b1949d..724d4794 100644 --- a/home/.config/nvim/snippets/package.json +++ b/home/.config/nvim/snippets/package.json @@ -6,8 +6,8 @@ "contributes": { "snippets": [ { - "language": "java", - "path": "./java.json" + "language": "javascript", + "path": "./javascript.json" } ] } From 460edb35936c246c47b7ecc91676263a05d1a13e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 14 May 2025 16:42:35 -0500 Subject: [PATCH 1310/1326] ZSH: fix fzf initialization --- home/.config/zsh/03-plugins.zsh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/home/.config/zsh/03-plugins.zsh b/home/.config/zsh/03-plugins.zsh index 1a482711..1712bf54 100644 --- a/home/.config/zsh/03-plugins.zsh +++ b/home/.config/zsh/03-plugins.zsh @@ -35,16 +35,7 @@ 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 -{%@@ 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 -{%@@ endif @@%} +source <(fzf --zsh) # Generate completions at runtime zinit ice wait'2' lucid From 11b5a0347b52067bcc9fb2c068985f8043c28ef5 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Wed, 14 May 2025 16:42:50 -0500 Subject: [PATCH 1311/1326] Nvim: pin mason to older version Have to figure out migrating the config later --- 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 7c727ce0..ad4afb42 100644 --- a/home/.config/nvim/lua/plugins/mason.lua +++ b/home/.config/nvim/lua/plugins/mason.lua @@ -2,10 +2,11 @@ -- It also handles starting all of my LSP servers --- @type LazyPluginSpec return { - "williamboman/mason.nvim", + "mason-org/mason.nvim", + version = "^1.0.0", dependencies = { "neovim/nvim-lspconfig", - "williamboman/mason-lspconfig.nvim", + { "mason-org/mason-lspconfig.nvim", version = "^1.0.0" }, -- Add MasonUpdateAll { "Zeioth/mason-extra-cmds", opts = {} }, -- Add lockfile support From dac15275f4525acc9fee2358a1597c75c8517791 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 00:20:49 -0500 Subject: [PATCH 1312/1326] Implement cloudflare tunnel --- docker/caddy/Caddyfile | 226 ++++++++++++++++++------- docker/caddy/Caddyfile.old | 4 - docker/caddy/docker-compose.yaml | 7 +- docker/cloudflared/docker-compose.yaml | 19 +++ docker/forgejo/docker-compose.yaml | 1 - root/etc/pacman.conf | 2 +- 6 files changed, 191 insertions(+), 68 deletions(-) create mode 100644 docker/cloudflared/docker-compose.yaml diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index b45a08ad..149a0e9c 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -1,67 +1,177 @@ { - auto_https off + order umami first } -http://index.korhonen.lan { - root * /var/www/index.korhonen.cc - file_server browse -} +korhonen.cc, *.korhonen.cc { + encode zstd gzip -http://home.korhonen.lan { - reverse_proxy home-assistant:8123 -} - -http://sso.korhonen.lan, http://sso.korhonen.cc { - reverse_proxy authentik:9000 -} - -http://git.korhonen.lan { - rewrite /user/login /user/oauth2/authentik - reverse_proxy forgejo:3000 -} - -http://search.korhonen.lan { - reverse_proxy searx:8080 -} - -http://jellyfin.korhonen.lan { - reverse_proxy jellyfin:8096 -} - -http://cloud.korhonen.lan { - # 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 - 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 + tls { + dns cloudflare {$CF_API_TOKEN} + resolvers 1.1.1.1 } - 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 + header { + Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" } - file_server -} -http://collabora.korhonen.lan { - reverse_proxy collabora:9980 + @static { + file + path *.ico *.css *.js *.gif *.webp *.avif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.pdf *.webmanifest + } + + @homepage-www-redir host www.korhonen.cc + handle @homepage-www-redir { + redir https://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 + } + + @wkd host openpgpkey.korhonen.cc + handle @wkd { + root * /var/www/wkd + file_server browse + header Access-Control-Allow-Origin "*" + } + + @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 + } + + @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 { + rewrite /user/login /user/oauth2/authentik + 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 + } + + @freshrss host rss.korhonen.cc + handle @freshrss { + reverse_proxy freshrss + } + + @jellyfin host jellyfin.korhonen.cc + handle @jellyfin { + reverse_proxy jellyfin:8096 + } + + @pihole host pihole.korhonen.cc + handle @pihole { + reverse_proxy pihole + } + + @umami host umami.korhonen.cc + handle @umami { + reverse_proxy umami:3000 + } + + @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 + 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 + } + + @collabora host collabora.korhonen.cc + handle @collabora { + reverse_proxy collabora:9980 + } + + @drop host drop.korhonen.cc + handle @drop { + reverse_proxy drop:3000 + } + + @ipvX host ipv6.korhonen.cc ipv4.korhonen.cc + handle @ipvX { + respond {remote_host} + } + + handle { + respond "404 Not Found" 404 + } + + 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}" + } } diff --git a/docker/caddy/Caddyfile.old b/docker/caddy/Caddyfile.old index e33bef26..c2597f36 100644 --- a/docker/caddy/Caddyfile.old +++ b/docker/caddy/Caddyfile.old @@ -1,7 +1,3 @@ -# My old public configuration. -# Currently don't have a public IP so running everything in LAN -# in the current configuration - { order umami first } diff --git a/docker/caddy/docker-compose.yaml b/docker/caddy/docker-compose.yaml index fa7f5f9e..8187ad08 100644 --- a/docker/caddy/docker-compose.yaml +++ b/docker/caddy/docker-compose.yaml @@ -14,6 +14,7 @@ services: - 80:80 - 443:443/tcp - 443:443/udp + - 127.0.0.1:2019:2019 networks: - proxy volumes: @@ -24,10 +25,8 @@ services: - korhonen_cc:/var/www/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 + env_file: + - .env cap_add: - NET_ADMIN networks: diff --git a/docker/cloudflared/docker-compose.yaml b/docker/cloudflared/docker-compose.yaml new file mode 100644 index 00000000..e4ea0f26 --- /dev/null +++ b/docker/cloudflared/docker-compose.yaml @@ -0,0 +1,19 @@ +services: + cloudflared: + image: cloudflare/cloudflared + container_name: cloudflared + restart: unless-stopped + networks: + - proxy + volumes: + - /etc/localtime:/etc/localtime:ro + entrypoint: + command: tunnel --no-autoupdate run + env_file: + - .env + extra_hosts: + - 'host.docker.internal:host-gateway' + +networks: + proxy: + external: true diff --git a/docker/forgejo/docker-compose.yaml b/docker/forgejo/docker-compose.yaml index 44e2e8d6..9659a8a6 100644 --- a/docker/forgejo/docker-compose.yaml +++ b/docker/forgejo/docker-compose.yaml @@ -6,7 +6,6 @@ services: image: git.korhonen.cc/functionalhacker/forgejo-asciidoc container_name: forgejo environment: - - TZ=Europe/Helsinki - USER_UID=1000 - USER_GID=1000 restart: unless-stopped diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf index 437f09b9..df0355eb 100755 --- a/root/etc/pacman.conf +++ b/root/etc/pacman.conf @@ -30,5 +30,5 @@ Include = /etc/pacman.d/mirrorlist Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ else @@%} Include = /etc/pacman.d/pacserve -Server = http://index.korhonen.lan/repo/arch_linux/$repo/$arch +Server = http://index.korhonen.cc/repo/arch_linux/$repo/$arch {%@@ endif @@%} From bc186e343d962db7dd9a03bec740b3f775ff4877 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 01:11:25 -0500 Subject: [PATCH 1313/1326] Update forgejo runner --- docker/forgejo/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/docker-compose.yaml b/docker/forgejo/docker-compose.yaml index 9659a8a6..6add26f3 100644 --- a/docker/forgejo/docker-compose.yaml +++ b/docker/forgejo/docker-compose.yaml @@ -18,7 +18,7 @@ services: - data:/data - /etc/localtime:/etc/localtime:ro runner: - image: code.forgejo.org/forgejo/runner:3.5.1 + image: code.forgejo.org/forgejo/runner:6 container_name: forgejo-runner user: root:root volumes: From 9f2ed13fc99994acc6d8e42979f0e7f9659fbe03 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 17:06:51 -0500 Subject: [PATCH 1314/1326] Remove old Caddyfile --- docker/caddy/Caddyfile.old | 191 ------------------------------------- 1 file changed, 191 deletions(-) delete mode 100644 docker/caddy/Caddyfile.old diff --git a/docker/caddy/Caddyfile.old b/docker/caddy/Caddyfile.old deleted file mode 100644 index c2597f36..00000000 --- a/docker/caddy/Caddyfile.old +++ /dev/null @@ -1,191 +0,0 @@ -{ - order umami first -} - -(common_site_settings) { - encode zstd gzip - - tls { - dns cloudflare {$CLOUDFLARE_API_TOKEN} - resolvers 1.1.1.1 - } - - 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 - } - - @homepage-www-redir host www.korhonen.cc - handle @homepage-www-redir { - redir https://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 - } - - @wkd host openpgpkey.korhonen.cc - handle @wkd { - root * /var/www/wkd - file_server browse - header Access-Control-Allow-Origin "*" - } - - @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 - } - - @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 { - rewrite /user/login /user/oauth2/authentik - 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 - } - - @freshrss host rss.korhonen.cc - handle @freshrss { - reverse_proxy freshrss - } - - @jellyfin host jellyfin.korhonen.cc - handle @jellyfin { - reverse_proxy jellyfin:8096 - } - - @pihole host pihole.korhonen.cc - handle @pihole { - reverse_proxy pihole - } - - @umami host umami.korhonen.cc - handle @umami { - reverse_proxy umami:3000 - } - - @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 - 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 - } - - @tvheadend host tvheadend.korhonen.cc - handle @tvheadend { - reverse_proxy tvheadend:9981 - } - - @collabora host collabora.korhonen.cc - handle @collabora { - reverse_proxy collabora:9980 - } - - @drop host drop.korhonen.cc - handle @drop { - reverse_proxy drop:3000 - } - - @ipvX host ipv6.korhonen.cc ipv4.korhonen.cc - handle @ipvX { - respond {remote_host} - } - - @ott host ott.korhonen.cc - handle @ott { - reverse_proxy opentogethertube:8080 - } - - handle { - respond "404 Not Found" 404 - } - - 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}" - } -} From e87bdf60a35d879d941a584d76b3dff1f1e7b00e Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 17:34:57 -0500 Subject: [PATCH 1315/1326] Forgejo runner: fix docker socket mount --- docker/forgejo/runner.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/forgejo/runner.yaml b/docker/forgejo/runner.yaml index 2691c298..bf5286bc 100644 --- a/docker/forgejo/runner.yaml +++ b/docker/forgejo/runner.yaml @@ -27,7 +27,7 @@ container: workdir_parent: valid_volumes: - 'caddy_korhonen_cc' - docker_host: '' + docker_host: 'automount' force_pull: false host: From 168db20ffbebb8fe107475d2606c005a5cdcc227 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 17:35:08 -0500 Subject: [PATCH 1316/1326] Change authentik name in Forgejo --- docker/caddy/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 149a0e9c..4cfa6f75 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -73,7 +73,7 @@ korhonen.cc, *.korhonen.cc { @forgejo host git.korhonen.cc handle @forgejo { - rewrite /user/login /user/oauth2/authentik + rewrite /user/login /user/oauth2/Korhonen%20SSO reverse_proxy forgejo:3000 } From 1e1f1299d1a19d043db5630a93c198473d1100d0 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 17:55:53 -0500 Subject: [PATCH 1317/1326] Add wud --- docker/wud/docker-compose.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 docker/wud/docker-compose.yaml diff --git a/docker/wud/docker-compose.yaml b/docker/wud/docker-compose.yaml new file mode 100644 index 00000000..91bcbfd3 --- /dev/null +++ b/docker/wud/docker-compose.yaml @@ -0,0 +1,12 @@ +services: + whatsupdocker: + image: getwud/wud + container_name: wud + env_file: .env + environment: + - WUD_TRIGGER_SMTP_EMAIL_SIMPLETITLE=Container $${container.name} can be updated + - WUD_TRIGGER_SMTP_EMAIL_SIMPLEBODY=Container $${name} can be updated from $${local.substring(0, 15)} to $${remote.substring(0, 15)} + volumes: + - /var/run/docker.sock:/var/run/docker.sock + ports: + - 3000:3000 From fe65265dffe9ae6fb6253195c1d1f173469d1eed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 18:04:40 -0500 Subject: [PATCH 1318/1326] Docker: fix time zones --- docker/drop/docker-compose.yaml | 4 ++-- docker/freshrss/docker-compose.yaml | 3 +-- docker/homeautomation/docker-compose.yaml | 4 +--- docker/jellyfin/docker-compose.yaml | 4 +--- docker/mumble/docker-compose.yaml | 4 +--- docker/postgres/docker-compose.yaml | 4 +--- docker/tftp/docker-compose.yaml | 2 -- docker/tvheadend/docker-compose.yaml | 3 +-- 8 files changed, 8 insertions(+), 20 deletions(-) diff --git a/docker/drop/docker-compose.yaml b/docker/drop/docker-compose.yaml index 5407b591..e86bdd6f 100644 --- a/docker/drop/docker-compose.yaml +++ b/docker/drop/docker-compose.yaml @@ -5,9 +5,9 @@ services: restart: unless-stopped networks: - proxy - environment: - - TZ=Europe/Helsinki - IPV6_LOCALIZE=4 + volumes: + - /etc/localtime:/etc/localtime:ro networks: proxy: external: true diff --git a/docker/freshrss/docker-compose.yaml b/docker/freshrss/docker-compose.yaml index b9b9b71c..af961c5d 100644 --- a/docker/freshrss/docker-compose.yaml +++ b/docker/freshrss/docker-compose.yaml @@ -12,10 +12,9 @@ services: environment: - PUID=1000 - PGID=985 - - TZ=Europe/Helsinki volumes: - - config:/config - /etc/localtime:/etc/localtime:ro + - config:/config networks: freshrss: external: false diff --git a/docker/homeautomation/docker-compose.yaml b/docker/homeautomation/docker-compose.yaml index ca42998a..adbcb414 100644 --- a/docker/homeautomation/docker-compose.yaml +++ b/docker/homeautomation/docker-compose.yaml @@ -9,11 +9,9 @@ services: container_name: home-assistant image: homeassistant/home-assistant restart: unless-stopped - environment: - - TZ=Europe/Helsinki volumes: - - hass:/config - /etc/localtime:/etc/localtime:ro + - hass:/config networks: - homeautomation - postgres diff --git a/docker/jellyfin/docker-compose.yaml b/docker/jellyfin/docker-compose.yaml index d6edc9df..f617f28d 100644 --- a/docker/jellyfin/docker-compose.yaml +++ b/docker/jellyfin/docker-compose.yaml @@ -9,8 +9,6 @@ services: jellyfin: image: jellyfin/jellyfin container_name: jellyfin - environment: - - TZ=Europe/Helsinki ports: - 8096:8096 networks: @@ -18,11 +16,11 @@ services: - authentik restart: unless-stopped volumes: + - /etc/localtime:/etc/localtime:ro - config:/config - cache:/cache - media:/media - nextcloud_data:/nextcloud_data - - /etc/localtime:/etc/localtime:ro devices: - /dev/dri/renderD128:/dev/dri/renderD128 - /dev/dri/card1:/dev/dri/card0 diff --git a/docker/mumble/docker-compose.yaml b/docker/mumble/docker-compose.yaml index 6ffebe23..df0fe9c8 100644 --- a/docker/mumble/docker-compose.yaml +++ b/docker/mumble/docker-compose.yaml @@ -4,10 +4,8 @@ services: mumble: container_name: mumble image: phlak/mumble - environment: - - TZ=Europe/Helsinki network_mode: host volumes: - - config:/etc/mumble - /etc/localtime:/etc/localtime:ro + - config:/etc/mumble restart: unless-stopped diff --git a/docker/postgres/docker-compose.yaml b/docker/postgres/docker-compose.yaml index 7c420e42..f51c542f 100644 --- a/docker/postgres/docker-compose.yaml +++ b/docker/postgres/docker-compose.yaml @@ -4,15 +4,13 @@ services: postgres: container_name: postgres image: postgres:16 - environment: - - TZ=Europe/Helsinki ports: - 127.0.0.1:5432:5432 networks: - postgres volumes: - - data:/var/lib/postgresql/data - /etc/localtime:/etc/localtime:ro + - data:/var/lib/postgresql/data restart: unless-stopped networks: postgres: diff --git a/docker/tftp/docker-compose.yaml b/docker/tftp/docker-compose.yaml index 47d6d3c0..d266b8c2 100644 --- a/docker/tftp/docker-compose.yaml +++ b/docker/tftp/docker-compose.yaml @@ -2,8 +2,6 @@ services: tftp: container_name: tftp image: pghalliday/tftp - environment: - - TZ=Europe/Helsinki restart: unless-stopped ports: - 69:69/udp diff --git a/docker/tvheadend/docker-compose.yaml b/docker/tvheadend/docker-compose.yaml index 64a2595c..d6ac73d7 100644 --- a/docker/tvheadend/docker-compose.yaml +++ b/docker/tvheadend/docker-compose.yaml @@ -6,14 +6,13 @@ services: image: linuxserver/tvheadend container_name: tvheadend environment: - - TZ=Europe/Helsinki - PUID=1000 - PGID=985 volumes: + - /etc/localtime:/etc/localtime:ro - config:/config - picons:/picons - /mnt/Storage/Media/PVR:/recordings - - /etc/localtime:/etc/localtime:ro ports: - 9981:9981 - 9982:9982 From 661c03efda492084fdf191e591f9d29952f3736b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 18:12:32 -0500 Subject: [PATCH 1319/1326] Add DISABLED markers for docker stacks to git --- docker/.gitignore | 1 - docker/backup/DISABLED | 0 docker/ddns/DISABLED | 0 docker/drop/DISABLED | 0 docker/firefish/DISABLED | 0 docker/freshrss/DISABLED | 0 docker/headscale/DISABLED | 0 docker/jellyfin/DISABLED | 0 docker/mumble/DISABLED | 0 docker/netbootxyz/DISABLED | 0 docker/opentogethertube/DISABLED | 0 docker/pihole/DISABLED | 0 docker/searx/DISABLED | 0 docker/stats/DISABLED | 0 docker/tftp/DISABLED | 0 docker/tvheadend/DISABLED | 0 docker/umami/DISABLED | 0 docker/watchtower/DISABLED | 0 docker/wud/DISABLED | 0 19 files changed, 1 deletion(-) create mode 100644 docker/backup/DISABLED create mode 100644 docker/ddns/DISABLED create mode 100644 docker/drop/DISABLED create mode 100644 docker/firefish/DISABLED create mode 100644 docker/freshrss/DISABLED create mode 100644 docker/headscale/DISABLED create mode 100644 docker/jellyfin/DISABLED create mode 100644 docker/mumble/DISABLED create mode 100644 docker/netbootxyz/DISABLED create mode 100644 docker/opentogethertube/DISABLED create mode 100644 docker/pihole/DISABLED create mode 100644 docker/searx/DISABLED create mode 100644 docker/stats/DISABLED create mode 100644 docker/tftp/DISABLED create mode 100644 docker/tvheadend/DISABLED create mode 100644 docker/umami/DISABLED create mode 100644 docker/watchtower/DISABLED create mode 100644 docker/wud/DISABLED diff --git a/docker/.gitignore b/docker/.gitignore index b5d7ad6f..934c1fb2 100644 --- a/docker/.gitignore +++ b/docker/.gitignore @@ -1,2 +1 @@ */.env -*/DISABLED diff --git a/docker/backup/DISABLED b/docker/backup/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/ddns/DISABLED b/docker/ddns/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/drop/DISABLED b/docker/drop/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/firefish/DISABLED b/docker/firefish/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/freshrss/DISABLED b/docker/freshrss/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/headscale/DISABLED b/docker/headscale/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/jellyfin/DISABLED b/docker/jellyfin/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/mumble/DISABLED b/docker/mumble/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/netbootxyz/DISABLED b/docker/netbootxyz/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/opentogethertube/DISABLED b/docker/opentogethertube/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/pihole/DISABLED b/docker/pihole/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/searx/DISABLED b/docker/searx/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/stats/DISABLED b/docker/stats/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/tftp/DISABLED b/docker/tftp/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/tvheadend/DISABLED b/docker/tvheadend/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/umami/DISABLED b/docker/umami/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/watchtower/DISABLED b/docker/watchtower/DISABLED new file mode 100644 index 00000000..e69de29b diff --git a/docker/wud/DISABLED b/docker/wud/DISABLED new file mode 100644 index 00000000..e69de29b From b040d847f8ed6f1eb412106c25d85ed90e833575 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 21:34:55 -0500 Subject: [PATCH 1320/1326] Add profile for Evendim --- config.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config.toml b/config.toml index affc47ca..2490cd9c 100644 --- a/config.toml +++ b/config.toml @@ -280,3 +280,6 @@ include = ["terminal"] [profiles.ViiruJaTeippi] include = ["terminal"] + +[profiles.Evendim] +include = ["terminal", "pacman"] From 13d32f0da2ffd35909fddbdaac7fb341a5d7ef7d Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 21:40:19 -0500 Subject: [PATCH 1321/1326] Add root configs for new server --- config-root.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config-root.toml b/config-root.toml index f41aa8c9..5dced662 100644 --- a/config-root.toml +++ b/config-root.toml @@ -276,3 +276,7 @@ include = ["Pacman"] [profiles.mko-laptop] dotfiles = ["f_cpupower", "f_doas.conf", "f_timesyncd.conf"] + +[profiles.Evendim] +include = ["Locale", "Pacman"] +dotfiles = ["f_doas.conf", "f_sshd_config"] From c0a307ef190730173ee20a277567830c06b982d4 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 21:41:19 -0500 Subject: [PATCH 1322/1326] Fix root profile name casing --- config-root.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config-root.toml b/config-root.toml index 5dced662..0faab602 100644 --- a/config-root.toml +++ b/config-root.toml @@ -168,10 +168,10 @@ dst = "/etc/doas.conf" src = "etc/flexo/flexo.toml" dst = "/etc/flexo/flexo.toml" -[profiles.Locale] +[profiles.locale] dotfiles = ["f_locale.conf", "f_locale.gen"] -[profiles.Pacman] +[profiles.pacman] dotfiles = [ "f_pacman.conf", "f_pacman_zsh_hook", @@ -204,7 +204,7 @@ dotfiles = [ "f_welcomemessage.conf", "f_flexo.toml", ] -include = ["Locale", "Pacman"] +include = ["locale", "pacman"] [profiles.VentoyArch] dotfiles = [ @@ -221,7 +221,7 @@ dotfiles = [ "f_system.conf", "f_timesyncd.conf", ] -include = ["Locale", "Pacman"] +include = ["locale", "pacman"] [profiles.Shire] dotfiles = [ @@ -244,10 +244,10 @@ dotfiles = [ "f_sshd_config", "f_system.conf", ] -include = ["Locale", "Pacman"] +include = ["locale", "pacman"] [profiles.Moria] -include = ["Locale", "Pacman"] +include = ["locale", "pacman"] dotfiles = [ "f_99-sysctl.conf", "f_cmdline", @@ -265,18 +265,18 @@ dotfiles = [ dotfiles = ["f_doas.conf", "f_ignore", "f_sshd_config"] [profiles.Gondor] -include = ["Locale", "Pacman"] +include = ["locale", "pacman"] dotfiles = ["f_doas.conf", "f_sshd_config"] [profiles.localhost] -include = ["Locale"] +include = ["locale"] [profiles.Edoras] -include = ["Pacman"] +include = ["pacman"] [profiles.mko-laptop] dotfiles = ["f_cpupower", "f_doas.conf", "f_timesyncd.conf"] [profiles.Evendim] -include = ["Locale", "Pacman"] +include = ["locale", "pacman"] dotfiles = ["f_doas.conf", "f_sshd_config"] From 246c755eaccbf3a963065d6836f3ef60ada84d54 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 23:20:29 -0500 Subject: [PATCH 1323/1326] Add evendim ssh conf --- home/.ssh/config | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/home/.ssh/config b/home/.ssh/config index b912590c..5ffe1d8c 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -10,7 +10,18 @@ host * host moria HostName home.korhonen.cc port 221 - User balrog + User functionalhacker + {%@@ 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 evendim + HostName evendim.korhonen.cc + port 22 + User functionalhacker {%@@ if distro_id != "termux" @@%} # Forward GPG agent StreamLocalBindUnlink yes From ac06fd90f554d40564f101f39ef1f45c7e0318b2 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 23:40:03 -0500 Subject: [PATCH 1324/1326] Change searxng hostname in preparation of load balancer --- docker/caddy/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile index 4cfa6f75..59bc7f7e 100644 --- a/docker/caddy/Caddyfile +++ b/docker/caddy/Caddyfile @@ -82,7 +82,7 @@ korhonen.cc, *.korhonen.cc { reverse_proxy woodpecker:8000 } - @searx host search.korhonen.cc + @searx host dsearch.korhonen.cc handle @searx { reverse_proxy searx:8080 } From cdd232ab9e251de436fb319946a95afbe5327c6a Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 23:51:34 -0500 Subject: [PATCH 1325/1326] Nvim: remove copilot --- home/.config/nvim/lua/plugins/copilot.lua | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/copilot.lua 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 }, - }, -} From c519728530ae0f760b103848e401853542019538 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 7 Jun 2025 23:51:44 -0500 Subject: [PATCH 1326/1326] Add localtime volume to Caddy --- docker/caddy/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/caddy/docker-compose.yaml b/docker/caddy/docker-compose.yaml index 8187ad08..cb3936ef 100644 --- a/docker/caddy/docker-compose.yaml +++ b/docker/caddy/docker-compose.yaml @@ -18,6 +18,7 @@ services: networks: - proxy volumes: + - /etc/localtime:/etc/localtime:ro - ./Caddyfile:/etc/caddy/Caddyfile - data:/data - config:/config