Update gothic install script

Otherwise, "black" output is just invisible. Mainly visible with ansible
DEBUG output, which is "dark gray", which is "1;30", which is black,
which was until now the same as the background color.

.gitignore

@@ -1 +1 @@
-/venv/
+/*.bundle

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "contrib/vim-plug"]
 	path = contrib/vim-plug
 	url = https://github.com/junegunn/vim-plug
+[submodule "ansible_roles/firefox"]
+	path = ansible_roles/firefox
+	url = https://github.com/staticdev/ansible-role-firefox

Makefile

@@ -1,21 +1,16 @@
-venv = ./venv
+ansible_run = ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
-requirements = requirements.txt
-activate = . $(venv)/bin/activate
-pip = pip
-ansible = venv/bin/ansible-playbook
-ansible_run = $(activate) && ansible-playbook --inventory localhost, --diff --verbose ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
 
 .PHONY: all
-all: $(ansible)
+all:
 	$(ansible_run)
 
-.PHONY: dryrun
+.PHONY: config
-dryrun: $(ansible)
+config:
-	$(ansible_run) --check
+	$(ansible_run) --skip-tags system-update
 
-.PHONY: update
+.PHONY: system-update
-update: $(ansible)
+system-update:
-	$(ansible_run) --tags update_system
+	$(ansible_run) --tags system-update
 
 .PHONY: reboot
 reboot:
@@ -29,27 +24,13 @@ poweroff:
 weekend: | update poweroff
 
 .PHONY: packages
-packages: $(ansible)
+packages:
 	$(ansible_run) --tags packages
 
 .PHONY: dotfiles
-dotfiles: $(ansible)
+dotfiles:
 	$(ansible_run) --tags dotfiles
 
-.PHONY: clean
-clean:
-	rm -rf venv
-
 .PHONY: test
 test:
 	./test-in-docker.sh
-
-$(ansible): venv
-
-venv:
-	python3 -m venv $(venv)
-	$(activate) && $(pip) install -r $(requirements)
-
-.PHONY: freeze
-freeze:
-	$(activate) && $(pip) freeze > $(requirements)

_machines/ares.yml

@@ -1,6 +1,4 @@
 font_size: 12
-letter_space: 0
-terminal_binary: alacritty
 
 gpu: amd
 
@@ -8,15 +6,39 @@ users:
 - name: hannes
   vt: 1
   firefox_profiles:
-    - name: 7kqv7aco.default-release
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
       manage_css: true
+    media:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+      bigger_font: true
   mail: hannes@hkoerber.de
   git_gpg_sign: false
+  ssh_agent: false
   gpg_agent: true
-  gpg_keys:
+  gpg_agent_for_ssh: true
-    master_key: "0xB5C002530C6A2053"
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  enable_passwordstore: true
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
+  has_yubikey: true
+  repositories:
+    - personal_projects
 
 screen:
   1: DisplayPort-0
@@ -30,15 +52,19 @@ screen:
   9: DisplayPort-0
   0: DisplayPort-0
 
+screencfgs: []
+
 workspace:
+  1: ""
+  9: ""
+  10: ""
 
 environment:
   MACHINE_TYPE: "workstation"
   MACHINE_HAS_KEEPASSX: "false"
   MACHINE_HAS_NEXTCLOUD: "true"
   MACHINE_HAS_STEAM: "true"
-  MACHINE_HAS_DISCORD: "true"
   MACHINE_HAS_RESTIC_BACKUP: "false"
-  MACHINE_DEFAULT_SCREENPROFILE: "ares"
+  MACHINE_HAS_ELEMENT: "true"
   MACHINE_RESOLUTION_X: "2560"
   MACHINE_RESOLUTION_Y: "1440"

_machines/mars.yml

@@ -0,0 +1,92 @@
+font_size: 12
+
+users:
+- name: hannes-work
+  group: hannes-work
+  vt: 1
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+    meet:
+      extensions:
+        - ublock-origin
+      manage_css: false
+  mail: hannes.koerber@tradebyte.com
+  git_gpg_sign: false
+  ssh_agent: true
+  gpg_agent: false
+  gpg_agent_for_ssh: false
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "false"
+    MACHINE_HAS_RESTIC_BACKUP: "true"
+    MACHINE_HAS_ELEMENT: "false"
+    MACHINE_HAS_KEEPASSX: "true"
+  has_yubikey: false
+  repositories: []
+- name: hannes-private
+  group: hannes-private
+  vt: 2
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
+      manage_css: true
+  mail: hannes@hkoerber.de
+  git_gpg_sign: false
+  ssh_agent: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  enable_passwordstore: true
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "true"
+    MACHINE_HAS_RESTIC_BACKUP: "false"
+    MACHINE_HAS_ELEMENT: "true"
+    MACHINE_HAS_KEEPASSX: "false"
+  has_yubikey: true
+  repositories:
+    - personal_projects
+
+screen:
+  1: DP-1-1
+  2: DP-1-1
+  3: DP-1-2
+  4: DP-1-2
+  5: DP-1-2
+  6: DP-1-2
+  7: eDP-1
+  8: eDP-1
+  9: eDP-1
+  0: eDP-1
+
+workspace:
+  1: ""
+  2: ""
+  3: " local"
+  4: " remote"
+  7: ""
+  8: ""
+  9: ""
+  10: ""
+
+screencfgs:
+  - name: three-screens
+    key: F3
+
+environment:
+  MACHINE_TYPE: "laptop"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1080"

_machines/neptune.yml

@@ -0,0 +1,96 @@
+font_size: 12
+
+users:
+- name: hannes-work
+  group: hannes-work
+  vt: 1
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+    meet:
+      extensions:
+        - ublock-origin
+      manage_css: false
+  mail: hannes.koerber@tradebyte.com
+  git_gpg_sign: false
+  ssh_agent: true
+  gpg_agent: false
+  gpg_agent_for_ssh: false
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "false"
+    MACHINE_HAS_RESTIC_BACKUP: "true"
+    MACHINE_HAS_ELEMENT: "false"
+    MACHINE_HAS_KEEPASSX: "true"
+  has_yubikey: false
+  repositories: []
+  overrides:
+    terraform_version: 1.1.3
+    terraform_check_updates: false
+
+- name: hannes-private
+  group: hannes-private
+  vt: 2
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
+      manage_css: true
+  mail: hannes@hkoerber.de
+  git_gpg_sign: false
+  ssh_agent: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  enable_passwordstore: true
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "true"
+    MACHINE_HAS_RESTIC_BACKUP: "false"
+    MACHINE_HAS_ELEMENT: "true"
+    MACHINE_HAS_KEEPASSX: "false"
+  has_yubikey: true
+  repositories:
+    - personal_projects
+
+screen:
+  1: DP-3
+  2: DP-3
+  3: DP-4
+  4: DP-4
+  5: DP-4
+  6: DP-4
+  7: eDP-1
+  8: eDP-1
+  9: eDP-1
+  0: eDP-1
+
+workspace:
+  1: ""
+  2: ""
+  3: " local"
+  4: " remote"
+  7: ""
+  8: ""
+  9: ""
+  10: ""
+
+screencfgs:
+  - name: three-screens
+    key: F3
+
+environment:
+  MACHINE_TYPE: "laptop"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1080"

_machines/tb-hak.yml

@@ -1,55 +0,0 @@
-font_size: 11
-letter_space: 0
-terminal_binary: urxvt
-
-users:
-- name: hannes-work
-  group: hak
-  vt: 1
-  firefox_profiles:
-    - name: 3wmp9hdb.default-1565075150057
-      manage_css: true
-  mail: hannes.koerber@tradebyte.com
-  git_gpg_sign: false
-  gpg_agent: false
-  environment:
-    MACHINE_HAS_NEXTCLOUD: "false"
-- name: hannes-private
-  group: tpp
-  vt: 2
-  mail: hannes@hkoerber.de
-  git_gpg_sign: false
-  gpg_agent: true
-  gpg_keys:
-    master_key: "0xB5C002530C6A2053"
-  environment:
-    MACHINE_HAS_NEXTCLOUD: "true"
-
-screen:
-  1: DP-1-1
-  2: DP-1-1
-  3: DP-1-2
-  4: DP-1-2
-  5: DP-1-2
-  6: DP-1-2
-  7: eDP-1
-  8: eDP-1
-  9: eDP-1
-  0: eDP-1
-
-workspace:
-  1: www
-  2: www
-  3: term-local
-  4: term-remote
-  7: comm
-  8: pass
-  9: music
-  10: pim
-
-environment:
-  MACHINE_TYPE: "laptop"
-  MACHINE_HAS_KEEPASSX: "true"
-  MACHINE_HAS_RESTIC_BACKUP: "true"
-  MACHINE_RESOLUTION_X: "1920"
-  MACHINE_RESOLUTION_Y: "1080"

alacritty/alacritty.yml.j2

@@ -14,14 +14,14 @@
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
 # set by alacritty itself.
-#env:
+env:
   # TERM variable
   #
   # This value is used to set the `$TERM` environment variable for
   # each instance of Alacritty. If it is not present, alacritty will
   # check the local terminfo database and use `alacritty` if it is
   # available, otherwise `xterm-256color` is used.
-  #TERM: alacritty
+  TERM: alacritty
 
 window:
   # Window dimensions (changes require restart)
@@ -75,10 +75,10 @@ window:
   #startup_mode: Windowed
 
   # Window title
-  #title: Alacritty
+  title: "[terminal]"
 
   # Allow terminal applications to change Alacritty's window title.
-  #dynamic_title: true
+  dynamic_title: true
 
   # Window class (Linux/BSD only):
   #class:
@@ -150,7 +150,7 @@ font:
     style: Bold Italic
 
   # Point size
-  size: {{ machine.font_size }}
+  size: {{ machine.font_size - 3 }}
 
   # Offset is the extra space around each character. `offset.y` can be thought
   # of as modifying the line spacing, and `offset.x` as modifying the letter
@@ -184,7 +184,7 @@ colors:
 
   # Normal colors
   normal:
-   black:   '#272822'
+   black:   '#000000'
    red:     '#F92672'
    green:   '#A6E22E'
    yellow:  '#F4BF75'

ansible.cfg

@@ -1,3 +1,5 @@
 [defaults]
 retry_files_enabled = False
 nocows = 1
+roles_path = ./ansible_roles
+library = ./ansible_roles/firefox/library

autostart/autostart.target.j2

@@ -3,10 +3,19 @@ BindsTo=windowmanager.target
 After=windowmanager.target
 
 Wants=blueman.service
-Wants=discord.service
 Wants=dpms.service
 Wants=dunst.service
-Wants=firefox.service
+Wants=element.service
+{% for profile, config in (user.firefox_profiles|default({})).items() %}
+{% if config.bigger_font|default(false) is sameas false %}
+Wants=firefox@{{ profile }}.service
+{% endif %}
+{% endfor %}
+{% for profile, config in (user.firefox_profiles|default({})).items() %}
+{% if config.bigger_font|default(false) is sameas true %}
+Wants=firefox-gtk-override-bigger-font@{{ profile }}.service
+{% endif %}
+{% endfor %}
 Wants=gpg-agent.service
 Wants=gnome-keyring.service
 Wants=keepassx.service
@@ -21,7 +30,7 @@ Wants=screencfg.service
 Wants=spotify.service
 Wants=steam.service
 Wants=touchpad.service
-Wants=wallpaper.timer
 Wants=xresources.service
 Wants=yubikey-touch-detector.service
+Wants=kdeconnect.service
 

autostart/services/blueman.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/blueman-applet
+ExecStart=/usr/bin/env blueman-applet
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/discord.service

@@ -1,8 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-ConditionEnvironment=MACHINE_HAS_DISCORD=true
-
-[Service]
-ExecStart=/usr/bin/discord

autostart/services/dpms.service

@@ -4,5 +4,7 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=xset s off
+ExecStart=/usr/bin/env xset s off
-ExecStart=xset dpms 0 0 300
+ExecStart=/usr/bin/env xset dpms 0 0 300
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/dunst.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/dunst -config %h/.config/dunstrc
+ExecStart=/usr/bin/env dunst -config %h/.config/dunstrc
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/element.service

@@ -0,0 +1,11 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+After=i3.service
+
+ConditionPathExists=%h/.var/run/features/element
+
+[Service]
+ExecStart=/usr/bin/env element-desktop
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/firefox-gtk-override-bigger-font@.service

@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env firefox --setDefaultBrowser -P %i
+PassEnvironment=DISPLAY
+Environment=XDG_CONFIG_HOME=%h/.config/gtk-3.0-overrides/bigger-font/
+Restart=always

autostart/services/firefox.service

@@ -1,6 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-[Service]
-ExecStart=/usr/bin/firefox --setDefaultBrowser -P default

autostart/services/firefox@.service

@@ -0,0 +1,8 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env firefox --setDefaultBrowser -P %i
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/gnome-keyring.service

@@ -4,3 +4,5 @@ After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/env gnome-keyring-daemon --start --foreground --components secrets
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/gpg-agent.service

@@ -1,7 +1,10 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
+ConditionPathExists=%h/.var/run/features/gpg_agent
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/gpg-agent --homedir %h/.gnupg --no-detach --daemon
+ExecStart=/usr/bin/env gpg-agent --homedir %h/.gnupg --no-detach --daemon
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/i3.service

@@ -1,5 +1,6 @@
 [Service]
-Type=exec
+Type=simple
-ExecStart=i3 --config %h/.i3/config
+ExecStart=/usr/bin/env i3 --config %h/.i3/config
+PassEnvironment=DISPLAY
 
 Restart=no

autostart/services/kdeconnect.service

@@ -0,0 +1,8 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env kdeconnect-indicator
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/keepassx.service

@@ -1,7 +1,9 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionEnvironment=MACHINE_HAS_KEEPASSX=true
+ConditionPathExists=%h/.var/run/features/keepassx
 
 [Service]
-ExecStart=/usr/bin/keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
+ExecStart=/usr/bin/env keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/keyboard.service

@@ -4,6 +4,7 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/setxkbmap -layout de -variant nodeadkeys
+ExecStart=/usr/bin/env setxkbmap -layout de -variant nodeadkeys
-ExecStart=/usr/bin/xset r rate 150 50
+ExecStart=/usr/bin/env xset r rate 150 50
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/laptop-lid.service

@@ -1,8 +1,10 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-
+ConditionPathExists=%h/.var/run/features/machine_is_laptop
-ConditionEnvironment=MACHINE_TYPE=laptop
 
 [Service]
-ExecStart=/usr/bin/bash -c 'grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup'
+Type=oneshot
+ExecStart=/usr/bin/env bash -c 'grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup'
+RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/nextcloud.service

@@ -3,7 +3,12 @@ BindsTo=autostart.target
 After=windowmanager.target
 After=gnome-keyring.service
 
-ConditionEnvironment=MACHINE_HAS_NEXTCLOUD=true
+ConditionPathExists=%h/.var/run/features/nextcloud
 
 [Service]
-ExecStart=/usr/bin/nextcloud --background
+ExecStart=/usr/bin/env nextcloud --background
+PassEnvironment=DISPLAY
+Restart=always
+
+MemoryHigh=20%
+MemoryMax=30%

autostart/services/nm-applet.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/nm-applet
+ExecStart=/usr/bin/env nm-applet
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/pasystray.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/pasystray
+ExecStart=/usr/bin/env pasystray
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/redshift.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/redshift-gtk -c %h/.config/redshift.conf
+ExecStart=/usr/bin/env redshift-gtk -c %h/.config/redshift.conf
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/restic.service

@@ -1,7 +1,8 @@
 [Unit]
-ConditionEnvironment=MACHINE_HAS_RESTIC_BACKUP=true
+ConditionPathExists=%h/.var/run/features/restic_backup
 
 [Service]
 Type=oneshot
-ExecStart=%h/bin/restic-backup
+ExecStart=%h/restic/restic-backup
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/restic.timer

@@ -3,6 +3,4 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Timer]
-OnCalendar=Mon..Fri 09:00:00
 OnCalendar=Mon..Fri 12:00:00
-OnCalendar=Mon..Fri 16:00:00

autostart/services/screencfg.service

@@ -1,7 +1,6 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionEnvironment=MACHINE_DEFAULT_SCREENPROFILE
 
 [Service]
 Type=oneshot
@@ -9,5 +8,6 @@ Type=oneshot
 
 # > The command to execute may contain spaces, but control characters are not
 # > allowed.
-ExecStart=bash -c '%h/.screencfg/${MACHINE_DEFAULT_SCREENPROFILE}.sh'
+ExecStart=/usr/bin/env screencfg "%h/.screencfg/%H/default.yml"
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/spotify.service

@@ -3,4 +3,6 @@ BindsTo=autostart.target
 After=windowmanager.target
 
 [Service]
-ExecStart=/usr/bin/spotify
+ExecStart=/usr/bin/env spotify
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/steam.service

@@ -3,7 +3,9 @@ BindsTo=autostart.target
 After=windowmanager.target
 After=i3.service
 
-ConditionEnvironment=MACHINE_HAS_STEAM=true
+ConditionPathExists=%h/.var/run/features/steam
 
 [Service]
-ExecStart=/usr/bin/steam
+ExecStart=/usr/bin/env steam
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/touchpad.service

@@ -1,17 +1,18 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
-ConditionEnvironment=MACHINE_TYPE=laptop
+ConditionPathExists=%h/.var/run/features/machine_is_laptop
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/synclient VertEdgeScroll=0
+ExecStart=/usr/bin/env synclient VertEdgeScroll=0
-ExecStart=/usr/bin/synclient VertTwoFingerScroll=1
+ExecStart=/usr/bin/env synclient VertTwoFingerScroll=1
-ExecStart=/usr/bin/synclient MaxSpeed=2.2
+ExecStart=/usr/bin/env synclient MaxSpeed=2.2
-ExecStart=/usr/bin/synclient AccelFactor=0.08
+ExecStart=/usr/bin/env synclient AccelFactor=0.08
-ExecStart=/usr/bin/synclient TapButton1=1
+ExecStart=/usr/bin/env synclient TapButton1=1
-ExecStart=/usr/bin/synclient CoastingSpeed=0
+ExecStart=/usr/bin/env synclient CoastingSpeed=0
-ExecStart=/usr/bin/synclient PalmDetect=1
+ExecStart=/usr/bin/env synclient PalmDetect=1
-ExecStart=/usr/bin/synclient PalmMinWidth=20
+ExecStart=/usr/bin/env synclient PalmMinWidth=20
-ExecStart=/usr/bin/synclient PalmMinZ=1
+ExecStart=/usr/bin/env synclient PalmMinZ=1
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/wallpaper.service

@@ -1,4 +0,0 @@
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/setrandom --recursive --onlylarge --mode=stretch /usr/share/wallpapers
-RemainAfterExit=true

autostart/services/wallpaper.timer

@@ -1,9 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-[Timer]
-OnActiveSec=0s
-OnCalendar=hourly
-Unit=wallpaper.service
-RemainAfterElapse=true

autostart/services/xresources.service

@@ -4,5 +4,6 @@ After=windowmanager.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/xrdb -merge -I%h %h/.Xresources
+ExecStart=/usr/bin/env xrdb -merge -I%h %h/.Xresources
 RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/yubikey-touch-detector.service

@@ -1,6 +1,10 @@
 [Unit]
 BindsTo=autostart.target
+PartOf=gpg-agent.service
 After=windowmanager.target
+After=gpg-agent.service
 
 [Service]
-ExecStart=/usr/bin/yubikey-touch-detector -libnotify
+ExecStart=/usr/bin/env yubikey-touch-detector -libnotify
+PassEnvironment=DISPLAY
+Restart=always

bin/check

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 set -o errexit
-cd $HOME/sync/projects/time-tracking
+
+cd ~/code/personal/time-tracking/
 source venv/bin/activate
+source ~/.attendance_env
+
 ./call.py "${@}"

bin/dunstctl

@@ -8,13 +8,13 @@ log() {
     printf '[%s] %s\n' "$(date -uIseconds)" "$*" >> "$_logfile"
 }
 
-case "$1" in
+case "$1 $2" in
-    enable)
+    "set-paused false")
         log "Enabling dunst"
         systemctl --user --no-block kill --signal SIGUSR2 dunst
 
         ;;
-    disable)
+    "set-paused true")
         log "Disabling dunst"
         systemctl --user --no-block kill --signal SIGUSR1 dunst
         ;;

bin/gdrive-backup

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-rclone \
-    --checksum \
-    --delete-excluded \
-    --exclude /.cache/ \
-    --exclude /.vagrant.d/ \
-    --exclude /.minikube/ \
-    --exclude /Downloads/ \
-    --exclude /downloads/ \
-    --exclude /tmp/ \
-    --verbose \
-    --stats 60s \
-    sync \
-    $HOME \
-    gdrive:backup

bin/kubectl-env

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-case "$1" in
-mycloud)
-    shift
-    command kubectl --kubeconfig=<(pass show mycloud/kubeconfig) "${@}"
-    ;;
-*)
-    command kubectl "${@}"
-    ;;
-esac

bin/mypass

@@ -4,7 +4,7 @@ import sys
 import subprocess
 import yaml
 
-PASS = 'pass'
+PASS = '/usr/bin/pass'
 
 def run(args):
     return(subprocess.run(

bin/nato

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import sys
+import os.path
 
 hash = {
     'A': 'Alpha',
@@ -43,6 +44,45 @@ hash = {
     '.': 'Stop',
 }
 
+de = {
+    'A': 'Anton',
+    'Ä': 'Ärger',
+    'B': 'Berta',
+    'C': 'Cäsar',
+    'D': 'Dora',
+    'E': 'Emil',
+    'F': 'Friedrich',
+    'G': 'Gustav',
+    'H': 'Heinrich',
+    'I': 'Ida',
+    'J': 'Julius',
+    'K': 'Kaufmann',
+    'L': 'Ludwig',
+    'M': 'Martha',
+    'N': 'Nordpol',
+    'O': 'Otto',
+    'Ö': 'Ökonom',
+    'P': 'Paula',
+    'Q': 'Quelle',
+    'R': 'Richard',
+    'S': 'Samuel',
+    'ß': 'Eszett',
+    'T': 'Theodor',
+    'U': 'Ulrich',
+    'Ü': 'Übermut',
+    'V': 'Viktor',
+    'W': 'Wilhelm',
+    'X': 'Xanthippe',
+    'Y': 'Ypsilon',
+    'Z': 'Zacharias',
+    '-': 'Strich',
+    '.': 'Punkt',
+}
+
+if os.path.basename(sys.argv[0]) == 'natode':
+    hash = de
+
+
 if len(sys.argv) < 2 or sys.argv[1] == '-':
     text = [line.strip() for line in sys.stdin.readlines()]
 else:

bin/natode

@@ -0,0 +1 @@
+nato

bin/pf

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+
+import sys
+import json
+import yaml
+import subprocess
+
+jqexpression = sys.argv[1]
+
+jqprocess = subprocess.Popen(["jq", "-r", jqexpression], stdin=subprocess.PIPE, text=True)
+
+document = [d for d in yaml.safe_load_all(sys.stdin)][-1]
+
+json.dump(document, jqprocess.stdin)

bin/restic-backup

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-nice --adjustment 19 \
-ionice --class 3 \
-restic -r rclone:restic:restic --password-file=$HOME/restic_password backup --exclude-file=$HOME/restic_exclude.lst $HOME

bin/screencfg

@@ -31,7 +31,7 @@ args = parser.parse_args()
 config_path = args.config
 
 try:
-    config = yaml.load(open(config_path))
+    config = yaml.safe_load(open(config_path))
 except FileNotFoundError:
     fail("File {0} not found".format(config_path))
 
@@ -54,6 +54,8 @@ for output in config['outputs']:
         # cmd.append('--auto')
         for k, v in output['opts'].items():
             cmd.extend(['--{}'.format(k), str(v)])
+        for k,v  in output.get('set', {}).items():
+            cmd.extend(['--set', k, v])
 
 run(cmd)
 run(['i3-msg', 'restart'])

bin/share-screen

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-~/code/helper-scripts/sysop-share-screen.sh pi@monitor-sysop-${1:-middle}-${2:-top} 1

bin/since

@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-
-import datetime
-import sys
-
-USAGE="""Usage: {program} PATH_TO_FILE""".format(program=sys.argv[0])
-
-def die(message, code=1):
-    print(message)
-    sys.exit(code)
-
-def die_usage(code=1):
-    die(USAGE, code)
-
-def read_date_from_file(path):
-    text = open(path).readline().strip()
-    try:
-        time = datetime.datetime.strptime(text, '%Y-%m-%d')
-    except ValueError as e:
-        die(e)
-    return time
-
-def main(argv):
-    if len(argv) < 2:
-        die_usage()
-    last = read_date_from_file(argv[1])
-    now = datetime.datetime.now()
-    diff = now - last
-    days = diff.days
-    #hours = diff.seconds // (60 * 60)
-    if days == 1:
-        msg = "1 day"
-    else:
-        msg = "{days} days".format(days=days)
-
-    #msg += " "
-    #if hours == 1:
-    #    msg += "1 hour "
-    #else:
-    #    msg += "{hours} hours ".format(hours=hours)
-
-    print(msg)
-
-main(sys.argv)

detect-missing-packages.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+import yaml
+from pprint import pprint
+
+package_file = "./packages.yml"
+
+apps = yaml.safe_load(open(package_file, 'r'))
+
+missing_config = {}
+
+for appname, appconfig in apps['packages']['list'].items():
+    for distro, packagelist in appconfig.items():
+        if len(packagelist) == 0:
+            if distro not in missing_config.keys():
+                missing_config[distro] = []
+            missing_config[distro].append(appname)
+
+print(yaml.dump(missing_config))

dotfiles.yml

@@ -5,6 +5,9 @@ empty_directories:
   - name: .config/nvim
   - name: .config/rofi
   - name: .config/gtk-3.0
+  - name: .config/gtk-3.0-overrides
+  - name: .config/gtk-3.0-overrides/bigger-font/
+  - name: .config/gtk-3.0-overrides/bigger-font/gtk-3.0
   - name: .config/qt5ct
 dotfiles:
   - from: git/gitconfig
@@ -14,6 +17,7 @@ dotfiles:
     to: .gnupg/dirmngr.conf
   - from: gnupg/gpg-agent.conf
     to: .gnupg/gpg-agent.conf
+    template: true
   - from: gnupg/gpg.conf
     to: .gnupg/gpg.conf
     template: true
@@ -49,10 +53,12 @@ dotfiles:
     template: true
   - from: redshift/redshift.conf
     to: .config/redshift.conf
-  - from: vscode/settings.json
+  - from: vscodium/product.json
-    to: .config/Code/User/settings.json
+    to: .config/VSCodium/product.json
-  - from: vscode/keybindings.json
+  - from: vscodium/settings.json
-    to: .config/Code/User/keybindings.json
+    to: .config/VSCodium/User/settings.json
+  - from: vscodium/keybindings.json
+    to: .config/VSCodium/User/keybindings.json
   - from: alacritty/alacritty.yml
     to: .config/alacritty.yml
     template: true
@@ -60,8 +66,13 @@ dotfiles:
     to: .config/rofi/config
   - from: gtk/gtk-3.0.ini
     to: .config/gtk-3.0/settings.ini
+    template: true
+  - from: gtk/gtk-3.0-bigger-font.ini
+    to: .config/gtk-3.0-overrides/bigger-font/gtk-3.0/settings.ini
+    template: true
   - from: gtk/gtkrc-2.0
     to: .gtkrc-2.0
+    template: true
   - from: qt/qt5ct.conf
     to: .config/qt5ct/qt5ct.conf
   - from: screencfg

dunst/dunstrc.j2

@@ -29,7 +29,7 @@
     # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
-    geometry = "300x10-20+20"
+    geometry = "300x10-20-40"
 
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
@@ -64,7 +64,7 @@
     frame_width = 2
 
     # Defines color of the frame around the notification window.
-    frame_color = "#e16b40"
+    frame_color = "#ff964f"
 
     # Define a color for the separator.
     # possible values are:

git/gitconfig.j2

@@ -3,7 +3,7 @@
     email = {{ user.mail }}
     useConfigOnly = true
 {% if user.git_gpg_sign|bool %}
-    signingkey = {{ user.gpg_keys.master_key }}
+    signingkey = {{ user.gpg_key.id }}
 {% endif %}
 [github]
     user = hakoerber
@@ -113,9 +113,12 @@
     requireForce = true
 [pull]
     rebase = true
+    ff = only
 
 [url "ssh://git@code.hkoerber.de:2222/"]
     insteadOf = https://code.hkoerber.de/
 
 [init]
 	defaultBranch = master
+[safe]
+	directory = /var/lib/dotfiles

gnupg/gpg-agent.conf.j2

@@ -4,6 +4,8 @@ default-cache-ttl-ssh 60480000
 max-cache-ttl 34560000
 max-cache-ttl-ssh 34560000
 
+{% if user.gpg_agent_for_ssh %}
 enable-ssh-support
+{% endif %}
 
 pinentry-program /usr/bin/pinentry-qt

gpgkeys/hannes@hkoerber.de.gpg.asc

@@ -0,0 +1,109 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF52F2UBEADVm8w92aR5UoDq94jcCh5hEpbjIWrrmyBb3p7Z4x9loASIDNly
+6SrHjpFONw7EdCNzT2zQCCCoKezKfzALuU3xQ3Vl5fhtp3Ij/HGonSEFhz4ibhUC
+MsbCsUEU7yG/lzmz0dtk9UIWfVKDe8yhLCVxi+dUi2Lat58daQjO9OGjRP+Z5mMi
+ZtGzmV2UQHWmMipKlxx9yDpX5l1i2qduNXfC2ki+uBudzNNaZtwk9t690UXa6DHz
+xxnUJqewWG3zyFmhBrixOBF5Pdc+Uy79HOLfifZ+SRSpSKf7Dp7SiUE7XL0slWOD
+xxRRZPW5u6heSgFnVCLjtupLUSUCccNnvTKrKB1iOEjkpko7Q7FVMe5bTQOrO1de
+cr2PpGC3GeR6K1n0PYAwd49HgVZjCUqXzbz4Zeh9KRuM62geNTZjJxuuP7dbJP86
+p23+7uiODwVhdzvEP/ElYlwEGLGFFurbnqZ3DwFggdrQ6cOkSjQblt6xzxxlROo4
+HoyupyNz4I5yWqN+k4wk2+1A8TsSwKh1PAHG7C2LLZsKn4pSsdYgoaQaYsod89kZ
+mA1Sr4IEe9rhG6TnofxHqHegzifPM0XPmYlwVccAF+lb+CrvWbSBHHA5FVE/PCBe
+Xc4GYWghnobhK8kfgFZhr8BrBFFH+sAw8CYNbgg7O90HK7jnK79BlgU31QARAQAB
+tCNIYW5uZXMgS8O2cmJlciA8aGFubmVzQGhrb2VyYmVyLmRlPokCTAQTAQoANhYh
+BJc65I1xt2c1xHErW7XAAlMMaiBTBQJedhdlAhsBBAsJCAcEFQoJCAUWAgMBAAIe
+AQIXgAAKCRC1wAJTDGogUyIxEACZXR+fN+bb6PYW821k8oXO/MvNiiqtWC9CuLjP
+y1/eu/ZJUmeOca/8HsJsp0hOAJ7oUn3MBiW7gCVZ/2hQ+ywCtcDWp2PElutCiAyg
+QgN1IEg9RAcx+7RmHC0SEafhnyT4ogi7hJ9SK3kPnf5Ryli6qNFAWb3dtfSENYLK
+dqtzMi9+CvcsNKKMN+yhubVrQi5MHlqu7L4bdE4BW5bzsbbhLaPfmc/JYFkImF5v
+dXnOBA9gx2bVREoTw/GPioed9hpPu1ZWZC5we+WD4eEGrQD/LG/XyGUh6wQwsC7P
+aMXOydok7DHzUrCdvZ372Giv71cNV1++e6G+PdEqVo2FCp04Syzug5GwRbSAZ9B3
+1tqYV6L5SZh0TIjHNtuWTPq9dzpqVJJSxZdwvlgsv7Ni6GHYUrgTShza/+vXE1UE
+2MCoLCK0ZrdeMd8m7VMom3WIiV+N28MsKVCoYDLd0LMOrmhDDap16SGJYs/dB4lo
+a931k7ejOG68G2ViLJmRapkzEWH3TujYNyh4O7S6LuHwNvG6lyAyn9UTVSAaPT+t
+BV4zfd4UfKhYcKSm+aQuJ5RrZ+2l8YU87daeE2JXy1/z9I0C/YqbT8yHMqUi4Fzy
+VhfTAPm2lCLPomFmoS8fp2oNDt3s7AOQH2zOsimhA6pMTek/sKtywjRQ0TdXH2OA
+p2B10rkCDQRedheFARAAl4cEamPYTwineGIBGubqhznKQhUJhm1P3AbwOfzYloxg
+3wvq1njY0+1UY8HtV7EZ7xd1PpUgRxcA8paj2ootMwHM2TRxXad/EgpegfWNANQV
+YnDQj8Zqabrf3Orue93pLeRir38kOzX1qcOz72G6HDJWSQZLqF6LWJ9GehDpf9VB
+/K/8nXdEes2nLdffkR2blH5ltcM0kMak0tI3+5SnQCs1MmFWzSq+BFVYI5fT8hBf
+MCskiypF05E0Np7t0C5dQmToPPv5w6flUIJn3h7BfUYAi9uOdUfAykI57hXUWUlV
+gli5IJfDTYt/Y849vh3FH2qn0syQ425a8RqH5WLohH0qJ+A3nuOp6JfKGEFOiYxp
+9Y5tn6zEfqGC+D/xWnGGgfc6IMQVGYbWvqHRqMQquV1bD3rd7dDOE3QdkBvxpcVv
+1EeKfA36wRtlFyKgdHE0QiVD9VeCtGW1diFD3hEK+FqVdaxX45800gPjFIuzKOkv
+zoVzYxrUCSACs+6QyyXP8I1zMX9SXRvEg02MmpohwmEhSgotOMcjbWNyVFNfCAaS
+bCt9PyaWsz+qe2gGLAiYo2vvBij543vBgATSbFjhoM683gzo73AOYhaauULsy3Kq
+yfolj6TwGyEg7wvMO6YLttKCahjyz5isiAcf4fSNqWG0zSnBf6n7HXdtTjjsfx8A
+EQEAAYkEbAQYAQoAIBYhBJc65I1xt2c1xHErW7XAAlMMaiBTBQJedheFAhsCAkAJ
+ELXAAlMMaiBTwXQgBBkBCgAdFiEEyitwWoxynRUrXLoQzSinzDExgBcFAl52F4UA
+CgkQzSinzDExgBeCDw//WMa8qm/tBpr4BskpctySvIwiOf35o+cMAYvego94NkrY
+wuASAn3/2QsaZvZnYdJfCrzchCA30QZxRWAvkHIJ/zXZ1ayugsnEypvhw23012Xr
+KKMXyd6iuZdmbE1Umj6R1/LbdNjddqglR9AmKaOYaDzjpPuuirDbllRGh/7lluZq
+q8BmPvFe6Cl8FIijx03RfCbYSvQQRH10IBeJ+z+eE7z7FRspf4kJ6vXAbbSlKoRR
++PcA+Yc7meW+dvMnRpczGDvDbl522Mw2pxV3p4aN8TSMwSWztD4koXo4KCklFPh5
+M4R4HbZFEZj4i8BU+cbsQscJ4jHqrCK/qPSRx103ikVqwOElZkYqKthnrQ7rxO7S
+0CZOKzlK56Vl9LbnYE0nTHqZOxf9k9Z1ue9aVCRXWcQhCUVm9CLUegZz4DJtK9vl
+ntdYTKPRmMCUw407rhkEFA3bQc9l56GP5ARc6NN9C0fbz2PgIryuLP4BvR/BIV4L
+qLBgGfztN3KjHYI2RWAw3OcaxU7UhmXbCFvy6j/PVJckHNheqaIm/+wyDt+/rXf0
+3zc9YiEHrvGmmX+6VYlv8iE4sp2ye4EF0XSGm23/gKmvkF5jVuaB4OJeHYIQfOVP
+nnmsDan2NZ2znE5UmaqgxvxAuQh+XVjKlSUfeff+9XCscQvzuNBC39V+S+cJLoNm
+LA//Xd2Ic6Y9o44TaN1mDx031oYZjcmHq1YbwQbYnQj/uZZQHM4b62qMCCkdfsnU
+KgeIJU78BxAj2vCgWI025K7un7Sh9q3cZdafOgcNz8YaXV9Nm0f6fLFsdTWbEvQ0
+Y1cHJlh6WKDV2lVtdgoEMSN73U3hohJhsldRengydb4/Cf8pZRJgatyXN+b7Hsg5
+h9LOAZRF4Om3A84QH7oYfOfeiwqGXzFE+lLqsPhwNUVnRJd98fjxYKdKz/3hNT5c
+Pq/0/C+ivpAI3Kk1tecafhb0YSoFUEhZlnl/SSuTALvFdJGjpopbTL0M3YCcgh9v
+tXb8Dcq7BEphWSeWP4Torbq17pLSlG65bgoZXoABYWCPSZiQCKDNXa2wqC3it5J9
+wURL9AOCsJCvqh798WLlNHaz9hnh76UF3idDI5SgJGEOAPStv3EGX/HhjOzUQPD+
+ixlXM63vmhCHxV9pnIURpBFhDUS/hs7apVm8pKzSv7PRQ5iu9RDbWUAWdyMlWPW9
+TglATGSMFpxGYTJiC+pHH24FCm6wR8D8LYnKkqxzd+nqFljvfEmQ70rIyUA1I3/6
+kCxGf7yKxTr2anV7tOFkNcCuj/ZSkb8CC6BCVk1HeE6h/hks78PdlLJr5zrSPxvP
+U1iRM6NebRd4W990XCPw6ZHDm0CngSNU7s+7peB0M+pEaYO5Ag0EXnYXoQEQANxF
+tmQz1jowITJ60eY/q7fWVv/w1CTT/ynAqPPgKw/MtGVBe8BWUJKufnxbNgn6ZamX
+PU/Uq4x8QKMgbuqvaInHM3MvIqg0xoQ8qz4VBnc0Q0w0+G78UMcjzzAKJBDp1Qfy
+zTvfPBD65fL+l2kFIyy9409uhzLnsvADE0saNmslfkVxyp8u+IYRVOjLpbKqJfrq
+VDFTe3sktGSjlyWGHFKCx+xDGiJaAr/Qj0W/XH382nnC8dOhs96frQxz+cnwr4Uw
+sH1jNfY5zrXcqjxekoNhgrYBflAkHyyiVp8HRepPWFxMnXtT2Z4bdtzIJVSOwko0
+j91MItL5KyHt5pOS3sJM5wCwno3Tg8zgzbD3AZJoWSbBSKip6e8CQ0uvFcoGcpya
+IYJ38k7+yUihGfGCcPbKxdyFsHHxdIb0oVZAr9D2f9EsCzUvga4pH3yeMVKv0KWG
+2n4zLOJiZ4mvchBJjzBwuy2UCJS6yH+7EmAlkxZGEVcXUN5X+LksmRfr8kSMwjWj
+BlJyOCyKU4Jw/AFFarJlQ+5VieI9ISotXMrIS2VvqDexnxJo1vRzMvaNxK8uwaR7
+eT9h/oI1vEEkrh6aqsIZlj7Owf2TI+ve4JGJ1G+keP/1Ko1kNA+X4Trg3FAy0PR7
+Eg2iBpjxGyEOVe2K/QGnDpMSO6ISot4UgRDK+29fABEBAAGJAjYEGAEKACAWIQSX
+OuSNcbdnNcRxK1u1wAJTDGogUwUCXnYXoQIbDAAKCRC1wAJTDGogU/aMEACrQCrW
+Skyx2waPZk9PBoG1z+CypabL+NwSoPzNdsQcPPB3FlByJSm48aqamXJUH7srCkr/
+aT9GoPktdjstDoloLJ1gwvRiI0ccmwFBrkUU9wwn8mm/x+drktOOniUQA0qT/jvO
+VNYgbfUVmfht6rTfVYlpGK1MxsTgEGvhFw/2PK6tibBnPW9d+3UFVWVELtq6r72H
+l/ndkMOV2tnfBaEpRl94KHn7By0rjDUVQIOxFr73G4rWzU3h3OLHPXDPLa7zM9xF
+Wn9f72L6UJ9MLbR43RCyrAfBFaF064BUwYpg//oaxAsbEl9FTmWV+IwywpufVRMu
++hujYyIsMdIUvEohyUXwSsDDLgCJspWkzCfPBaL0vBDQ3l8LshKoa/uFQ20tWhzH
+D63XjRIAG2q/9e3E/HBBjpRoudsNJKSjbH2YH30+Uzpgc11hh2sgYRIPKWSUN3rN
+/lOBF56YSoFCf35D41VVGmWPcm3Yz7hsSKNSEdH9FL2m8a2sIVOuzup00PlrQLiq
+IrVZBHXAWk4FgqSLQLnxAX3X3Ot1OiBnqaIJZ1Q+hmRCbtOXuq964okyWs6l8FPS
+Qg2ZEOEjc6q4uvdgV8duF8bX8t6mpwMxF0FvVRULzWKmki6P3fvpfel8Qj1my2mv
+veIpzfWOcpxWhH+qvchT3gLmu/Hp8TJ+CF4VsrkCDQRedhezARAAsTrVcc970S+0
+lGVTvPfUVHIPQYg7mXz1H7Hfb9wBzsDb0lbCzm6qtEIMGo5kzC/Z0Wc1+5HO0Zhb
+V2ecqTJMhCfadeK2FymCoS6hDOD2s9JVGoEIctLHWIo7WsjbDOZblN8pOmuBfz5G
+p6awxhBLSTzCwsKQzg08JRO0x7xbSVy52HhbRdgySp1HD+hPTFhmDNc2Ha5n+N6c
+VoNmFxY6MixJDsuk1Y46sM/rSmuvuGEahVjcl3BFqiNmS6h0c2U77vuOoLJ0fvB3
+C6aL94o/zK9I2EieL6jBs9cnyp67CmVKdCIb5T2Gxo3XC9e8WGpntlK6D0vAM1ln
+oMqnhBYeeKpgqxVcP7sBK3FnFCV9yhIo63OPA2GVAStPb5xRXFyGEf3HxVqUxoZ6
+pcKfxAGgXkd86+oUupS/l5bjCIxx5ME/3g92MnRMAAY2ycASaeT3WEeDP20h7jqA
+h+nf1N+jqZMMHpMmClrxKMcT0iSFgstQKSC0GZlrnLSBXPEkH0l30YnzxAwZy/YT
+c819NG3g2JkunDyD9EyKmvX3S9QHjuvE5O6Ou39nAhNdUEx+xSPSY4bkPzOHTvI1
+MO5JrRginUXjSLmGFN8WQeMHRR7P+VMUTgsBGZ7/t7lgIB24HNeFy1rpzfT/ZrDs
+WCxz1SSv13HYR71kpkHTauGo68vx/pEAEQEAAYkCNgQYAQoAIBYhBJc65I1xt2c1
+xHErW7XAAlMMaiBTBQJedhezAhsgAAoJELXAAlMMaiBTxnUQAM2TtUXzmWLG1tKD
+mkYeOCPoFTIwp9b8QKIPwWGtijoJEmjrvJcCd+EUnqP1iZBl2Qee5iCeiFUoNPx3
+M93zpDLwjHX7r9jLbWaRkyCTX0fsq/p9zDpUM5BbGyZEZwmZ3nW5YYRIlJNkQuyV
+bGpIfI+DGMLn5KFq2pVOwyYWLmJ74Lnv/vJYgkNxg70wvjiE7RYEoY0WrDP13QQJ
+aaXdmcHkteov76ElM09wOKPdCFP9AIlmUgRYKu0jb4upQosjpfR7sCf6QtCHCDOC
+zwzvLk3VgrBKkcLKwFEhYx0LYBmgPjQ5CYvnaXBXyQsn+xUwqQs3OhcTD7/fnEYu
+4zkdkNTUtaBNxbqbV6V5Ti0odFQXHHrJ/ugPRHIgBdqXLiVQI4pxKNJhtr6HMWb0
+zjde4Mho/IuOJLYEpHDVUj00RLUCsh1IkgdbRTEaHaeUzpFCf/zGnds6RIrEPBJm
+tubuWXFFVG3d2LkUYkDAWGLE/IQLkeZPpnKCiTNyNvou5E/6BDeZGfnZA8fYAyGR
+2h6aOZkt/4XL7Ot1bgbhNbEABwqSrsRXVFfJ85j+p+2D/iUi/wqyCBA0wDq9omog
+rtNwEHwgQ9/++N3bX0KZKY5S7LXaHWWkXRuNDV2Zx2Vb4PpGmOjlZxKvyLtKgwwz
+imtrGD9EhItdmZ8PBdC2kAx3vWEM
+=553W
+-----END PGP PUBLIC KEY BLOCK-----

grm/personal_projects.toml

@@ -0,0 +1,325 @@
+[[trees]]
+root = "~/projects"
+
+[[trees.repos]]
+name = "misc/rbackupd"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/rbackupd.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/cobbler-kickstart"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/cobbler-kickstart.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/postfix-grok-patterns"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/postfix-grok-patterns.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "upstream"
+url = "https://github.com/whyscream/postfix-grok-patterns.git"
+type = "https"
+
+[[trees.repos]]
+name = "misc/syncrepo"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/syncrepo.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/pkgbuilds"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/pkgbuilds.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/openvpn-helper"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/openvpn-helper.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/wifiqr"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/wifiqr.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/checkconn"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/checkconn.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "misc/xftwidth"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/xftwidth.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "upstream"
+url = "https://github.com/vixus0/xftwidth"
+type = "https"
+
+[[trees.repos]]
+name = "git-repo-manager"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/git-repo-manager.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/git-repo-manager.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "talks"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/talks.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "container/openresty-oidc"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/openresty-oidc.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "container/acimaker"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/acimaker.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "container/drone-kaniko"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/drone-kaniko.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "upstream"
+url = "https://github.com/banzaicloud/drone-kaniko"
+type = "https"
+
+[[trees.repos]]
+name = "container/roundcube"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/roundcube.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "container/mycloud-homer"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/mycloud-homer.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "projects/misc/cobbler-kickstart"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/cobbler-kickstart.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "finance-auto-import"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/finance-auto-import.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "guitar_practice"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/hakoerber/guitar-practice.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "picture-cleaner"
+remotes = []
+
+[[trees.repos]]
+name = "mycloud"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/mycloud.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "resume"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/resume.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "lea-michael-hochzeit"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/lea-michi-hochzeit.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "builddoc"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/builddoc.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "blog"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/blog.hkoerber.de.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/blog.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "fizzbuzz"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/fizzbuzz.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "ggj/2018-the-lost-son"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/niklas-heer/the-lost-son.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "ggj/2019-claim-your-world"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@github.com/theintroverts/claim-your-world.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "prometheus-restic-backblaze"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/prometheus-restic-backblaze.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/container/prometheus-restic-backblaze.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "dotfiles"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/dotfiles.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/dotfiles.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "packager"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/packager.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/packager.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "time-tracking"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/time-tracking.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/time-tracking.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "aws-glacier-backup"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "ssh://git@github.com/hakoerber/aws-glacier-backup.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/aws-glacier-backup.git"
+type = "ssh"
+
+[[trees.repos]]
+name = "unclutter-xfixes"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "git@github.com:hakoerber/unclutter-xfixes.git"
+type = "ssh"
+
+[[trees.repos.remotes]]
+name = "upstream"
+url = "https://github.com/Airblader/unclutter-xfixes"
+type = "https"

gtk/gtk-3.0-bigger-font.ini.j2

@@ -0,0 +1,15 @@
+[Settings]
+gtk-theme-name=Breeze
+gtk-icon-theme-name=breeze
+gtk-font-name=DejaVu Sans {{ ((machine.font_size|int - 2)|float * 2.0) | round(0, 'floor') | int }}
+gtk-cursor-theme-name=breeze_cursors
+gtk-cursor-theme-size=0
+gtk-toolbar-style=GTK_TOOLBAR_BOTH
+gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
+gtk-button-images=1
+gtk-menu-images=1
+gtk-enable-event-sounds=1
+gtk-enable-input-feedback-sounds=1
+gtk-xft-antialias=1
+gtk-xft-hinting=1
+gtk-xft-hintstyle=hintfull

gtk/gtk-3.0.ini.j2

@@ -1,7 +1,7 @@
 [Settings]
 gtk-theme-name=Breeze
-gtk-icon-theme-name=breeze-dark
+gtk-icon-theme-name=breeze
-gtk-font-name=Cantarell 11
+gtk-font-name=DejaVu Sans {{ machine.font_size|int - 2 }}
 gtk-cursor-theme-name=breeze_cursors
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH

gtk/gtkrc-2.0.j2

@@ -1,10 +1,9 @@
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-include "/home/hannes/.gtkrc-2.0.mine"
 gtk-theme-name="Breeze"
-gtk-icon-theme-name="breeze-dark"
+gtk-icon-theme-name="breeze"
-gtk-font-name="Cantarell 11"
+gtk-font-name="DejaVu Sans {{ machine.font_size| int - 2 }}"
 gtk-cursor-theme-name="breeze_cursors"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH

i3/config.j2

@@ -17,8 +17,8 @@
     set $mod Mod4
 
     # The default terminal
-    set $terminal "{{ machine.terminal_binary }} --title terminal"
+    set $terminal "alacritty --config-file ~/.config/alacritty.yml"
-    set $calc "{{ machine.terminal_binary }} --title calc -e $SHELL -i -c calc"
+    set $calc "alacritty --config-file ~/.config/alacritty.yml -e $SHELL -i -c calc"
 
     set $scriptdir ~/.i3/scripts
 
@@ -77,8 +77,8 @@
     set $focus_parent q
     set $focus_child  a
 
-    set $floating_toggle   Shift+space
+    set $floating_toggle   Shift+p
-    set $focus_mode_toggle space
+    set $focus_mode_toggle p
 
     set $prev_on_output u
     set $next_on_output i
@@ -93,6 +93,8 @@
 
     set $kill Shift+Q
 
+    set $screenshot o
+
 
 ################################################################################
 ### WORKSPACE ASSIGNMENTS ######################################################
@@ -118,8 +120,8 @@ assign [class="^Spotify$"] $workspace9
 
 assign [class="^Google-chrome$"] $workspace7
 assign [class="^Chromium$"] $workspace7
-assign [class="^discord"] $workspace7
 assign [class="^Steam"] $workspace5
+for_window [class="^Steam$"] move to workspace $workspace5
 
 assign [class="^dota2$"] $workspace10
 assign [class="^Wine$"] $workspace10
@@ -212,26 +214,19 @@ assign [class="^Wine$"] $workspace10
     bindsym F2 exec --no-startup-id ~/.i3/scripts/screenmenu
 
     bindsym $mod+F1 exec --no-startup-id ~/.i3/scripts/i3exit lock
-    bindsym $mod+F2 exec --no-startup-id screencfg ~/.screencfg/all.yml ; exec systemctl --user restart keyboard.service
+    bindsym $mod+F2 exec --no-startup-id screencfg ~/.screencfg/{{ ansible_hostname }}/default.yml ; exec systemctl --user restart keyboard.service
-    bindsym $mod+F3 exec --no-startup-id screencfg ~/.screencfg/laptop.yml ; exec systemctl --user restart keyboard.service
+    {% for screencfg in machine.screencfgs -%}
+    bindsym $mod+{{ screencfg.key }} exec --no-startup-id screencfg ~/.screencfg/{{ ansible_hostname }}/{{ screencfg.name }}.yml ; exec systemctl --user restart keyboard.service
+    {% endfor -%}
     bindsym $mod+F4 exec --no-startup-id ~/.i3/scripts/i3exit suspend
     bindsym $mod+Home exec --no-startup-id ~/.i3/scripts/shutdown-menu
 
+    bindsym $mod+$screenshot exec --no-startup-id sh -c 'maim | xclip -selection clipboard -t image/png'
+    bindsym $mod+Shift+$screenshot exec --no-startup-id sh -c 'maim --select | xclip -selection clipboard -t image/png'
+
     bindsym $mod+Shift+v exec --no-startup-id redshift-toggle
 
-    bindsym $mod+Shift+$scratchpad move scratchpad
+    bindsym $mod+$pim_toggle exec --no-startup-id ~/.i3/scripts/swap-from-workspace.sh $workspace10
-    bindsym $mod+$scratchpad scratchpad show
-
-    bindsym $mod+$pim_toggle \
-        unmark _destination; \
-        mark _source; \
-        workspace $workspace10; \
-        mark --add _destination; \
-        [con_mark="^_destination$"] swap container with mark "_source"; \
-        [con_mark="^_source$"] focus; \
-        unmark _source; \
-        [con_mark="^_destination$"] focus; \
-        unmark _destination;
 
 ################################################################################
 ### MODES ######################################################################
@@ -304,10 +299,10 @@ assign [class="^Wine$"] $workspace10
 ################################################################################
 
 # class                 border  backgr. text    indicator
-client.focused          #E16B40 #E16B40 #000000 #FF0000
+client.focused          #e5b567 #e5b567 #000000 #FF0000
-client.focused_inactive #333333 #5f676a #ffffff #484e50
+client.focused_inactive #272822 #5f676a #ffffff #484e50
-client.unfocused        #333333 #202020 #cccccc #292d2e
+client.unfocused        #1C1C1C #272822 #cccccc #292d2e
-client.urgent           #2f343a #900000 #ffffff #900000
+client.urgent           #272822 #ff7777 #000000 #900000
 
 ################################################################################
 ### APPLICATION SPECIFIC SETTINGS ##############################################
@@ -336,10 +331,8 @@ bindsym XF86AudioPrev exec $scriptdir/spotify-control previous
 bindsym XF86MonBrightnessUp   exec --no-startup-id xbacklight -inc 8 ; exec --no-startup-id $scriptdir/update-status
 bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 8 ; exec --no-startup-id $scriptdir/update-status
 
-bindsym $mod+o exec --no-startup-id xautorandr ; exec --no-startup-id kill -SIGUSR2 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)'"
-bindsym $mod+p exec --no-startup-id kill -SIGUSR1 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)
-
 bindsym $mod+m exec --no-startup-id $scriptdir/pa-volume mute-toggle-mic
+bindsym $mod+space exec --no-startup-id $scriptdir/pa-volume mute-toggle-mic
 
 ##############################################################################
 ### BARS #######################################################################
@@ -365,19 +358,19 @@ bar {
     font pango:Inconsolata, FontAwesome {{ machine.font_size }}
 
     colors {
-        background #272822
+        background #000000
         statusline #ffffff
-        separator #444444
+        separator #555555
-        # separator #e16b40
 
-        # focused_background #303030
+        focused_separator #e5b567
-        # focused_separator #272822
+        focused_background #272822
 
-        focused_workspace  #e16b40 #272822 #ffffff
+        #                  border  bg      text
-        active_workspace   #272822 #5f676a #ffffff
+        focused_workspace  #e5b567 #4f676a #ffffff
+        active_workspace   #272822 #4f676a #ffffff
         inactive_workspace #272822 #272822 #dddddd
-        urgent_workspace   #D00000 #D00000 #272822
+        urgent_workspace   #272822 #ff7777 #272822
-        binding_mode       #272822 #e16b40 #272822
+        binding_mode       #272822 #e5b567 #272822
     }
 
     i3bar_command i3bar

i3/i3status.conf.j2

@@ -19,10 +19,12 @@ general {
 }
 
 
+order += spotify
+{% if user.has_yubikey %}
 order += "yubikey"
+{% endif %}
 order += "volume_status output"
 order += "volume_status input"
-order += spotify
 order += "wifi"
 order += "external_script presentation_mode"
 order += "systemd redshift"
@@ -33,7 +35,7 @@ order += "clock"
 
 battery_level all {
     battery_id = "all"
-    format = " {icon}  {percent}% {time_remaining} "
+    format = " {icon}  {percent}% "
     measurement_mode = "sys"
     charging_character = ""
     blocks = ""
@@ -57,7 +59,6 @@ systemd spotify {
     unit = "spotify.service"
     user = true
     format = "  "
-    on_click 1 = "exec $HOME/.i3/scripts/toggle-app spotify"
     color_bad = '#F4Bf75'
     color_degraded = '#F4Bf75'
 }
@@ -109,7 +110,6 @@ volume_status output {
     thresholds = []
     command = "pactl"
     color_muted = '#FFFFFF'
-    on_click 1 = "exec $HOME/.i3/scripts/pa-volume mute-toggle"
 }
 
 volume_status input {
@@ -120,5 +120,4 @@ volume_status input {
     command = "pactl"
     color_muted = '#FFFFFF'
     is_input = True
-    on_click 1 = "exec $HOME/.i3/scripts/pa-volume mute-toggle-mic"
 }

i3/scripts/appmenu

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-rofi -show combi -combi-modi run,drun -display-combi "run"
+rofi -show combi -combi-modi run -display-combi "run"

i3/scripts/i3exit

@@ -52,10 +52,11 @@ reset_screen() {
 lock_and_screen_off() {
     lock &
     _pid=$!
-    dunstctl disable
+    dunst_paused=$(dunstctl is-paused)
+    [[ "${dunst_paused}" != "true" ]] && dunstctl set-paused true
     screen_off
     wait $_pid
-    dunstctl enable
+    [[ "${dunst_paused}" != "true" ]] && dunstctl set-paused false
     reset_screen
 }
 

i3/scripts/presentation-mode

@@ -9,7 +9,7 @@ is_on() {
 
 switch_on() {
     touch "${_status_file}"
-    dunstctl disable &
+    dunstctl set-paused true &
     systemctl --user --no-block stop redshift.service
     systemctl --user --no-block stop spotify.service
     ~/.i3/scripts/bar-update "external_script presentation_mode"
@@ -19,7 +19,7 @@ switch_on() {
 
 switch_off() {
     rm -f "${_status_file}"
-    dunstctl enable &
+    dunstctl set-paused false &
     systemctl --user --no-block start redshift.service
     systemctl --user --no-block start spotify.service
     ~/.i3/scripts/bar-update "external_script presentation_mode"

i3/scripts/swap-from-workspace.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+cmds=()
+
+workspacescratch="${1}"
+
+i3msgworkspaces="$(i3-msg -t get_workspaces)"
+
+output_of_pim=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.name == "'"${workspacescratch}"'")) | .[0].output')
+
+active_workspace_on_target_output=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.output == "'"${output_of_pim}"'" and .visible)) | .[0].name')
+
+focused_workspace_name=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.focused)) | .[0].name')
+focused_workspace_output=$(printf '%s' "${i3msgworkspaces}" | jq -r 'map(select(.focused)) | .[0].output')
+
+if [[ "${focused_workspace_name}" == "${workspacescratch}" ]]; then
+    exit 0
+fi
+
+cmds+=('unmark _destination')
+cmds+=('mark _source')
+
+if [[ "${active_workspace_on_target_output}" != "${workspacescratch}" ]] && [[ "${output_of_pim}" != "${focused_workspace_output}" ]]; then
+    need_output_reset=1
+else
+    need_output_reset=0
+fi
+
+if ((need_output_reset)); then
+    cmds+=('workspace "'"${active_workspace_on_target_output}"'"')
+    cmds+=("mark --add _origin")
+fi
+
+cmds+=('workspace "'"${workspacescratch}"'"')
+cmds+=('mark --add _destination')
+
+cmds+=('[con_mark="^_destination$"] swap container with mark "_source"')
+
+cmds+=('[con_mark="^_source$"] focus')
+cmds+=('unmark _source')
+
+if ((need_output_reset)); then
+    cmds+=('[con_mark="^_origin$"] focus')
+    cmds+=('unmark _origin')
+fi
+
+cmds+=('[con_mark="^_destination$"] focus')
+cmds+=('unmark _destination')
+
+i3msgcmd=""
+for cmd in "${cmds[@]}"; do
+    i3msgcmd="${i3msgcmd}${cmd};"
+done
+i3-msg "${i3msgcmd}"

install.sh

@@ -11,6 +11,8 @@ set -o nounset
 DOTDIR="/var/lib/dotfiles"
 _SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+[[ -e './.git' ]] && git submodule update --init
+
 if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] && [[ "${_SCRIPT_DIR}" != "${DOTDIR}" ]] ; then
     if [[ -e "${DOTDIR}" ]] ; then
         2>&1 printf "${DOTDIR} already exists. This seems unsafe.\n"
@@ -45,11 +47,14 @@ sudowrap() {
     fi
 }
 
+cache_updated=0
 _install() {
     _package="$1" ; shift
-    if [[ $NAME == "Fedora" ]] ; then
+    if [[ $NAME == "Ubuntu" ]] ; then
-        sudowrap dnf install --assumeyes "${_package}"
+        if ! (( cache_updated )) ; then
-    elif [[ $NAME == "Ubuntu" ]] ; then
+            sudowrap apt-get update
+            cache_updated=1
+        fi
         sudowrap apt-get install --assume-yes "${_package}"
     elif [[ $NAME == "Arch Linux" ]] ; then
         sudowrap pacman -S --noconfirm "${_package}"
@@ -72,21 +77,13 @@ if ! command -v make >/dev/null ; then
     printf 'Done\n'
 fi
 
-# Required for compiling modules in venv.
+if [[ $NAME == "Arch Linux" ]] ; then
-if ! command -v gcc >/dev/null ; then
+    _install "ansible"
-    printf 'gcc not installed, installing ...\n'
-    _install "gcc"
-    printf 'Done\n'
 fi
 
-if ! python3 -c 'import venv' 2>/dev/null ; then
+if [[ $NAME == "Ubuntu" ]] ; then
-    printf 'Python3 venv module not installed, installing ...\n'
+    _install "ansible"
-    _install python3-venv
+    _install "python3-jmespath"
-    printf 'Done\n'
 fi
 
 cd "$DOTDIR" && make
-
-# fix permissions of the directory
-sudowrap chgrp -R dotfiles "${DOTDIR}"
-sudowrap chmod g+wX "${DOTDIR}"

packages.yml

@@ -1,55 +1,32 @@
 packages:
   list:
     build-essentials:
-      fedora:
-        - autoconf
-        - automake
-        - gcc-c++
-        - gcc
-        - ctags
-        - cmake
-        - libtool
-        - elfutils-libelf-devel
-        - maven
       ubuntu:
         - build-essential
         - exuberant-ctags
+        - cmake
       archlinux:
         - gcc
         - ctags
         - cmake
         - maven
         - base-devel
-    golang:
-      fedora: ["golang", "glibc-static"]
-      ubuntu: ["golang-go"]
-      archlinux: ["go"]
     make:
-      fedora: ["make"]
       ubuntu: ["make"]
       archlinux: ["make"]
     gdb:
-      fedora: ["gdb"]
       ubuntu: ["gdb"]
       archlinux: ["gdb"]
     strace:
-      fedora: ["strace"]
       ubuntu: ["strace"]
       archlinux: ["strace"]
     sudo:
-      fedora: ["sudo"]
       ubuntu: ["sudo"]
       archlinux: ["sudo"]
     apt:
-      fedora: []
       ubuntu: ["apt-file"]
-      archlinux: []
+      archlinux: [""]
     xorg:
-      fedora:
-        - '@base-x'
-        - xorg-x11-drv-synaptics-legacy
-        - xorg-x11-drv-libinput
-        - libinput
       ubuntu: []
       archlinux:
         - xorg-server
@@ -61,449 +38,381 @@ packages:
         - xorg-xset
         - xorg-xinit
     dmenu:
-      fedora: ["dmenu"]
       ubuntu: ["dmenu"]
       archlinux: ["dmenu"]
     ansible:
-      fedora: ["ansible"]
       ubuntu: ["ansible"]
       archlinux: ["ansible"]
     xdotool:
-      fedora: ["xdotool"]
       ubuntu: ["xdotool"]
       archlinux: ["xdotool"]
     arandr:
-      fedora: ["arandr"]
       ubuntu: ["arandr"]
       archlinux: ["arandr"]
     borgbackup:
-      fedora: ["borgbackup"]
       ubuntu: ["borgbackup"]
       archlinux: ["borgbackup"]
     docker:
-      fedora: ["docker"]
+      ubuntu: ["docker.io", "containerd", "docker-compose"]
-      ubuntu: ["docker.io"]
       archlinux: ["docker", "docker-compose"]
     font-awesome:
-      fedora: ["fontawesome-fonts", "fontawesome-fonts-web"]
       ubuntu: ["fonts-font-awesome"]
       archlinux: ["ttf-font-awesome"]
     font-inconsolata:
-      fedora: ["levien-inconsolata-fonts"]
       ubuntu: ["fonts-inconsolata"]
       archlinux: ["ttf-inconsolata"]
     font-dejavu:
-      fedora: []
+      ubuntu: ["fonts-dejavu"]
-      ubuntu: []
       archlinux: ["ttf-dejavu"]
     font-libertine:
-      fedora: []
+      ubuntu: ["fonts-linuxlibertine"]
-      ubuntu: []
       archlinux: ["ttf-linux-libertine"]
     font-emoji:
-      fedora: []
       ubuntu: []
       archlinux: ["noto-fonts-emoji"]
     git:
-      fedora: ["git", "gitk"]
       ubuntu: ["git", "git-extras", "gitk", "git-email"]
       # tk required for gitk
       archlinux: ["git", "tk"]
     htop:
-      fedora: ["htop"]
       ubuntu: ["htop"]
       archlinux: ["htop"]
     feh:
-      fedora: ["feh"]
       ubuntu: ["feh"]
       archlinux: ["feh"]
     i3:
-      fedora: ["i3"]
       ubuntu: ["i3"]
       archlinux: ["i3-wm"]
     i3lock:
-      fedora: ["i3lock"]
       ubuntu: ["i3lock"]
       archlinux: ["i3lock"]
     pluma:
-      fedora: ["pluma"]
       ubuntu: ["pluma"]
       archlinux: ["pluma"]
-    vim:
-      fedora: ["vim-enhanced"]
-      ubuntu: ["vim"]
-      archlinux: ["gvim"]
     neovim:
-      fedora: ["neovim", "python3-neovim"]
       ubuntu: ["neovim"]
       archlinux: ["neovim", "python-pynvim"]
     network-manager-applet:
-      fedora: ["network-manager-applet"]
       ubuntu: []
       archlinux: ["network-manager-applet"]
     pasystray:
-      fedora: ["pasystray"]
       ubuntu: ["pasystray"]
       archlinux: ["pasystray"]
     redshift:
-      fedora: ["redshift-gtk"]
       ubuntu: ["redshift-gtk"]
       archlinux: ["redshift"]
     pavucontrol:
-      fedora: ["pavucontrol"]
       ubuntu: ["pavucontrol"]
       archlinux: ["pavucontrol-qt"]
     pinentry-qt:
-      fedora: ["pinentry", "pinentry-curses", "pinentry-qt"]
       ubuntu: ["pinentry-curses", "pinentry-qt"]
       archlinux: ["pinentry"]
     pinta:
-      fedora: ["pinta"]
       ubuntu: ["pinta"]
       archlinux: ["pinta"]
     py3status:
-      fedora: ["py3status", "python3-pytz", "python3-tzlocal"]
+      ubuntu: ["py3status", "python3-arrow", "python3-tzlocal", "python3-pydbus"]
-      ubuntu: ["py3status", "python3-arrow", "python3-tzlocal"]
       archlinux: ["py3status", "python-pytz", "python-tzlocal", "python-dbus", "python-pydbus"]
     pass:
-      fedora: ["pass"]
       ubuntu: ["pass"]
       archlinux: ["pass", "passff-host"]
     keepassx:
-      fedora: ["keepassx"]
       ubuntu: ["keepassx"]
       archlinux: []
     urxvt:
-      fedora: ["rxvt-unicode-256color"]
       ubuntu: ["rxvt-unicode-256color"]
       archlinux: ["rxvt-unicode"]
     alacritty:
-      fedora: []
       ubuntu: []
       archlinux: ["alacritty"]
     tmux:
-      fedora: ["tmux"]
       ubuntu: ["tmux"]
       archlinux: ["tmux"]
     screen:
-      fedora: ["screen"]
       ubuntu: ["screen"]
       archlinux: ["screen"]
     zsh:
-      fedora: ["zsh", "zsh-syntax-highlighting"]
       ubuntu: ["zsh", "zsh-syntax-highlighting"]
       archlinux: ["zsh", "zsh-syntax-highlighting", "zsh-autosuggestions", "zsh-completions"]
     zathura:
-      fedora: ["zathura-pdf-mupdf"]
       ubuntu: ["zathura", "zathura-pdf-poppler"]
       archlinux: ["zathura", "zathura-pdf-poppler"]
+    pdf:
+      ubuntu: ["ghostscript", "enscript"]
+      archlinux: ["ghostscript", "enscript"]
     pandoc:
-      fedora: ["pandoc"]
+      ubuntu:
-      ubuntu: ["pandoc"]
+        - pandoc
+        - texlive
+        - python3-sphinxcontrib.svg2pdfconverter # for html to pdf conversions
+        - texlive-latex-extra
       archlinux: ["pandoc", "texlive-core", "texlive-fontsextra", "texlive-latexextra"]
     libvirt:
-      fedora: ["virt-manager", "libvirt-client"]
+      ubuntu: ["virt-manager", "libvirt-daemon"]
-      ubuntu: ["virt-manager", "libvirt-bin"]
+      archlinux: ["virt-manager", "libvirt", "dnsmasq", "ebtables", "dmidecode"]
-      archlinux: ["virt-manager", "libvirt"]
     firefox:
-      fedora: ["firefox"]
       ubuntu: ["firefox"]
       archlinux: ["firefox"]
     ranger:
-      fedora: ["ranger"]
       ubuntu: ["ranger"]
       archlinux: ["ranger"]
     thunar:
-      fedora: ["thunar"]
       ubuntu: ["thunar"]
       archlinux: ["thunar"]
     unclutter:
-      fedora: ["unclutter"]
       ubuntu: ["unclutter"]
       archlinux: ["unclutter"]
-    chromium:
-      fedora: ["chromium"]
-      ubuntu: ["chromium-browser"]
-      archlinux: ["chromium"]
     libreoffice:
-      fedora: ["libreoffice", "libreoffice-langpack-de", "libreoffice-langpack-en"]
       ubuntu: ["libreoffice"]
       archlinux: ["libreoffice-fresh", "libreoffice-fresh-de"]
     qt-theming:
-      fedora: ["breeze-cursor-theme", "breeze-icon-theme"]
+      ubuntu: ["breeze-cursor-theme", "breeze-icon-theme", "breeze", "qt5ct"]
-      ubuntu: ["breeze-cursor-theme", "breeze-icon-theme", "breeze"]
       archlinux: ["breeze", "breeze-icons", "breeze-grub", "qt5ct"]
     gtk-theming:
-      fedora: ["breeze-gtk"]
+      ubuntu: ["gtk3-engines-breeze", "lxappearance"]
-      ubuntu: ["gtk3-engines-breeze"]
       archlinux: ["breeze-gtk", "lxappearance"]
     xcompmgr:
-      fedora: ["xcompmgr"]
       ubuntu: ["xcompmgr"]
       archlinux: ["xcompmgr"]
     python:
-      fedora: ["python", "python3-devel"]
       ubuntu: ["python3", "python3-pip", "python3-venv", "virtualenv", "pylint3"]
       archlinux: ["python3"]
+    python-modules:
+      ubuntu: []
+      archlinux:
+        - python-ruamel-yaml
+        - python-gitpython
+        - python-semver
+    black:
+      ubuntu: ["black"]
+      archlinux: ["python-black"]
     xbacklight:
-      fedora: ["xbacklight"]
       ubuntu: ["xbacklight"]
       archlinux: ["xorg-xbacklight"]
     wireshark:
-      fedora: ["wireshark"]
       ubuntu: ["wireshark", "wireshark-qt"]
       archlinux: ["wireshark-cli", "wireshark-qt"]
     dia:
-      fedora: ["dia"]
       ubuntu: ["dia"]
       archlinux: ["dia"]
-    shutter:
-      fedora: ["shutter"]
-      ubuntu: ["shutter"]
-      archlinux: []
     nmap:
-      fedora: ["nmap"]
       ubuntu: ["nmap"]
       archlinux: ["nmap"]
     openvpn:
-      fedora: ["openvpn"]
       ubuntu: ["openvpn"]
       archlinux: ["openvpn"]
     curl:
-      fedora: ["curl"]
       ubuntu: ["curl"]
       archlinux: ["curl"]
     wget:
-      fedora: ["wget"]
       ubuntu: ["wget"]
       archlinux: ["wget"]
     tree:
-      fedora: ["tree"]
       ubuntu: ["tree"]
       archlinux: ["tree"]
     which:
-      fedora: ["which"]
       ubuntu: []
       archlinux: ["which"]
     zip:
-      fedora: ["zip"]
       ubuntu: ["zip", "unzip"]
       archlinux: ["zip", "unzip"]
     traceroute:
-      fedora: ["traceroute"]
       ubuntu: ["traceroute"]
       archlinux: ["traceroute"]
     tcpdump:
-      fedora: ["tcpdump"]
       ubuntu: ["tcpdump"]
       archlinux: ["tcpdump"]
     tar:
-      fedora: ["tar"]
       ubuntu: ["tar"]
       archlinux: ["tar"]
     rsync:
-      fedora: ["rsync"]
       ubuntu: ["rsync"]
       archlinux: ["rsync"]
     net-tools:
-      fedora: ["net-tools"]
       ubuntu: ["net-tools"]
       archlinux: ["net-tools"]
     ntfs:
-      fedora: ["ntfs-3g", "ntfsprogs"]
       ubuntu: ["ntfs-3g"]
       archlinux: ["ntfs-3g"]
     lsof:
-      fedora: ["lsof"]
       ubuntu: ["lsof"]
       archlinux: ["lsof"]
     iptables:
-      fedora: ["iptables"]
       ubuntu: ["iptables"]
-      archlinux: ["iptables"]
+      archlinux: ["iptables-nft"]
     pwgen:
-      fedora: ["pwgen"]
       ubuntu: ["pwgen"]
       archlinux: ["pwgen"]
     gpg:
-      fedora: ["gnupg2", "paperkey", "yubikey-manager"]
+      ubuntu: ["gnupg2", "pcscd", "scdaemon"]
-      ubuntu: ["gnupg2"]
       archlinux: ["gnupg", "paperkey", "yubikey-manager", "yubikey-touch-detector"]
     networkmanager:
-      fedora: ["NetworkManager", "NetworkManager-wifi"]
+      ubuntu: ["network-manager", "network-manager-openvpn", "network-manager-openconnect", "network-manager-openconnect-gnome"]
-      ubuntu: ["network-manager", "network-manager-openvpn", "network-manager-openconnect"]
       archlinux: ["networkmanager"]
     pulseaudio:
-      fedora: ["pulseaudio", "pulseaudio-utils"]
       ubuntu: ["pulseaudio", "pulseaudio-utils"]
-      archlinux: ["pulseaudio", "pulseaudio-alsa"]
+      archlinux: ["pulseaudio", "pulseaudio-alsa", "lib32-libpulse"]
     iw:
-      fedora: ["iw"]
       ubuntu: ["iw"]
       archlinux: ["iw"]
     cowsay:
-      fedora: ["cowsay"]
       ubuntu: ["cowsay"]
       archlinux: ["cowsay"]
     ruby:
-      fedora: ["ruby", "ruby-devel", "rubygem-bundler"]
       ubuntu: ["ruby", "ruby-dev", "ruby-bundler"]
       archlinux: ["ruby"]
     lxc:
-      fedora: ["lxc"]
       ubuntu: ["lxc"]
       archlinux: ["lxc"]
     acpi:
-      fedora: ["acpi"]
       ubuntu: ["acpid"]
       archlinux: ["acpi", "acpid"]
     npm:
-      fedora: ["npm"]
       ubuntu: ["npm"]
       archlinux: ["npm"]
     xdg:
-      fedora: ["xdg-utils"]
       ubuntu: ["xdg-utils"]
       archlinux: ["xdg-utils"]
-    docs:
-      fedora: ["man-pages"]
-      ubuntu: ["manpages"]
-      archlinux: ["man-pages"]
     compton:
-      fedora: ["compton"]
       ubuntu: ["compton"]
       archlinux: []
     dunst:
-      fedora: ["dunst"]
       ubuntu: ["dunst"]
       archlinux: ["dunst"]
     cloc:
-      fedora: ["cloc"]
       ubuntu: ["cloc"]
       archlinux: ["cloc"]
     bluetooth:
-      fedora: []
       ubuntu: ["blueman"]
       archlinux: ["bluez", "bluez-tools", "blueman"]
     autorandr:
-      fedora: []
       ubuntu: ["autorandr"]
       archlinux: ["autorandr"]
     bwm-ng:
-      fedora: []
       ubuntu: ["bwm-ng"]
       archlinux: ["bwm-ng"]
     virtualbox:
-      fedora: []
       ubuntu: ["virtualbox"]
-      archlinux: []
+      archlinux: ["virtualbox"]
     ssh:
-      fedora: []
+      ubuntu: ["ssh"]
-      ubuntu: []
       archlinux: ["openssh"]
     sshfs:
-      fedora: []
       ubuntu: ["sshfs"]
       archlinux: ["sshfs"]
     expect:
-      fedora: []
       ubuntu: ["expect"]
       archlinux: ["expect"]
     inotify:
-      fedora: []
       ubuntu: ["inotify-tools"]
       archlinux: ["inotify-tools"]
     rclone:
-      fedora: ["rclone"]
       ubuntu: ["rclone"]
       archlinux: ["rclone"]
     dnf:
-      fedora: ["python3-dnf"]
       ubuntu: []
       archlinux: []
-    rust:
+    rustup:
-      fedora: []
+      ubuntu: []
-      ubuntu: ["rustc", "cargo"]
+      archlinux: ["rustup"]
-      archlinux: ["rust"]
     musescore:
-      fedora: []
+      ubuntu: ["musescore3"]
-      ubuntu: ["musescore"]
       archlinux: ["musescore"]
     sipcalc:
-      fedora: []
       ubuntu: ["sipcalc"]
       archlinux: ["sipcalc"]
     rofi:
-      fedora: []
       ubuntu: ["rofi"]
       archlinux: ["rofi"]
-    anki:
-      fedora: ["anki"]
-      ubuntu: ["anki"]
-      archlinux: ["anki"]
     imv:
-      fedora: []
+      ubuntu: ["imv"]
-      ubuntu: []
       archlinux: ["imv"]
     pacman:
-      fedora: []
       ubuntu: []
       archlinux: ["pacman", "pacman-contrib"]
     steam:
-      fedora: []
       ubuntu: []
       archlinux: ["steam"]
     man:
-      fedora: []
+      ubuntu: ["man-db", "manpages"]
-      ubuntu: []
       archlinux: ["man-db", "man-pages"]
-    discord:
-      fedora: []
-      ubuntu: []
-      archlinux: ["discord"]
     nextcloud:
-      fedora: []
+      ubuntu: ["nextcloud-desktop"]
-      ubuntu: []
       archlinux: ["nextcloud-client"]
     kwallet:
-      fedora: []
       ubuntu: []
       archlinux: ["kwallet", "kwalletmanager"]
-    wallpapers:
-      fedora: []
-      ubuntu: []
-      archlinux: ["elementary-wallpapers", "deepin-community-wallpapers"]
-    wallutils:
-      fedora: []
-      ubuntu: []
-      archlinux: ["wallutils"]
     pv:
-      fedora: ["pv"]
       ubuntu: ["pv"]
       archlinux: ["pv"]
     stress:
-      fedora: []
+      ubuntu: ["stress"]
-      ubuntu: []
       archlinux: ["stress"]
     mpris:
-      fedora: []
+      ubuntu: ["playerctl"]
-      ubuntu: []
       archlinux: ["playerctl"]
     imagemagick:
-      fedora: []
+      ubuntu: ["imagemagick"]
-      ubuntu: []
       archlinux: ["imagemagick"]
     mpv:
-      fedora: []
+      ubuntu: ["mpv"]
-      ubuntu: []
       archlinux: ["mpv"]
     gnome-keyring:
-      fedora: []
+      ubuntu: ["gnome-keyring"]
-      ubuntu: []
       archlinux: ["gnome-keyring"]
+    element:
+      ubuntu: []
+      archlinux: ["element-desktop"]
+    maim:
+      ubuntu: ["maim"]
+      archlinux: ["maim"]
+    mkinitcpio:
+      ubuntu: []
+      archlinux: ["mkinitcpio"]
+    terraform:
+      ubuntu: []
+      archlinux: ["terraform"]
+    synclient:
+      ubuntu: ["xserver-xorg-input-synaptics"]
+      archlinux: ["xf86-input-synaptics"]
+    ncdu:
+      ubuntu: ["ncdu"]
+      archlinux: ["ncdu"]
+    font-utils:
+      ubuntu: ["woff-tools", "woff2"]
+      archlinux: ["woff2"]
+    jq:
+      ubuntu: ["jq"]
+      archlinux: ["jq"]
+    musl:
+      ubuntu: ["musl", "musl-tools"]
+      archlinux: ["musl"]
+    kdeconnect:
+      ubuntu: ["kdeconnect"]
+      archlinux: ["kdeconnect"]
 
   remove:
     mousepad:
-      fedora: ["mousepad"]
       ubuntu: ["mousepad"]
       archlinux: ["mousepad"]
+    chrome:
+      ubuntu: ["google-chrome-stable"]
+      archlinux: []
+    snap:
+      ubuntu: ["snapd"]
+      archlinux: []
+    golang:
+      ubuntu: ["golang-go"]
+      archlinux: ["go"]
+    signal:
+      ubuntu: []
+      archlinux: ["signal-desktop"]
+    vim:
+      ubuntu: ["vim"]
+      archlinux: ["gvim"]
+    discord:
+      ubuntu: []
+      archlinux: ["discord"]
+    rust:
+      ubuntu: ["rustc", "cargo"]
+      archlinux: ["rust"]

playbook.yml

@@ -10,58 +10,57 @@
       tags:
         - always
 
+    - name: read variables
+      include_vars:
+        file: variables.yml
+      tags:
+        - always
+
     - set_fact:
         distro: "{{ ansible_distribution|lower }}"
       tags:
         - always
 
-    - name: Check for valid distro
+    - name: check for valid distro
       assert:
-        that: distro in ('fedora', 'ubuntu', 'archlinux')
+        that: distro in ('ubuntu', 'archlinux')
 
     - block:
       - block:
-        - name: Update apt cache
+        - name: update apt cache
           apt:
             update_cache: true
           become: true
           changed_when: false
 
-        - name: Upgrade system
+        - name: upgrade system
           apt:
             upgrade: dist
           become: true
 
-        - name: Remove unused packages
+        - name: remove unused packages
           apt:
             autoremove: true
           become: true
 
-        - name: Clean apt cache
+        - name: clean apt cache
           apt:
             autoclean: true
           become: true
         when: distro == 'ubuntu'
 
       - block:
-        - name: Update dnf cache
+        - name: install ansible requirements
-          dnf:
+          package:
-            update_cache: true
+            name: "{{ packages[distro] }}"
+            state: present
           become: true
-
+          vars:
-        - name: Upgrade system
+            packages:
-          dnf:
+              archlinux:
-            name: '*'
+                - python-jmespath
-            state: latest
+              ubuntu:
-            update_cache: false
+                - python3-jmespath
-          become: true
-
-        - name: Remove unused packages
-          dnf:
-            autoremove: true
-            update_cache: false
-          become: true
-        when: distro == 'fedora'
 
       - block:
         - name: enable multilib repository
@@ -70,9 +69,19 @@
             block: |
               [multilib]
               Include = /etc/pacman.d/mirrorlist
+            marker: "# {mark} ANSIBLE MANAGED multilib"
           become: true
 
-        - name: Upgrade system
+        - name: enable parallel download
+          blockinfile:
+            path: /etc/pacman.conf
+            insertafter: '\[options\]'
+            block: |
+              ParallelDownloads = 5
+            marker: "# {mark} ANSIBLE MANAGED parallel_download"
+          become: true
+
+        - name: upgrade system
           pacman:
             upgrade: true
             update_cache: true
@@ -82,41 +91,111 @@
         - name: install pacman-contrib for paccache
           package:
             name: pacman-contrib
-            state: installed
+            state: present
           become: true
 
-        - name: Clean cache
+        - block:
-          command: paccache -rk2 -ruk0
+          - name: install pacman cache clean service
-          become: true
+            copy:
-          changed_when: false
+              dest: /etc/systemd/system/pacman-cache-cleanup.service
+              owner: root
+              group: root
+              mode: '0644'
+              content: |
+                [Service]
+                Type=oneshot
+                ExecStart=/bin/sh -c '/usr/bin/paccache -rk1 && /usr/bin/paccache -ruk0'
+                RemainAfterExit=true
+            become: true
+
+          - name: install pacman cache clean timer
+            copy:
+              dest: /etc/systemd/system/pacman-cache-cleanup.timer
+              owner: root
+              group: root
+              mode: '0644'
+              content: |
+                [Timer]
+                OnCalendar=daily
+            become: true
+
+          - name: enable pacman cache clean timer
+            systemd:
+              name: pacman-cache-cleanup.timer
+              enabled: true
+              state: started
+              daemon_reload: true
+            become: true
+          tags: [pacman_cache_cleanup]
 
         when: distro == 'archlinux'
-      tags: [update_system]
+      tags: [system-update]
 
-    - name: install selinux specials on fedora
+    - block:
-      dnf:
+      - name: create dotfiles group
-        state: installed
+        group:
-        name:
+          name: dotfiles
-          - python3-libselinux
+          state: present
-          - policycoreutils-python-utils
+        become: true
-      become: true
+        become_user: root
-      when: distro == 'fedora'
+
+      - name: create dotfiles user
+        user:
+          name: dotfiles
+          group: dotfiles
+          home: /var/lib/dotfiles
+          create_home: false
+          shell: /bin/bash
+          system: true
+        become: true
+        become_user: root
+
+      - name: create dotfiles directory
+        file:
+          state: directory
+          path: /var/lib/dotfiles
+          owner: dotfiles
+          group: dotfiles
+          mode: '0775' # group needs write access!
+        become: true
+        become_user: root
+
+      - name: fix permissions for dotfiles directory
+        shell: |
+          cd /var/lib/dotfiles
+          if [[ -e .git ]] ; then
+              # There is no sane way to specify the global .gitconfig to use, so we
+              # actually have to override HOME so git looks into ~/.gitconfig
+              export HOME="$(mktemp -d)"
+              set -o pipefail
+              set -o errexit
+              git config --global --add safe.directory /var/lib/dotfiles
+              git ls-tree -z --name-only HEAD | xargs --null chown --changes --recursive dotfiles:dotfiles
+              git ls-tree -z --name-only HEAD | xargs --null chmod --changes --recursive g+wX
+          else
+              chown --changes --recursive dotfiles:dotfiles .
+              chmod --changes --recursive g+wX .
+          fi
+        args:
+          executable: /bin/bash
+        register: dotfiles_permission_change
+        become: true
+        become_user: root
+        changed_when: dotfiles_permission_change.stdout_lines|length > 0
+      tags: [dotfiles-directory]
 
     - block:
       - name: install sudo
         package:
-          state: installed
+          state: present
           name: sudo
 
       - name: install dependencies for paru
         package:
-          state: installed
+          state: present
           name:
             - base-devel
             - git
-            - cargo
-            - asp
-            - bat
         become: true
 
       - name: create build user on arch
@@ -126,12 +205,32 @@
           create_home: true
           shell: /bin/bash
           system: true
+        become: true
+
+      - name: create paru user on arch
+        user:
+          name: paru
+          home: /var/lib/paru
+          create_home: true
+          shell: /bin/bash
+          system: true
+        become: true
+
+      - name: configure passwordless sudo for paru user
+        copy:
+          owner: root
+          group: root
+          mode: "0600"
+          dest: /etc/sudoers.d/paru
+          content: |
+            paru ALL=(ALL) NOPASSWD: /usr/bin/pacman
+        become: true
 
       - name: check if paru is already installed
         shell: |
           set -o errexit
 
-          if pacman -Qi paru >/dev/null 2>&1; then
+          if pacman -Qi paru-bin >/dev/null 2>&1; then
               exit 100
           fi
           exit 0
@@ -149,9 +248,9 @@
           mkdir -p /tmp/paru-build
           cd /tmp/paru-build
 
-          curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/paru.tar.gz
+          curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz
-          tar xvf paru.tar.gz
+          tar xvf paru-bin.tar.gz
-          cd paru
+          cd paru-bin
           makepkg
         args:
           executable: /bin/bash
@@ -163,7 +262,7 @@
         shell: |
           set -o errexit
 
-          pacman --noconfirm -U /tmp/paru-build/paru/paru-*.pkg.tar.zst
+          pacman --noconfirm -U /tmp/paru-build/paru-bin/paru-bin-*.pkg.tar.zst
           rm -rf /tmp/paru-build
         args:
           executable: /bin/bash
@@ -178,12 +277,11 @@
         include_vars:
           file: packages.yml
 
-      - name: enable neovim ppa
+      - name: force-update iptables to iptables-nft on arch
-        apt_repository:
+        shell: pacman -Q iptables && yes | pacman -S iptables-nft
-          repo: 'ppa:neovim-ppa/stable'
+        changed_when: false
-          update_cache: true
         become: true
-        when: distro == 'ubuntu'
+        when: distro == 'archlinux'
 
       - set_fact:
           defined_packages: "{{ packages|json_query('keys(list)') }}"
@@ -205,14 +303,6 @@
         assert:
           that: "defined_packages_remove|length == distro_packages_remove|length"
 
-      - name: install packages
-        package:
-          name: "{{ packages|json_query(query) }}"
-          state: installed
-        become: true
-        vars:
-          query: "{{ 'list.*.%s[]'|format(distro) }}"
-
       - name: remove packages
         package:
           name: "{{ packages|json_query(query) }}"
@@ -220,6 +310,25 @@
         become: true
         vars:
           query: "{{ 'remove.*.%s[]'|format(distro) }}"
+        when: distro != 'ubuntu'
+
+      - name: install packages
+        package:
+          name: "{{ packages|json_query(query) }}"
+          state: present
+        become: true
+        vars:
+          query: "{{ 'list.*.%s[]'|format(distro) }}"
+
+      - name: remove packages
+        apt:
+          name: "{{ packages|json_query(query) }}"
+          state: absent
+          purge: true
+        become: true
+        vars:
+          query: "{{ 'remove.*.%s[]'|format(distro) }}"
+        when: distro == 'ubuntu'
 
       - name: install machine-specific packages
         package:
@@ -246,7 +355,7 @@
       - name: install lz4
         package:
           name: lz4
-          state: installed
+          state: present
         become: true
 
       - name: use lz4 for mkinitcpio compression
@@ -259,11 +368,6 @@
           - rebuild initrd
       when: distro == 'archlinux'
 
-    - set_fact:
-        disable_services:
-          - sshd
-      when: distro == 'fedora'
-
     - set_fact:
         disable_services:
           - ssh
@@ -283,16 +387,6 @@
       become: true
       when: manage_services|default(true)|bool
 
-    - set_fact:
-        enable_services:
-          - NetworkManager
-          # does not work with fedora 31 due to the switch to cgroups v2:
-          # https://github.com/docker/cli/issues/2104
-          # https://bugzilla.redhat.com/show_bug.cgi?id=1746355#c1
-          # - docker
-          - libvirtd
-      when: distro == 'fedora'
-
     - set_fact:
         enable_services:
           - NetworkManager
@@ -377,7 +471,7 @@
             - lib32-libva-mesa-driver
             - mesa-vdpau
             - lib32-mesa-vdpau
-          state: installed
+          state: present
         become: true
 
       - name: set AMDGPU options
@@ -399,23 +493,398 @@
         - distro == 'archlinux'
         - machine.gpu is defined and machine.gpu == 'amd'
 
+    - block:
+      - name: create rust build user
+        user:
+          name: rust_build
+          home: /var/lib/rust_build
+          create_home: true
+          shell: /bin/bash
+          system: true
+        become: true
 
-    - name: create dotfiles group
+      - set_fact:
-      group:
+          cargo_env: . ~/.cargo/env
-        name: dotfiles
+        when: distro == 'ubuntu'
-        state: present
-      become: true
-      become_user: root
 
-    - name: create dotfiles directory
+      - set_fact:
-      file:
+          # Do NOT just use `"true"`. Due to some YAML fuckery, it will be
-        state: directory
+          # capitalized and the commands will fail.
-        path: /var/lib/dotfiles
+          cargo_env: "/bin/true"
-        owner: nobody
+        when: distro == 'archlinux'
-        group: dotfiles
+
-        mode: '0775' # group needs write access!
+      - name: install rustup on ubuntu
-      become: true
+        shell: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal
-      become_user: root
+        args:
+          creates: /var/lib/rust_build/.cargo/bin/rustup
+        become: true
+        become_user: rust_build
+        when: distro == 'ubuntu'
+
+      - name: add rustup stable toolchain
+        shell: "{{ cargo_env }} && rustup toolchain install stable && rustup default stable"
+        become: true
+        become_user: rust_build
+        changed_when: false
+
+      - name: add rustup nightly toolchain
+        shell: "{{ cargo_env }} && rustup toolchain install nightly"
+        become: true
+        become_user: rust_build
+        changed_when: false
+
+      - name: add rustup additional toolchains
+        shell: "{{ cargo_env }} && rustup toolchain install {{ item }}"
+        become: true
+        become_user: rust_build
+        changed_when: false
+        loop: "{{ cargo_crate_list|selectattr('toolchain', 'defined')|map(attribute='toolchain')|reject('in', ['none', 'stable', 'nightly'])|list }}"
+
+      - name: add additional targets
+        shell: "{{ cargo_env }} && rustup +{{ item.toolchain|default('stable') }} target add {{ item.target }}"
+        become: true
+        become_user: rust_build
+        changed_when: false
+        when:
+          - '"target" in item'
+        loop: "{{ cargo_crate_list }}"
+
+      - name: assert that nofeatures is not actually a flag
+        assert:
+          that: '"nofeatures" not in item.features|default([])'
+          msg: Wow, "nofeatures" is actually a feature. Update the playbook!
+        loop: "{{ cargo_crate_list }}"
+
+      - name: assert that only proper sources are defined
+        assert:
+          that: item.source|default("crates.io") in ("crates.io", "git")
+          msg: "Invalid source: {{ item.source|default('x') }}"
+        loop: "{{ cargo_crate_list }}"
+
+      - name: install required packages
+        package:
+          state: present
+          name: "{{ item.required_packages|map(attribute=distro)|list }}"
+        when: item.required_packages is defined
+        become: true
+        loop: "{{ cargo_crate_list }}"
+
+      - name: build rust crates from crates.io
+        shell: |
+          set -o errexit
+          {{ cargo_env }}
+
+          rustup run {{ item.toolchain|default('stable') }} cargo install --features "{{ item.features|default([])|join(' ') }}" {{ "--target " ~ item.target if item.target is defined else '' }} --version {{ item.version }} {{ item.crate }}
+          mv /var/lib/rust_build/.cargo/bin/{{ item.binary }} /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }}
+        args:
+          creates: /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }}
+        become: true # do not build as root!
+        become_user: rust_build
+        loop: "{{ cargo_crate_list }}"
+        when: item.source|default('crates.io') == 'crates.io'
+
+      - name: build rust crates from git
+        shell: |
+          set -o errexit
+          {{ cargo_env }}
+          rustup run {{ item.toolchain|default('stable') }} cargo install --features "{{ item.features|default([])|join(' ') }}" {{ "--target " ~ item.target if item.target is defined else '' }} --git {{ item.url }} --branch {{ item.branch }}
+          mv /var/lib/rust_build/.cargo/bin/{{ item.binary }} /var/lib/rust_build/.cargo/bin/{{ binary_id_git }}
+        args:
+          creates: /var/lib/rust_build/.cargo/bin/{{ binary_id_git }}
+        become: true # do not build as root!
+        become_user: rust_build
+        loop: "{{ cargo_crate_list }}"
+        when: item.source|default('crates.io') == 'git'
+
+      - name: create target directory
+        file:
+          state: directory
+          path: /usr/local/lib/binaries/
+          owner: root
+          group: root
+          mode: '0775'
+        become: true
+
+      - name: move binaries for crates.io
+        shell: |
+          mv /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }} /usr/local/lib/binaries/{{ binary_id_cratesio }}
+          ln -s /usr/local/lib/binaries/{{ binary_id_cratesio }} /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }}
+        args:
+          creates: /usr/local/lib/binaries/{{ binary_id_cratesio }}
+        become: true
+        loop: "{{ cargo_crate_list }}"
+        when: item.source|default('crates.io') == 'crates.io'
+
+      - name: move binaries for git
+        shell: |
+          mv /var/lib/rust_build/.cargo/bin/{{ binary_id_git }} /usr/local/lib/binaries/{{ binary_id_git }}
+          ln -s /usr/local/lib/binaries/{{ binary_id_git }} /var/lib/rust_build/.cargo/bin/{{ binary_id_git }}
+        args:
+          creates: /usr/local/lib/binaries/{{ binary_id_git }}
+        become: true
+        loop: "{{ cargo_crate_list }}"
+        when: item.source|default('crates.io') == 'git'
+
+      - name: link binaries for crates.io
+        file:
+          src: /usr/local/lib/binaries/{{ binary_id_cratesio }}
+          dest: /usr/local/bin/{{ item.binary }}
+          owner: root
+          group: root
+          state: link
+          force: true
+        become: true
+        loop: "{{ cargo_crate_list }}"
+        when: item.source|default('crates.io') == 'crates.io'
+
+      - name: link binaries for git
+        file:
+          src: /usr/local/lib/binaries/{{ binary_id_git }}
+          dest: /usr/local/bin/{{ item.binary }}
+          owner: root
+          group: root
+          state: link
+          force: true
+        become: true
+        loop: "{{ cargo_crate_list }}"
+        when: item.source|default('crates.io') == 'git'
+
+      # Important: clean up the symlinks BEFORE the binaries they point to.
+      # Otherwise, ansible will skip them because `ansible.builtin.fileglob`
+      # does not match broken symlinks for some reason.
+      - name: clean up old binaries for creates.io in /var/lib/rust_build
+        command: rm -- {{ binaries | join (" ") }}
+        vars:
+          binaries: "{{ lookup('ansible.builtin.fileglob', '/var/lib/rust_build/.cargo/bin/' ~ item.binary ~ '.*', wantlist=True) | reject('eq', '/var/lib/rust_build/.cargo/bin/' ~ binary_id_cratesio) | list }}"
+        changed_when: binaries | length > 0
+        loop: "{{ cargo_crate_list }}"
+        become: true
+        when:
+          - item.source|default('crates.io') == 'crates.io'
+          - binaries | length > 0
+
+      - name: clean up old binaries for creates.io in /usr/local/lib
+        command: rm -- {{ binaries | join (" ") }}
+        vars:
+          binaries: "{{ lookup('ansible.builtin.fileglob', '/usr/local/lib/binaries/' ~ item.binary ~ '.*', wantlist=True) | reject('eq', '/usr/local/lib/binaries/' ~ binary_id_cratesio) | list }}"
+        changed_when: binaries | length > 0
+        loop: "{{ cargo_crate_list }}"
+        become: true
+        when:
+          - item.source|default('crates.io') == 'crates.io'
+          - binaries | length > 0
+
+      - name: clean up old binaries for git in /var/lib/rust_build
+        command: rm -- {{ binaries | join (" ") }}
+        vars:
+          binaries: "{{ lookup('ansible.builtin.fileglob', '/var/lib/rust_build/.cargo/bin/' ~ item.binary ~ '.*', wantlist=True) | reject('eq', '/var/lib/rust_build/.cargo/bin/' ~ binary_id_git) | list }}"
+        changed_when: binaries | length > 0
+        loop: "{{ cargo_crate_list }}"
+        become: true
+        when:
+          - item.source|default('crates.io') == 'git'
+          - binaries | length > 0
+
+      - name: clean up old binaries for git in /usr/local/lib
+        command: rm -- {{ binaries | join (" ") }}
+        vars:
+          binaries: "{{ lookup('ansible.builtin.fileglob', '/usr/local/lib/binaries/' ~ item.binary ~ '.*', wantlist=True) | reject('eq', '/usr/local/lib/binaries/' ~ binary_id_git) | list }}"
+        changed_when: binaries | length > 0
+        loop: "{{ cargo_crate_list }}"
+        become: true
+        when:
+          - item.source|default('crates.io') == 'git'
+          - binaries | length > 0
+
+      vars:
+        binary_id_cratesio: "{{ item.binary }}.{{ item.toolchain|default('stable') }}.{{ item.features|default(['nofeatures'])|join('_') }}.{{ item.version }}"
+        binary_id_git: "{{ item.binary }}.{{ item.toolchain|default('stable') }}.{{ item.features|default(['nofeatures'])|join('_') }}.{{ item.branch }}"
+      tags:
+        - rust_binaries
+
+    - block:
+      - name: stat go target directory
+        stat:
+          path: /usr/local/go-v{{ go_version }}
+        register: go_target_stat
+
+      - block:
+        - name: create temporary directory for go download
+          tempfile:
+            state: directory
+          register: go_download
+
+        - name: download go
+          get_url:
+            url: https://golang.org/dl/go{{ go_version }}.linux-amd64.tar.gz
+            dest: "{{ go_download.path }}/go{{ go_version }}.linux-amd64.tar.gz"
+            force: false
+
+        - name: unpack go
+          unarchive:
+            src: "{{ go_download.path }}/go{{ go_version }}.linux-amd64.tar.gz"
+            owner: root
+            group: root
+            mode: '0755'
+            dest: "{{ go_download.path }}"
+            remote_src: true
+          become: true
+
+        - name: install new go version
+          command: mv "{{ go_download.path }}/go/" /usr/local/go-v{{ go_version }}
+          become: true
+
+        - name: clean up go download directory
+          file:
+            path: "{{ go_download.path }}"
+            state: absent
+
+        when: not go_target_stat.stat.exists
+
+      - name: link to the current go version
+        file:
+          src: /usr/local/go-v{{ go_version }}
+          dest: /usr/local/go
+          owner: root
+          group: root
+          state: link
+          force: true
+        become: true
+
+      - name: add go directory to PATH and set GOROOT
+        copy:
+          dest: /etc/profile.d/go.sh
+          content: |
+            export PATH=/usr/local/go/bin:$PATH
+            export GOROOT=/usr/local/go
+          owner: root
+          group: root
+          mode: '0644'
+        become: true
+
+      tags: [go]
+
+    - block:
+      - name: install alacritty build dependencies
+        package:
+          state: present
+          # https://github.com/alacritty/alacritty/blob/master/INSTALL.md#debianubuntu
+          name:
+            - cmake
+            - pkg-config
+            - libfreetype6-dev
+            - libfontconfig1-dev
+            - libxcb-xfixes0-dev
+            - libxkbcommon-dev
+            - python3
+        become: true
+
+      - name: stat alacritty binary
+        stat:
+          path: /usr/local/bin/alacritty
+        register: alacritty_binary
+
+      - name: create temporary directory for alacritty build
+        tempfile:
+          state: directory
+        register: alacritty_build_tempdir
+        become: true
+        become_user: rust_build
+        when: not alacritty_binary.stat.exists
+
+      - name: build alacritty
+        shell: . ~/.cargo/env && rustup run stable cargo install alacritty --root ./out
+        args:
+          chdir: "{{ alacritty_build_tempdir.path }}"
+        become: true
+        become_user: rust_build
+        when: not alacritty_binary.stat.exists
+
+      - name: install alacritty
+        command: mv "{{ alacritty_build_tempdir.path }}/out/bin/alacritty" /usr/local/bin/alacritty
+        become: true
+        when: not alacritty_binary.stat.exists
+
+      - name: clean up build directory
+        file:
+          path: "{{ alacritty_build_tempdir.path }}"
+          state: absent
+        become: true
+        become_user: rust_build
+        when: not alacritty_binary.stat.exists
+
+      when: distro == 'ubuntu'
+      tags: [alacritty]
+
+    - block:
+      - name: stat yubikey-touch-detector binary
+        stat:
+          path: /usr/local/bin/yubikey-touch-detector
+        register: yubikey_touch_detector_binary
+
+      - name: create temporary directory for yubikey-touch-detector build
+        tempfile:
+          state: directory
+        register: yubikey_touch_detector_build_tempdir
+        when: not yubikey_touch_detector_binary.stat.exists
+
+      - name: build yubikey-touch-detector
+        shell: sh -c 'PATH=/usr/local/go/bin:$PATH env GOROOT=/usr/local/go GOPATH=$(pwd) go install github.com/maximbaz/yubikey-touch-detector@main'
+        args:
+          chdir: "{{ yubikey_touch_detector_build_tempdir.path }}"
+        when: not yubikey_touch_detector_binary.stat.exists
+
+      - name: install yubikey-touch-detector
+        command: >
+          mv
+          "{{ yubikey_touch_detector_build_tempdir.path }}/bin/yubikey-touch-detector"
+          /usr/local/bin/yubikey-touch-detector
+        become: true
+        when: not yubikey_touch_detector_binary.stat.exists
+
+      - name: clean up build directory
+        file:
+          path: "{{ yubikey_touch_detector_build_tempdir.path }}"
+          state: absent
+        become: true
+        when: not yubikey_touch_detector_binary.stat.exists
+
+      when: distro == 'ubuntu'
+      tags: [yubikey-touch-detector]
+
+    - block:
+      - block:
+        - name: add spotify apt key
+          apt_key:
+            url: "https://download.spotify.com/debian/pubkey_5E3C45D7B312C643.gpg"
+            id: "5E3C45D7B312C643"
+          become: true
+
+        - name: add spotify repository
+          apt_repository:
+            repo: "deb http://repository.spotify.com stable non-free"
+            filename: spotify
+          become: true
+
+        - name: install spotify
+          apt:
+            name: spotify-client
+            update_cache: true
+          become: true
+        when: distro == 'ubuntu'
+
+      - block:
+        - name: install spotify from AUR via paru
+          shell: |
+            curl -sS https://download.spotify.com/debian/pubkey_5E3C45D7B312C643.gpg | gpg --import
+            yes 1 | paru --skipreview --aur --batchinstall --noconfirm -S spotify
+          become: true
+          become_user: paru
+          args:
+            creates: /usr/bin/spotify
+        when: distro == 'archlinux'
+
+      tags: [spotify]
 
     - set_fact:
         users: "{{ machine.users }}"
@@ -428,6 +897,7 @@
           become: true
           become_user: "{{ user.name }}"
       with_items: "{{ users }}"
+      no_log: True # less spam
       loop_control:
         loop_var: user
       tags:
@@ -437,3 +907,8 @@
     - name: rebuild initrd
       command: mkinitcpio -P
       become: true
+      register: mkinitcpio_cmd
+      failed_when: >
+        mkinitcpio_cmd.rc != 0
+        and
+        not (mkinitcpio_cmd.rc == 1 and "file not found: `fsck.overlay'" in mkinitcpio_cmd.stderr)

qt/qt5ct.conf

@@ -1,14 +1,9 @@
 [Appearance]
-color_scheme_path=/usr/share/qt5ct/colors/airy.conf
 custom_palette=false
 icon_theme=breeze
 standard_dialogs=default
 style=Fusion
 
-[Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-general=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-
 [Interface]
 activate_item_on_single_click=1
 buttonbox_layout=0
@@ -23,6 +18,3 @@ stylesheets=@Invalid()
 toolbutton_style=4
 underline_shortcut=1
 wheel_scroll_lines=3
-
-[SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x16\0\0\t\xff\0\0\x5\x88\0\0\0\0\0\0\0\x16\0\0\t\xff\0\0\x5\x88\0\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\0\x16\0\0\t\xff\0\0\x5\x88)

requirements.txt

@@ -1,13 +0,0 @@
-ansible==2.10.4
-ansible-base==2.10.3
-cffi==1.14.4
-cryptography==3.2.1
-ipaddress==1.0.23
-Jinja2==2.11.2
-jmespath==0.10.0
-MarkupSafe==1.1.1
-packaging==20.7
-pycparser==2.20
-pyparsing==2.4.7
-PyYAML==5.3.1
-six==1.15.0

screencfg/ares.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -o xtrace
-
-xrandr --output DisplayPort-0 --mode 2560x1440 --primary --rate 144.00 --set TearFree on

screencfg/ares/default.yml

@@ -0,0 +1,8 @@
+reset: true
+outputs:
+  - name: DisplayPort-0
+    opts:
+      mode: 2560x1440
+      rate: "144.00"
+    set:
+      TearFree: "on"

screencfg/mars/default.yml

@@ -0,0 +1,14 @@
+reset: false
+outputs:
+  - name: eDP-1
+    primary: True
+    opts:
+      mode: 1920x1080
+      scale: 1x1
+      pos: "0x0" # beware of hex
+  - name: DP-1-1
+    disable: true
+  - name: DP-1-2
+    disable: true
+  - name: DP-1-3
+    disable: true

screencfg/mars/three-screens.yml

@@ -0,0 +1,18 @@
+reset: true
+outputs:
+  - name: eDP-1
+    opts:
+      mode: 1920x1080
+      scale: 0.7x0.7
+      pos: "0x0" # beware of hex
+  - name: DP-3
+    primary: True
+    opts:
+      mode: 1920x1080
+      right-of: eDP-1
+    reset: true
+  - name: DP-4
+    opts:
+      mode: 1920x1080
+      right-of: DP-3
+    reset: true

screencfg/neptune/default.yml

@@ -0,0 +1,18 @@
+reset: false
+outputs:
+  - name: eDP-1
+    primary: True
+    opts:
+      mode: 1920x1080
+      scale: 1x1
+      pos: "0x0" # beware of hex
+  - name: DP-1
+    disable: true
+  - name: DP-2
+    disable: true
+  - name: DP-3
+    disable: true
+  - name: DP-4
+    disable: true
+  - name: DP-5
+    disable: true

screencfg/neptune/three-screens-laptop-left.yml

@@ -0,0 +1,18 @@
+reset: true
+outputs:
+  - name: eDP-1
+    opts:
+      mode: 1920x1080
+      scale: 0.7x0.7
+      pos: "0x0" # beware of hex
+  - name: DP-3
+    primary: True
+    opts:
+      mode: 1920x1080
+      right-of: eDP-1
+    reset: true
+  - name: DP-4
+    opts:
+      mode: 1920x1080
+      right-of: DP-3
+    reset: true

screencfg/neptune/three-screens-laptop-right.yml

@@ -0,0 +1,21 @@
+reset: true
+outputs:
+  - name: eDP-1
+    opts:
+      mode: 1920x1080
+      scale: 0.7x0.7
+      # x: 2*1920
+      # y: 1080-(0.7*1080)
+      pos: "3840x324" # beware of hex
+  - name: DP-4
+    opts:
+      mode: 1920x1080
+      pos: "1920x0" # beware of hex
+    reset: true
+  - name: DP-3
+    primary: True
+    opts:
+      mode: 1920x1080
+      left-of: DP-4
+      pos: "0x0" # beware of hex
+    reset: true

scripts/install-gothic.sh

@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 
-read -p "Make sure that gothic was installed via Steam! <Enter> to continue, <CTRL+C> to abort "
+# Steam setting: Proton 4.11-13
+#
+# * It *must not* have any symlinks for the directmusic dlls like:
+# pfx/dosdevices/c:/windows/syswow64/dmusic.dll
+
+STEAMAPPS=/var/games/steamapps/
+
+read -p "Make sure that gothic was installed via Steam and started once! <Enter> to continue, <CTRL+C> to abort "
 
 set -o nounset
 set -o xtrace
@@ -11,20 +18,58 @@ downloaddir=~/download/gothic
 mkdir -p "${downloaddir}"
 cd "${downloaddir}"
 
-curl -L -o gothic_patch_108k.exe "https://www.worldofgothic.de/download.php?id=15"
+curl -C - -L -o gothic_patch_108k.exe "https://www.worldofgothic.de/download.php?id=15"
-curl -L -o gothic1_playerkit-1.08k.exe "https://www.worldofgothic.de/download.php?id=61"
+curl -C - -L -o gothic1_playerkit-1.08k.exe "https://www.worldofgothic.de/download.php?id=61"
-curl -L -o Definitive_Edition_1_4_2.exe "https://www.worldofgothic.de/download.php?id=1586"
-curl -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/G1Classic-SystemPack-1.8.exe
-curl -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/Gothic1_PlayerKit-2.8.exe
 
-read -p "During installation, use \"Z:\\var\\games\\steamapps\\common\\Gothic\\\" as the install directory! <Enter> to continue, <CTRL+C> to abort "
+curl -C - -L -o Definitive_Edition_1_4_5.exe "https://www.worldofgothic.de/download.php?id=1586"
 
-export WINEPREFIX=/var/games/steamapps/compatdata/65540/pfx/
+# superseded by union
+curl -C - -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/G1Classic-SystemPack-1.8.exe
 
-wine "${downloaddir}"/gothic1_playerkit-1.08k.exe
+# curl -C - -L -O https://github.com/GothicFixTeam/GothicFix/releases/download/v1.8/Gothic1_PlayerKit-2.8.exe
-wine "${downloaddir}"/Gothic1_PlayerKit-2.8.exe
+
+curl -C - -L -o Ninja-2.5.09.exe "https://www.worldofgothic.de/download.php?id=1626"
+# curl -C - -L -o Union_1.0j_22.02.2021.exe "https://www.worldofgothic.de/download.php?id=1625"
+
+curl -C - -L -o G1CP-1.0.0.exe "https://www.worldofgothic.de/download.php?id=1636"
+
+#curl -C - -L -o Spine_1.29.0.exe "https://www.worldofgothic.de/download.php?id=1417"
+
+curl -C - -L -o Gothic1-GD3D11-17.7-dev16.zip https://github.com/Kirides/GD3D11/releases/download/v17.7-dev16/Gothic1-GD3D11-17.7-dev16.zip
+curl -C - -L -o RiisisGothic1TextureMixV1.1.zip "https://www.worldofgothic.de/download.php?id=1458"
+
+read -p 'During installation, use "Z:\var\games\steamapps\common\Gothic\" as the install directory! <Enter> to continue, <CTRL+C> to abort '
+
+
+export WINEPREFIX="${STEAMAPPS}/compatdata/65540/pfx/"
+
+#winetricks dxvk
+winetricks directmusic
+
+#read -p "In winecfg, go to Libraries tab, in 'existing overrides' search for 'dsound', select it and press remove button "
+#winecfg
+
+# wine "${downloaddir}"/gothic_patch_108k.exe
+# wine "${downloaddir}"/gothic1_playerkit-1.08k.exe
+
+# wine "${downloaddir}"/Gothic1_PlayerKit-2.8.exe
 wine "${downloaddir}"/G1Classic-SystemPack-1.8.exe
-wine "${downloaddir}"/Definitive_Edition_1_4_2.exe
+
+wine "${downloaddir}"/Ninja-2.5.09.exe
+
+# cmd="${WINEPREFIX}/dosdevices/c:/windows/syswow64/cmd.exe"
+# cmdtarget="$(readlink "${cmd}")"
+# rm "${WINEPREFIX}/dosdevices/c:/windows/syswow64/cmd.exe"
+# winetricks cmd # for union install
+# wine "${downloaddir}"/Union_1.0j_22.02.2021.exe
+# ln -sf "$cmdtarget" "$cmd"
+
+wine "${downloaddir}"/G1CP-1.0.0.exe
+wine "${downloaddir}"/Definitive_Edition_1_4_5.exe
+
+unzip -u "${downloaddir}"/Gothic1-GD3D11-17.7-dev16.zip -d "${STEAMAPPS}/common/Gothic/system"
+unzip -u "${downloaddir}"/RiisisGothic1TextureMixV1.1.zip -d "${STEAMAPPS}/common/Gothic/Data"
+
 
 read -p "Now run the game once and exit! <Enter> to continue, <CTRL+C> to abort "
 
@@ -33,22 +78,28 @@ cd /var/games/steamapps/common/Gothic
 sed -i 's/^playLogoVideos=.*$/playLogoVideos=0\r/' system/Gothic.ini
 sed -i 's/^sightValue=.*$/sightValue=14\r/' system/Gothic.ini
 sed -i 's/^modelDetail=.*$/modelDetail=1\r/' system/Gothic.ini
-sed -i 's/^subTitles=.*$/subTitles=0\r/' system/Gothic.ini
+sed -i 's/^subTitles=.*$/subTitles=1\r/' system/Gothic.ini
-sed -i 's/^bloodDetail=.*$/bloodDetail=3\r/' system/Gothic.ini
+sed -i 's/^animatedWindows=.*$/animatedWindows=0\r/' system/Gothic.ini
+sed -i 's/^bloodDetail=.*$/bloodDetail=2\r/' system/Gothic.ini
 sed -i 's/^zVidResFullscreenX=.*$/zVidResFullscreenX=2560\r/' system/Gothic.ini
 sed -i 's/^zVidResFullscreenY=.*$/zVidResFullscreenY=1440\r/' system/Gothic.ini
+sed -i 's/^zDetailTexturesEnabled=.*$/zDetailTexturesEnabled=1\r/' system/Gothic.ini
+sed -i 's/^zSubdivSurfacesEnabled=.*$/zSubdivSurfacesEnabled=1\r/' system/Gothic.ini
 
 sed -i 's/^SimpleWindow=.*$/SimpleWindow=0\r/' system/SystemPack.ini
 sed -i 's/^Gothic2_Control=.*$/Gothic2_Control=1\r/' system/SystemPack.ini
 sed -i 's/^USInternationalKeyboardLayout=.*$/USInternationalKeyboardLayout=0\r/' system/SystemPack.ini
 sed -i 's/^FPS_Limit=.*$/FPS_Limit=144\r/' system/SystemPack.ini
-sed -i 's/^VerticalFOV=.*$/VerticalFOV=50.625\r/' system/SystemPack.ini
+sed -i 's/^VerticalFOV=.*$/VerticalFOV=85\r/' system/SystemPack.ini
 
 sed -i 's/^OutDoorPortalDistanceMultiplier=.*$/OutDoorPortalDistanceMultiplier=3\r/' system/SystemPack.ini
 sed -i 's/^InDoorPortalDistanceMultiplier=.*$/InDoorPortalDistanceMultiplier=3\r/' system/SystemPack.ini
 sed -i 's/^WoodPortalDistanceMultiplier=.*$/WoodPortalDistanceMultiplier=3\r/' system/SystemPack.ini
 sed -i 's/^DrawDistanceMultiplier=.*$/DrawDistanceMultiplier=3\r/' system/SystemPack.ini
 
+sed -i 's/^keyDelayRate=.*$/keyDelayRate=50\r/' system/SystemPack.ini
+sed -i 's/^keyDelayFirst=.*$/keyDelayFirst=150\r/' system/SystemPack.ini
+
 sed -i 's/^HideFocus=.*$/HideFocus=0\r/' system/SystemPack.ini
 
 sed -i 's/^Scale=.*$/Scale=1.9\r/' system/SystemPack.ini

scripts/install-gothic2.sh

@@ -0,0 +1,199 @@
+#!/usr/bin/env bash
+
+# Steam setting: Proton 4.11-13
+#
+# * It *must not* have any symlinks for the directmusic dlls like:
+# pfx/dosdevices/c:/windows/syswow64/dmusic.dll
+
+set -o nounset
+set -o xtrace
+set -o errexit
+
+
+STEAMAPPS=/var/games/steamapps/
+
+BASEDIR="${STEAMAPPS}/common/Gothic II"
+
+export GAMEDATA=${BASEDIR}/data/
+export ARCHIVE=${BASEDIR}/gothic2.data.tar.zstd
+export WINEPREFIX="${STEAMAPPS}/compatdata/39510/pfx/"
+export WINEARCH=win64
+
+export WINEVERSION=6.3
+
+DOWNLOADDIR=~/download/gothic2
+
+mkdir -p "${WINEPREFIX}"
+
+# if [[ "$(wine --version)" != "wine-${WINEVERSION}" ]] ; then
+#     printf '%s\n' "Wine version ${WINEVERSION} required" >&2
+#     exit 1
+# fi
+
+archive() {
+    origin="$1"
+    if [[ -e "${ARCHIVE}" ]] ; then
+        return
+    fi
+    tar -cv --zstd -p -f "${ARCHIVE}" -C "${GAMEDATA}" .
+}
+
+extract() {
+    if [[ -e "${GAMEDATA}" ]] ; then
+        return
+    fi
+
+    mkdir -p "${GAMEDATA}"
+    tar x --zstd -f "${ARCHIVE}" -C "${GAMEDATA}"
+}
+
+start() {
+    # For the DX11 renderer, PWD has to be the folder containing the "GD3D11" folder
+    cd "${GAMEDATA}/system/"
+
+    # There is a bug in the DX11 renderer that leads to the mouse cursor always
+    # being visible
+    #
+    # See https://bugs.winehq.org/show_bug.cgi?id=48483
+    #
+    # Workaround is to disable the cursor completely during gameplay
+    # if command -v unclutter >/dev/null ; then
+    #     unclutter --timeout 0 --jitter 100000 --ignore-scrolling &
+    #     pid=$!
+    #     trap "kill $pid" EXIT
+    # else
+    #     echo "WARNING: Unclutter not installed, cannot disable mouse cursor"
+    # fi
+
+    wine ./Gothic2.exe
+}
+
+ini() {
+    cd "${GAMEDATA}"
+
+    set_ini() {
+        local file="$1"
+        local key="$2"
+        local value="$3"
+        if ! grep -q "^${key}=" "${file}" ; then
+            echo "Key ${key} not fmund in ${file}"
+            exit 1
+        fi
+
+        sed -i "s/^${key}=.*$/${key}=${value}\r/" "${file}"
+    }
+
+    set_ini system/Gothic.ini sightValue 14
+    set_ini system/Gothic.ini modelDetail 1
+    set_ini system/Gothic.ini animatedWindows 0
+    set_ini system/Gothic.ini playLogoVideos 0
+    set_ini system/Gothic.ini useGothic1Controls 1
+    set_ini system/Gothic.ini keyDelayRate 50
+    set_ini system/Gothic.ini keyDelayFirst 150
+    set_ini system/Gothic.ini subTitles 1
+    set_ini system/Gothic.ini invMaxColumns 8
+    set_ini system/Gothic.ini invMaxRows 0
+    set_ini system/Gothic.ini useQuickSaveKeys 1
+    set_ini system/Gothic.ini zVidResFullscreenX 2560
+    set_ini system/Gothic.ini zVidResFullscreenY 1440
+    set_ini system/Gothic.ini zVidResFullscreenBPP 32
+    set_ini system/Gothic.ini zRainWindScale 0.1
+    set_ini system/Gothic.ini zMouseRotationScale 15.0
+    set_ini system/Gothic.ini zSmoothMouse 0
+
+    set_ini system/SystemPack.ini VerticalFOV 85.0
+    set_ini system/SystemPack.ini DrawDistanceMultiplier 3
+    set_ini system/SystemPack.ini OutDoorPortalDistanceMultiplier 3
+    set_ini system/SystemPack.ini InDoorPortalDistanceMultiplier 3
+}
+
+
+case $1 in
+    install)
+        extract
+
+        mkdir -p "${DOWNLOADDIR}"
+        cd "${DOWNLOADDIR}"
+
+        curl -C - -L -o g2addon-2_6.exe "https://www.worldofgothic.de/download.php?id=173"
+        curl -C - -L -o gothic2_fix-2.6.0.0-rev2.exe "https://www.worldofgothic.de/download.php?id=833"
+        curl -C - -L -o gothic2_playerkit-2.6f.exe "https://www.worldofgothic.de/download.php?id=518"
+        curl -C - -L -o G2NoTR-SystemPack-1.8.exe "https://www.worldofgothic.de/download.php?id=1525"
+
+        curl -C - -L -o LHiver204_DE_22-06-20.exe "https://www.worldofgothic.de/download.php?id=1580"
+
+        curl -C - -L -o LaaHack.zip "https://www.worldofgothic.de/download.php?id=1457"
+
+        curl -C - -L -O "https://github.com/Kirides/GD3D11/releases/download/v17.7-dev20/Gothic2-GD3D11-v17.7-dev20.zip"
+
+        curl -C - -L -o Normalmaps_LHiver.zip "https://www.worldofgothic.de/download.php?id=1530"
+
+        curl -C - -L -O https://github.com/Kirides/ninja-quickloot/releases/download/v1.9.5/Quickloot.vdf
+
+        curl -C - -L -O https://github.com/szapp/Ninja/releases/download/v2.7.12/Ninja-2.7.12.exe
+
+        # winetricks -q dxvk
+        winetricks -q directmusic
+        if command -v setup_dxvk >/dev/null ; then
+            setup_dxvk install
+        else
+            echo "WARNING: Using dxvk via winetricks, untested"
+            winetricks dxvk
+        fi
+
+        read -p 'During installation, use "${GAMEDATA//\//\\}" as the install directory! <Enter> to continue, <CTRL+C> to abort '
+
+        wine "${DOWNLOADDIR}"/g2addon-2_6.exe
+        wine "${DOWNLOADDIR}"/gothic2_fix-2.6.0.0-rev2.exe
+        wine "${DOWNLOADDIR}"/gothic2_playerkit-2.6f.exe
+        wine "${DOWNLOADDIR}"/G2NoTR-SystemPack-1.8.exe
+        wine "${DOWNLOADDIR}"/LHiver204_DE_22-06-20.exe
+        wine "${DOWNLOADDIR}"/Ninja-2.7.12.exe
+
+        cd "${GAMEDATA}"
+
+        unzip -o "${DOWNLOADDIR}"/Gothic2-GD3D11-v17.7-dev20.zip -d ./system/
+
+        ln Data/ModVDF/LHE204_DE.mod Data/LHE204_DE.mod
+
+        cp "${DOWNLOADDIR}"/Quickloot.vdf ./Data
+
+        t="./system/GD3D11/Textures/replacements/Normalmaps_xxx"
+        mkdir -p "${t}"
+        set +o errexit
+        unzip -o "${DOWNLOADDIR}"/Normalmaps_LHiver.zip -d "${t}"
+        zip_exit="$?"
+        set -o errexit
+        if (( $zip_exit != 0 )) && (( $zip_exit != 2 )) ; then
+            echo zip failed
+            exit 1
+        fi
+        unset t
+
+        laatmp=$(mktemp -d)
+
+        unzip -o "${DOWNLOADDIR}"/LaaHack.zip -d "${laatmp}"
+
+        read -p "For the LAA Hack, select only ${GAMEDATA}/system/Gothic2.exe [<Enter> to continue] "
+        wine "${laatmp}"/LaaHack.exe
+        rm -rf "${laatmp}"
+
+        # Required to create all ini files
+        read -p "Now run the game once and exit! [<Enter> to continue] "
+
+        ini
+        ;;
+    ini)
+        ini
+        ;;
+    start)
+        export WINEDLLOVERRIDES="ddraw=n,b;dsound=b,n;d3dcompiler_47=n,b"
+        start
+        ;;
+    archive)
+        archive "$2"
+        ;;
+    exec)
+        "${@}"
+        ;;
+esac

test-in-docker.sh

@@ -4,7 +4,8 @@ set -o nounset
 set -o errexit
 
 tmpdir="$(mktemp -d)"
-tmpdir=/tmp/dotfiles
+
+trap "rm -rf ${tmpdir}" EXIT
 
 git archive --format tar --output "${tmpdir}/dotfiles.tar" HEAD
 
@@ -17,24 +18,73 @@ git submodule foreach 'bash -x -c "
 
 gzip -k -f -v "${tmpdir}/dotfiles.tar"
 
-exit 1
+test_ares() {
+    if [[ -d "/var/cache/pacman/pkg/" ]] ; then
+        dockeropts=(-v "/var/cache/pacman/pkg/:/var/cache/pacman/pkg_host/")
+    else
+        echo "Warning: /var/cache/pacman/pkg/ does not exist. Create it to speed up multiple runs" >&2
+    fi
+    docker pull docker.io/library/archlinux:base
+    docker run \
+        -ti \
+        --rm \
+        -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro \
+        --mount type=tmpfs,destination=/var/cache/pacman/pkg/ \
+        "${dockeropts[@]}" \
+        --hostname ares \
+        docker.io/library/archlinux:base \
+        sh -c '
+            set -o errexit
 
-docker pull docker.io/library/archlinux:base
+            # Uncomment CacheDir and append the host pacman cache as cachedir
-docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname ares docker.io/library/archlinux:base sh -c '"
+            # At worst, the cache directory will be ignored if it does not exist
-    set -o errexit
+            # Pacman will always prefer the first cache directory, so newly downloaded
+            # packages will stay in the container
+            sed -i '"'"'s/^#\?\(CacheDir.*\)/CacheDir = \/var\/cache\/pacman\/pkg_host\/\n\1/'"'"' /etc/pacman.conf
 
-    pacman -Syu --noconfirm python3
+            mkdir -p /var/cache/pacman/pkg_host/
-    cd $(mktemp -d)
+            pacman -Syu --noconfirm linux
-    tar xf /tmp/dotfiles.tar.gz -C .
+            cd $(mktemp -d)
-    ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
+            tar xf /tmp/dotfiles.tar.gz -C .
-    read -p "Done, [return] to continue "
+            ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
-'
+        '
+}
 
-docker pull docker.io/library/ubuntu:18.04
+test_neptune() {
-docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname tb-hak docker.io/library/ubuntu:18.04 sh -c '
+    docker pull docker.io/library/ubuntu:20.04
-    set -o errexit
+    docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname neptune docker.io/library/ubuntu:20.04 sh -c '
+        set -o errexit
 
-    cd $(mktemp -d)
+        cd $(mktemp -d)
-    tar xf /tmp/dotfiles.tar.gz -C .
+        tar xf /tmp/dotfiles.tar.gz -C .
-    ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
+        ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
-'
+    '
+}
+
+test_mars() {
+    docker pull docker.io/library/ubuntu:20.04
+    docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname mars docker.io/library/ubuntu:20.04 sh -c '
+        set -o errexit
+
+        cd $(mktemp -d)
+        tar xf /tmp/dotfiles.tar.gz -C .
+        ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
+    '
+}
+
+case "${1:-all}" in
+    ares)
+        test_ares
+        ;;
+    neptune)
+        test_neptune
+        ;;
+    mars)
+        test_mars
+        ;;
+    all)
+        test_ares
+        test_neptune
+        test_mars
+        ;;
+esac

tmux/tmux.conf

@@ -1,68 +1,76 @@
-set -g default-command "${SHELL}"
+set-option -g default-command "${SHELL}"
-set -g default-terminal "${TERMBIN}"
+# This *has* to be set to something with `screen-`, do not set this bindly
+# to $TERM, e.g. "alacritty"!
+set-option -g default-terminal "screen-256color"
 
-set -g set-titles on
+set-option -g set-titles on
-set -g set-titles-string '#S'
+set-option -g set-titles-string '#S'
-setw -g automatic-rename
+set-option -g automatic-rename
 
-set -g prefix C-a
+set-option -g escape-time 0
-unbind C-b
+set-option -g aggressive-resize on
-bind C-a send-prefix
 
-unbind C-j
+set-option -g mouse on
 
-set -s escape-time 0
+set-option -g mode-keys vi
-set-window-option -g aggressive-resize on
-
-set -g mouse on
-
-set -g mode-keys vi
 
 set-option -g renumber-windows on
 
-bind-key k confirm kill-window
+set-option -g history-limit 50000
-bind-key K confirm kill-server
 
-bind h select-pane -L
+set-option -g base-index 1
-bind j select-pane -D
+set-option -g pane-base-index 1
-bind k select-pane -U
-bind l select-pane -R
 
-set -g bell-action any
+set-option -g status-position bottom
+set-option -g status-justify left
 
-set -g history-limit 50000
+# https://wiki.archlinux.org/title/tmux#256_colors
+set-option -g -a terminal-overrides ",alacritty:Tc"
 
-set -g base-index 1
+set-option -g pane-border-status off
-set-window-option -g pane-base-index 1
+set-option -g pane-border-format ''
+set-option -g -q pane-border-lines double;
+set-option -g -q pane-border-indicators colour;
 
-set -g status-position bottom
+set-option -g pane-border-style "fg=#555555"
-set -g status-justify left
+set-option -g pane-active-border-style "fg=#e5b567"
 
+set-option -g status-style bg=default
 
-set-option -g status-bg '#272822'
+set-option -g window-status-format ' #I: #W #F '
-set-option -g status-fg white
+set-option -g window-status-current-format ' #I: #W #F '
+set-option -g window-status-current-style "bg=#e5b567,fg=black"
 
-set-window-option -g window-status-format ' #I: #W #F '
+set-option -g monitor-activity on
-set-window-option -g window-status-current-format ' #I: #W #F '
+set-option -g visual-activity off
+set-option -g window-status-activity-style "bg=#ff7777,fg=black"
+set-option -g monitor-bell on
+set-option -g bell-action any
 
-set-window-option -g monitor-activity on
+set-option -g automatic-rename on
-set -g visual-activity on
+set-option -g automatic-rename-format '#{pane_current_command}'
 
-set-window-option -g automatic-rename on
+set-option -g window-status-separator '  '
-set-window-option -g automatic-rename-format '#{pane_current_command}'
 
-set-window-option -g window-status-separator '  '
+set-option -g status-left " #[bg=#6c99bb,fg=#2e2e2e] #{session_name} #[bg=default]  "
+set-option -g status-right "#[bg=#CCCCCC,fg=#555555] #{host} #[bg=default] "
+set-option -g status-left-length 100
 
-set -g status-left " #[bg=#A6E22E,fg=#000000] #{session_name} #[bg=#272822]  "
+set-option -g message-style "bg=#CCCCCC,fg=#555555"
-set -g status-right "#[bg=#CCCCCC,fg=#555555] #{host} #[bg=#272822] "
-set -g status-left-length 100
 
-set -g status-style "bg=#272822,fg=#FFFFFF"
+# Use C-a as the prefix
-set -g message-style "bg=#CCCCCC,fg=#555555"
+set-option -g prefix C-a
+unbind-key C-b
+bind-key C-a send-prefix
+
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
 
 # vertical = | in this case
-unbind %
+unbind-key %
-unbind '"'
+unbind-key '"'
 bind-key s split-window -v -c "#{pane_current_path}"
 bind-key v split-window -h -c "#{pane_current_path}"
 
@@ -75,10 +83,4 @@ bind-key -n S-down new-window
 bind-key -n S-left prev
 bind-key -n S-right next
 
-bind-key -n C-F1 command-prompt "split-window -h 'exec man %%'"
-bind-key -n C-F2 split-window -h "exec htop"
-bind-key -n C-F3 set-option status
-
 bind-key r source-file ~/.tmux.conf \; display-message "~/.tmux.conf sourced"
-
-bind P paste-buffer

user.yml

@@ -20,23 +20,11 @@
       - sudo
       - dip
       - plugdev
-      - lpadmin
-      - sambashare
       - docker
       - libvirt
   when: distro == 'ubuntu'
   tags: [always]
 
-- set_fact:
-    user_groups:
-      - libvirt
-      - wheel
-      - vboxusers
-      - wireshark
-      - docker
-  when: distro == 'fedora'
-  tags: [always]
-
 - set_fact:
     user_groups:
       - libvirt
@@ -46,6 +34,7 @@
       - docker
       - sudonopw
       - games
+      - kvm
   when: distro == 'archlinux'
   tags: [always]
 
@@ -67,17 +56,29 @@
   become: true
   become_user: root
 
+- name: create systemd directory
+  file:
+    state: directory
+    path: "{{ item }}"
+    owner: "{{ user.name }}"
+    group: "{{ user_group_name }}"
+  loop:
+    - "/home/{{ user.name }}/.config/"
+    - "/home/{{ user.name }}/.config/systemd/"
+    - "/home/{{ user.name }}/.config/systemd/user/"
+
+# No way to use the `systemd` module here, as it needs a logind
+# session. So we have to handle the symlinks for masking ourselves.
 - name: disable and mask systemd user units
-  systemd:
+  file:
-    name: "{{ item }}"
+    state: link
-    enabled: false
+    dest: "/home/{{ user.name }}/.config/systemd/user/{{ item }}"
-    masked: true
+    src: "/dev/null"
-    scope: user
   with_items:
-    - gpg-agent.service
     - gpg-agent.socket
     - gpg-agent-browser.socket
     - gpg-agent-ssh.socket
+    - gpg-agent-extra.socket
 
 - name: create directory for getty autologin
   file:
@@ -217,6 +218,7 @@
       state: directory
       path: "{{ item }}"
     with_items:
+      - ~/tmp
       - ~/.var/lib
       - ~/.var/log
       - ~/.var/run
@@ -254,8 +256,6 @@
       owner: "{{ user.name }}"
       group: "{{ user_group_name }}"
     with_items:
-      - name: terraform
-        optpath: terraform
       - name: hugo
         optpath: hugo
       - name: drone
@@ -273,20 +273,20 @@
   tags:
     - dotfiles
 
-- name: create intermediate directories for vim-plug
-  file:
-    path: "{{ item }}"
-    state: directory
-  with_items:
-    - ~/.local/
-    - ~/.local/share/
-    - ~/.local/share/nvim/
-    - ~/.local/share/nvim/site/
-    - ~/.local/share/nvim/site/autoload/
-    - ~/.vim/
-    - ~/.vim/autoload
-
 - block:
+  - name: create intermediate directories for vim-plug
+    file:
+      path: "{{ item }}"
+      state: directory
+    with_items:
+      - ~/.local/
+      - ~/.local/share/
+      - ~/.local/share/nvim/
+      - ~/.local/share/nvim/site/
+      - ~/.local/share/nvim/site/autoload/
+      - ~/.vim/
+      - ~/.vim/autoload
+
   - name: install vim-plug
     copy:
       src: contrib/vim-plug/plug.vim
@@ -303,33 +303,146 @@
       force: true
 
   - name: install vim plugins
-    command: /usr/bin/nvim -f -E -s -c "source ~/.vimrc" +PlugInstall +qall
+    command: sh -c 'PATH=/usr/local/go/bin:$PATH GOROOT=/usr/local/go GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +PlugInstall +qall'
-    register: vim_plugins_stdout
+    register: vim_plugin_install
-    check_mode: false
+    changed_when: vim_plugin_install.stderr != ""
-    changed_when: vim_plugins_stdout.stdout_lines|length != 0
 
-  - name: compile youcompleteme
+  - name: install go binaries for vim
-    shell: |
+    command: sh -c 'PATH=/usr/local/go/bin:$PATH GOROOT=/usr/local/go GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +GoInstallBinaries +qall'
-      cd ~/.local/share/nvim/plugged/YouCompleteMe/
+    changed_when: false
-      python3 ./install.py # --go-completer
+
-    args:
+  - name: update vim plugins
-      creates: ~/.local/share/nvim/plugged/YouCompleteMe/third_party/ycmd/ycm_core.so
+    command: sh -c 'PATH=/usr/local/go/bin:$PATH GOROOT=/usr/local/go GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +PlugUpdate +qall'
-    when: vim_plugins_stdout.stdout_lines|length != 0 or true
+    register: vim_plugin_update
+    changed_when: vim_plugin_update.stderr != ""
+    tags: [user-update]
+
+  - name: update go binaries for vim
+    command: sh -c 'PATH=/usr/local/go/bin:$PATH GOROOT=/usr/local/go GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +GoUpdateBinaries +qall'
+    changed_when: false
+    tags: [user-update]
+  tags: [vim-plugins]
 
 - block:
-  - name: firefox - create chrome directory
+  - name: install rustup on ubuntu
+    shell: curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path
+    args:
+      creates: ~/.cargo/bin/rustup
+  when: distro == 'ubuntu'
+  tags: [rust]
+
+- block:
+  - name: create firefox directories
+    firefox_profile:
+      name: "{{ item.key }}"
+    loop: "{{ user.firefox_profiles | dict2items }}"
+    register: firefox_profile_names
+
+  - set_fact:
+      firefox_preferences:
+        browser.aboutConfig.showWarning: false
+        extensions.pocket.enabled: false
+        toolkit.legacyUserProfileCustomizations.stylesheets: true
+        browser.contentblocking.category: "strict"
+        browser.newtabpage.enabled: false
+        browser.shell.checkDefaultBrowser: false
+        browser.startup.homepage: "about:blank"
+        privacy.trackingprotection.enabled: true
+        privacy.trackingprotection.socialtracking.enabled: true
+        general.smoothScroll: false
+
+        # Restore last session on startup
+        # https://support.mozilla.org/de/questions/1235263
+        browser.startup.page: 3
+        browser.sessionstore.resume_from_crash: true
+
+        # "Play DRM-controlled content"
+        media.eme.enabled: true
+
+        # "Recommend (extensions|features) as you browse"
+        browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons: false
+        browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features: false
+
+        # "Ask to save logins and passwords for websites"
+        signon.rememberSignons: false
+
+        # "Allow Firefox to make personalized extension recommendations"
+        browser.discovery.enabled: false
+
+        # "Allow Firefox to install and run studies"
+        app.shield.optoutstudies.enabled: false
+
+        # "Check spelling as you type"
+        layout.spellcheckDefault: 0
+
+        # Ask for download directory
+        browser.download.useDownloadDir: false
+
+        # (Try to) disable automatic update, as firefox is pulling a Windows
+        app.update.auto: false
+        app.update.service.enabled: false
+
+        # remove this camera / microphone overlay when in calls or similar
+        privacy.webrtc.legacyGlobalIndicator: false
+
+        # use distro updates instead
+        app.update.auto: false
+
+  - include_role:
+      name: firefox
+    vars:
+      firefox_profiles: "{{ {item.key: item.value} | combine({item.key: {'preferences': firefox_preferences}}, recursive=True) }}"
+    loop: "{{ user.firefox_profiles | dict2items }}"
+
+  - name: firefox - create target directory for passff
     file:
-      path: ~/.mozilla/firefox/{{ item.name }}/chrome/
+      path: ~/.mozilla/native-messaging-hosts
+      owner: "{{ user.name }}"
+      group: "{{ user_group_name }}"
       state: directory
       mode: '0755'
-    with_items: "{{ user.firefox_profiles }}"
+
-    when: user.firefox_profiles is defined
+  - name: check if host application file already exists
-    tags:
+    stat:
-      - firefox
+      path: ~/.mozilla/native-messaging-hosts/{{ item.name }}
+    register: passff_file
+    loop:
+      - name: passff.json
+      - name: passff.py
+
+  - name: firefox - get passff host application
+    get_url:
+      url: https://github.com/passff/passff-host/releases/download/1.2.2/{{ item.name }}
+      dest: ~/.mozilla/native-messaging-hosts/{{ item.name }}
+      owner: "{{ user.name }}"
+      group: "{{ user_group_name }}"
+      mode: "{{ item.mode }}"
+      force: false
+    when: not (passff_file.results | selectattr('item.name', 'eq', item.name) | list)[0].stat.exists
+    loop:
+      - name: passff.json
+        mode: '0644'
+      - name: passff.py
+        mode: '0755'
+
+  - name: firefox - configure path to passff
+    lineinfile:
+      path: ~/.mozilla/native-messaging-hosts/passff.json
+      regexp: '"path": ".*"'
+      line: "  \"path\": \"{{ path }}\","
+    vars:
+      path: "/home/{{ user.name }}/.mozilla/native-messaging-hosts/passff.py"
+
+  - name: firefox - create chrome directory
+    file:
+      path: "{{ item.profile_path }}/chrome/"
+      state: directory
+      mode: '0755'
+    with_items: "{{ firefox_profile_names.results }}"
 
   - name: firefox - configure firefox custom css
     copy:
-      dest: ~/.mozilla/firefox/{{ item.name }}/chrome/userChrome.css
+      dest: "{{ item.profile_path }}/chrome/userChrome.css"
       content: |
         #TabsToolbar {
           visibility: collapse !important;
@@ -343,16 +456,12 @@
         #sidebar {
           width: 400px !important;
         }
-    when: item.manage_css
+    when: user.firefox_profiles[item.profile_name].manage_css is sameas True
-    with_items: "{{ user.firefox_profiles | default([]) }}"
+    with_items: "{{ firefox_profile_names.results }}"
-    tags:
+  tags:
-      - firefox
+    - firefox
 
 - block:
-  - name: set portfolio performance version
-    set_fact:
-      portfolio_performace_version: "0.50.0"
-
   - name: look of current installation
     stat:
       path: /home/{{ user.name }}/.opt/portfolio-performance-{{ portfolio_performace_version }}
@@ -368,6 +477,7 @@
       get_url:
         url: https://github.com/buchen/portfolio/releases/download/{{ portfolio_performace_version }}/PortfolioPerformance-{{ portfolio_performace_version }}-linux.gtk.x86_64.tar.gz
         dest: "{{ tempdir.path }}/PortfolioPerformance.{{ portfolio_performace_version }}.tar.gz"
+        force: false
 
     - name: create destination directory
       file:
@@ -392,7 +502,14 @@
         checksum: true
         delete: true
 
-    when: not stat_portfolio_performance_installation.stat.exists
+    - name: clean up temp directory
+      file:
+        path: "{{ tempdir.path }}"
+        state: absent
+
+    when:
+      - not stat_portfolio_performance_installation.stat.exists
+      - not ansible_check_mode
 
   - name: link portfolio performance
     file:
@@ -407,10 +524,6 @@
     - portfolio-performance
 
 - block:
-  - name: set kubectl version
-    set_fact:
-      kubectl_version: v1.20.1
-
   - name: get current stable version
     uri:
       url: https://storage.googleapis.com/kubernetes-release/release/stable.txt
@@ -425,10 +538,10 @@
       kubectl_outdated: "{{ kubectl_version != kubectl_stable_version }}"
 
   - name: warn if not on stable version
-    debug:
+    fail:
       msg: "installing kubectl {{ kubectl_version }}, stable version would be {{ kubectl_stable_version }}"
-    changed_when: kubectl_outdated is sameas true
     when: kubectl_outdated is sameas true
+    ignore_errors: True
 
   - name: get kubectl
     get_url:
@@ -437,6 +550,12 @@
       owner: "{{ user.name }}"
       group: "{{ user_group_name }}"
       mode: '0755'
+      force: false
+
+  - name: make kubectl executable
+    file:
+      path: /home/{{ user.name }}/.opt/kubectl-{{ kubectl_version }}
+      mode: '0755'
 
   - name: link kubectl
     file:
@@ -447,6 +566,74 @@
   tags:
     - kubectl
 
+- block:
+  - set_fact:
+      tf_version: "{{ user.overrides.terraform_version|default(terraform_version) }}"
+      tf_check_updates: "{{ user.overrides.terraform_check_updates|default(terraform_check_updates)|default(true) }}"
+
+  - name: stat current terraform binary
+    stat:
+      path: "/home/{{ user.name }}/.opt/terraform-v{{ tf_version }}"
+    register: terraform_binary
+
+  - name: create temporary download directory for terraform
+    tempfile:
+      state: directory
+    register: terraform_download_dir
+    when: not terraform_binary.stat.exists
+
+  - name: get terraform
+    get_url:
+      url: "https://releases.hashicorp.com/terraform/{{ tf_version }}/terraform_{{ tf_version }}_linux_amd64.zip"
+      dest: "{{ terraform_download_dir.path }}/terraform.zip"
+      force: false
+    when: not terraform_binary.stat.exists
+
+  - name: unpack terraform zip
+    unarchive:
+      src: "{{ terraform_download_dir.path }}/terraform.zip"
+      dest: "{{ terraform_download_dir.path }}/"
+      remote_src: true
+    when: not terraform_binary.stat.exists
+
+  - name: install terraform
+    command: mv "{{ terraform_download_dir.path }}/terraform" /home/{{ user.name }}/.opt/terraform-v{{ tf_version }}
+    when: not terraform_binary.stat.exists
+
+  - name: clean up download directory
+    file:
+      path: "{{ terraform_download_dir.path }}"
+      state: absent
+    when: not terraform_binary.stat.exists
+
+  - name: link terraform
+    file:
+      src: /home/{{ user.name }}/.opt/terraform-v{{ tf_version }}
+      dest: /home/{{ user.name }}/.optbin/terraform
+      state: link
+
+  - block:
+    - name: get terraform version info
+      command: /home/{{ user.name }}/.optbin/terraform version -json
+      register: terraform_version_output
+      check_mode: false
+      changed_when: false
+
+    - name: parse terraform version output
+      set_fact:
+        terraform_outdated: "{{ (terraform_version_output.stdout | from_json()).terraform_outdated }}"
+      changed_when: false
+
+    - name: warn if terraform is outdated
+      fail:
+        msg: "current terraform v{{ tf_version }} is out of date"
+      when: terraform_outdated is sameas true
+      ignore_errors: True
+    when: tf_check_updates
+
+  tags:
+    - terraform
+
 - name: handle autostart units
   block:
   - name: create systemd user directory
@@ -469,5 +656,65 @@
       group: "{{ user_group_name }}"
     with_fileglob: /var/lib/dotfiles/autostart/services/*
 
+  - name: get state of autostart.target
+    stat:
+      path: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+    register: autostart_target_stat
+
+  - name: remove invalid autostart.target
+    file:
+      path: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+      state: absent
+    when:
+      - autostart_target_stat.stat.exists
+      - not autostart_target_stat.stat.isreg
+
+  - name: deploy autostart.target
+    template:
+      src: ./autostart/autostart.target.j2
+      dest: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+      owner: "{{ user.name }}"
+      group: "{{ user_group_name }}"
+      force: true
+      follow: false
+
   tags:
     - autostart
+
+- block:
+  - name: import gpg key
+    command: gpg --import ./gpgkeys/{{ user.gpg_key.email }}.gpg.asc
+    register: gpg_import_output
+    changed_when: not ("unchanged" in gpg_import_output.stderr)
+
+  - name: trust gpg key
+    shell: "gpg --import-ownertrust <<< {{ user.gpg_key.fingerprint }}:6"
+    args:
+      executable: /bin/bash # required for <<<
+    register: gpg_trust_output
+    changed_when: gpg_trust_output.stderr_lines|length > 0
+
+  when: user.gpg_key is defined
+  tags: [gpg]
+
+- block:
+  - name: add passwordstore init script
+    copy:
+      dest: /home/{{ user.name }}/.optbin/pass
+      owner: "{{ user.name }}"
+      group: "{{ user_group_name }}"
+      mode: '0755'
+      content: |
+        #!/usr/bin/env bash
+
+        if [[ ! -e ~/.password-store ]] ; then
+          printf '%s\n' 'This is the first time running pass, initializting repository ...'
+
+          git clone ssh://git@code.hkoerber.de:2222/hannes/passwordstore.git ~/.password-store
+
+          printf '%s\n' 'Done'
+        fi
+
+        exec mypass "${@}"
+  when: user.enable_passwordstore|default(false) is sameas true
+  tags: [passwordstore]

variables.yml

@@ -0,0 +1,42 @@
+terraform_version: 1.2.4
+kubectl_version: v1.24.2
+go_version: "1.18.3"
+portfolio_performace_version: "0.57.2"
+cargo_crate_list:
+  - crate: just
+    binary: just
+    version: 1.2.0
+  - crate: ripgrep
+    binary: rg
+    version: 13.0.0
+    features:
+      - pcre2
+      - simd-accel
+    toolchain: nightly # necessary for SIMD
+    required_packages:
+      - ubuntu: libpcre2-dev
+        archlinux: pcre2
+  - crate: fd-find
+    binary: fd
+    version: 8.4.0
+  - crate: bat
+    binary: bat
+    version: 0.21.0
+  - crate: exa
+    binary: exa
+    version: 0.10.1
+    toolchain: "1.60" # Fails with 1.61, see https://github.com/rust-lang/rust/issues/97255
+  - crate: watchexec-cli
+    binary: watchexec
+    version: 1.20.2
+  - crate: mdbook
+    binary: mdbook
+    version: 0.4.18
+  - url: https://github.com/hakoerber/git-repo-manager
+    binary: grm
+    branch: develop
+    source: git
+    toolchain: nightly
+    features:
+      - static-build
+    target: x86_64-unknown-linux-musl

vim/vimrc

@@ -4,60 +4,38 @@ call plug#begin('~/.local/share/nvim/plugged')
 
 " === plugins ===
 
-"Plug 'vim-airline/vim-airline'
+function! Cond(Cond, ...)
-"Plug 'vim-airline/vim-airline-themes'
+  let opts = get(a:000, 0, {})
-Plug 'itchyny/lightline.vim'
+  return a:Cond ? opts : extend(opts, { 'on': [], 'for': [] })
-Plug 'godlygeek/tabular'
+endfunction
-Plug 'lepture/vim-jinja'
-Plug 'majutsushi/tagbar'
-" Plug 'nblock/vim-dokuwiki'
-Plug 'reedes/vim-pencil'
-Plug 'saltstack/salt-vim'
-Plug 'sickill/vim-monokai'
-" Plug 'sjl/gundo.vim'
-Plug 'tpope/vim-commentary'
-Plug 'tpope/vim-fugitive'
-" Plug 'tpope/vim-speeddating'
-" Plug 'tpope/vim-surround'
-Plug 'airblade/vim-gitgutter'
-Plug 'junegunn/goyo.vim'
-Plug 'junegunn/limelight.vim'
-" Plug 'sheerun/vim-polyglot'
-" Plug 'freitass/todo.txt-vim'
-Plug 'Valloric/YouCompleteMe'
-Plug 'nathanaelkane/vim-indent-guides'
 
-"Plugin 'Lokaltog/vim-easymotion'
+" editing plugins
-"Plugin 'PeterRincker/vim-argumentative'
+Plug 'godlygeek/tabular', Cond(!exists('g:vscode'))
-"Plugin 'flazz/vim-colorschemes'
+Plug 'nathanaelkane/vim-indent-guides', Cond(!exists('g:vscode'))
-"Plugin 'jmcantrell/vim-virtualenv'
+Plug 'tpope/vim-commentary', Cond(!exists('g:vscode'))
-"Plugin 'kien/ctrlp.vim'
+Plug 'airblade/vim-gitgutter', Cond(!exists('g:vscode'))
-"Plugin 'klen/python-mode'
-"Plugin 'mbbill/undotree'
-Plug 'scrooloose/nerdtree'
-"Plugin 'sjl/gundo.vim'
-"Plugin 'terryma/vim-expand-region'
-"Plugin 'terryma/vim-multiple-cursors'
-"Plugin 'wellle/targets.vim'
-"Plugin 'wincent/Command-T'
-Plug 'vimwiki/vimwiki'
-"Plug 'blindFS/vim-taskwarrior'
-" Plug 'tbabej/taskwiki'
-Plug 'rodjek/vim-puppet'
-Plug 'suan/vim-instant-markdown'
-"Plug 'marshallward/vim-restructuredtext'
-"Plug 'vim-syntastic/syntastic'
-Plug 'ElmCast/elm-vim'
-Plug 'avh4/elm-format'
 
-Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+" ui
-Plug 'hashivim/vim-terraform'
+Plug 'sickill/vim-monokai', Cond(!exists('g:vscode'))
+Plug 'itchyny/lightline.vim', Cond(!exists('g:vscode'))
 
-Plug 'leafgarland/typescript-vim'
+" lang integrations
+Plug 'lepture/vim-jinja', Cond(!exists('g:vscode'))
+Plug 'fatih/vim-go', Cond(!exists('g:vscode'))
+Plug 'hashivim/vim-terraform', Cond(!exists('g:vscode'))
+Plug 'editorconfig/editorconfig-vim', Cond(!exists('g:vscode'))
+Plug 'rust-lang/rust.vim', Cond(!exists('g:vscode'))
+Plug 'rodjek/vim-puppet', Cond(!exists('g:vscode'))
+
+" helpers
+"" distraction free writing
+Plug 'junegunn/limelight.vim', Cond(!exists('g:vscode'))
+Plug 'junegunn/goyo.vim', Cond(!exists('g:vscode'))
+Plug 'reedes/vim-pencil', Cond(!exists('g:vscode'))
+
+"" markdown
+Plug 'suan/vim-instant-markdown', Cond(!exists('g:vscode'))
 
-Plug 'prettier/vim-prettier', {
-  \ 'do': 'yarn install',
-  \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml', 'html'] }
 
 call plug#end()
 filetype plugin indent on
@@ -91,7 +69,7 @@ set noerrorbells
 set noshowmode
 set numberwidth=2
 set relativenumber
-set shortmess=rti
+set shortmess=rtiF
 set ruler
 set scrolloff=7
 set title
@@ -160,6 +138,8 @@ set linebreak
 set wrap
 set wrapscan
 
+" == to use guicolors in terminal ==
+set termguicolors
 
 " === keybinds ===
 set pastetoggle=<F11>
@@ -184,78 +164,53 @@ map Y y$
 map j gj
 map k gk
 
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-
-nmap <C-n> :bnext<CR>
-nmap <C-p> :bprev<CR>
 
 map N Nzz
 map n nzz
 
 inoremap jj <ESC>
 
-nnoremap <leader>v <C-w>v<C-w>l
-
-nnoremap <leader>m :InstantMarkdownPreview<CR>
-
-nnoremap <leader>u :GundoToggle<CR>
-nnoremap <leader>d :diffupdate<CR>
-
-nmap <F9> :Goyo<CR>:TogglePencil<CR>:Limelight!!<CR>
-nmap <leader>w :Goyo<CR>:TogglePencil<CR>:Limelight!!<CR>
-
 " no more ex mode
 nnoremap Q <nop>
 
-" === autocommands ===
+" Use // in visual mode to search for selection
+" https://vim.fandom.com/wiki/Search_for_visually_selected_text
+vnoremap // y/\V<C-R>=escape(@",'/\')<CR><CR>
 
-"" autosave views when closing and restoring when opening again.
+if exists('g:vscode')
-"autocmd BufWinLeave *.* mkview
+    xmap gc  <Plug>VSCodeCommentary
-"autocmd BufWinEnter *.* silent loadview
+    nmap gc  <Plug>VSCodeCommentary
+    omap gc  <Plug>VSCodeCommentary
+    nmap gcc <Plug>VSCodeCommentaryLine
+else
+    nnoremap <C-h> <C-w>h
+    nnoremap <C-j> <C-w>j
+    nnoremap <C-k> <C-w>k
+    nnoremap <C-l> <C-w>l
 
-" === plugin setup ===
+    nmap <C-n> :bnext<CR>
+    nmap <C-p> :bprev<CR>
 
-" == colorscheme ==
+    nnoremap <leader>m :InstantMarkdownPreview<CR>
-set background=light
-let g:solarized_termcolors=16
-let g:solarized_termtrans=1
-let g:solarized_contrast="normal"
-let g:solarized_visibility="normal"
-syntax enable
-silent! colorscheme monokai
 
-" == tagbar ==
+    nnoremap <leader>u :GundoToggle<CR>
-nnoremap <F10> :TagbarToggle<CR>
+    nnoremap <leader>d :diffupdate<CR>
-let g:tagbar_map_jump = "i"
-let g:tagbar_left = 0
-let g:tagbar_vertical = 0
-let g:tagbar_width = 50
-let g:tagbar_autoclose = 1
-let g:tagbar_autofocus = 1
-let g:tagbar_sort = 0 " 1: sort by name, 0: sort by position
-let g:tagbar_compact = 1
-let g:tagbar_indent = 2
-let g:tagbar_show_linenumbers = 0
-let g:tagbar_foldlevel = 99 " unfold all
 
-" == airline ==
+    nmap <F9> :Goyo<CR>:TogglePencil<CR>:Limelight!!<CR>
-"let g:airline_right_sep = ''
+    nmap <leader>w :Goyo<CR>:TogglePencil<CR>:Limelight!!<CR>
-"let g:airline_left_sep = ''
-"let g:airline#extensions#disable_rtp_load = 1
-"let g:airline_extensions = ['whitespace']
-"let g:airline_theme='powerlineish'
-"let g:airline_powerline_fonts = 1
-"let g:airline_section_x = airline#section#create(['%{tagbar#currenttag("%s", "", "f")}','' , ' %{PencilMode()}', ' [', 'filetype', ']'])
-"let g:pencil#mode_indicators = {'hard': 'H', 'auto': 'A', 'soft': 'S', 'off': '',}
-"let g:airline#extensions#whitespace#enabled = 1
-"let g:airline#extensions#whitespace#symbol = ''
-"let g:airline#extensions#whitespace#checks = ['trailing']
 
-let g:lightline = {
+    nmap <leader>c :%w !xclip -selection clipboard<CR>
-      \ 'colorscheme': 'powerline',
+    nmap <leader>x :r !xclip -out -selection -clipboard<CR><CR>
+
+    nmap <leader>f :Autoformat<CR>
+
+    nnoremap <leader>v <C-w>v<C-w>l
+
+    syntax enable
+    silent! colorscheme monokai
+
+    let g:lightline = {
+      \ 'colorscheme': 'wombat',
       \ 'active': {
       \   'left': [ [ 'mode', 'paste' ],
       \             [ 'readonly', 'filename', 'modified', 'helloworld' ] ],
@@ -273,58 +228,44 @@ let g:lightline = {
       \ },
       \ }
 
-function! LightLineFilename()
+    function! LightLineFilename()
-    return fnamemodify(expand('%F'), ":~:h")
+        return fnamemodify(expand('%F'), ":~:h")
-endfunction
+    endfunction
 
-" == pencil ==
+    " == pencil ==
-let g:pencil#textwidth = 80
+    let g:pencil#textwidth = 80
-let g:pencil#autoformat = 1
+    let g:pencil#autoformat = 1
-let g:pencil#cursorwrap = 1
+    let g:pencil#cursorwrap = 1
-let g:pencil#wrapModeDefault = 'soft'
+    let g:pencil#wrapModeDefault = 'soft'
-let g:pencil#cursorwrap = 0
+    let g:pencil#cursorwrap = 0
 
-" == goyo ==
+    " == goyo ==
-let g:goyo_width = 100
+    let g:goyo_width = 100
-let g:goyo_height = "90%"
+    let g:goyo_height = "90%"
-let g:goyo_linenr = 0
+    let g:goyo_linenr = 0
 
-" == limelight ==
+    " == limelight ==
-let g:limelight_default_coefficient = 0.5
+    let g:limelight_default_coefficient = 0.5
 
-" === functions ===
+    " === functions ===
-function! DeleteTrailingWS()
+    function! DeleteTrailingWS()
-     exe "normal mz"
+        exe "normal mz"
-     %s/\s\+$//e
+        %s/\s\+$//e
-     exe "normal `z"
+        exe "normal `z"
-endfunction
+    endfunction
-autocmd BufWritePre * :call DeleteTrailingWS()
+    autocmd BufWritePre * :call DeleteTrailingWS()
 
-autocmd FileType yaml set shiftwidth=2
+    autocmd FileType yaml set shiftwidth=2
-set completeopt-=preview
+    autocmd FileType toml set shiftwidth=2
-let g:ycm_add_preview_to_completeopt = 0
+    autocmd FileType html setl shiftwidth=2
 
-set completeopt-=preview
+    let g:instant_markdown_autostart = 0
-let g:ycm_add_preview_to_completeopt = 0
 
-let g:instant_markdown_autostart = 0
+    let g:terraform_align = 1
+    let g:terraform_fmt_on_save=1
 
-let g:terraform_align = 1
+    let g:rustfmt_autosave = 1
-let g:terraform_fmt_on_save=1
 
-if has("autocmd")
+    " https://stackoverflow.com/a/8585343
-  au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
+    map <leader>q :bp<bar>sp<bar>bn<bar>bd<CR>
-endif
-
-let g:ycm_server_python_interpreter = "python3"
-
-au FileType html setl shiftwidth=2
-
-" Use // in visual mode to search for selection
-" https://vim.fandom.com/wiki/Search_for_visually_selected_text
-vnoremap // y/\V<C-R>=escape(@",'/\')<CR><CR>
-
-if v:version >= 700
-  au BufLeave * let b:winview = winsaveview()
-  au BufEnter * if(exists('b:winview')) | call winrestview(b:winview) | endif
 endif

vscode/keybindings.json

@@ -1,7 +0,0 @@
-// Place your key bindings in this file to override the defaultsauto[]
-[
-    {
-        "key": "ctrl+3",
-        "command": "workbench.action.terminal.focus"
-    }
-]

vscodium/install.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o pipefail
+set -o errexit
+
+codium --install-extension ms-vscode.cpptools
+codium --install-extension ms-python.python
+codium --install-extension rust-lang.rust-analyzer
+codium --install-extension asvetliakov.vscode-neovim
+codium --install-extension monokai.theme-monokai-pro-vscode
+codium --install-extension yzhang.markdown-all-in-one
+codium --install-extension puppet.puppet-vscode
+
+

vscodium/keybindings.json

@@ -0,0 +1,26 @@
+[
+//    {
+//        "key": "ctrl+3",
+//        "command": "workbench.action.terminal.focus"
+//    },
+    {
+        "key": "ctrl+alt+b",
+        "command": "workbench.action.toggleActivityBarVisibility"
+    },
+    {
+        "key": "ctrl+b",
+        "command": "workbench.action.toggleSidebarVisibility"
+    },
+    {
+        "command": "vscode-neovim.compositeEscape1",
+        "key": "j",
+        "when": "neovim.mode == insert && editorTextFocus",
+        "args": "j"
+    },
+    {
+        "command": "vscode-neovim.compositeEscape2",
+        "key": "k",
+        "when": "neovim.mode == insert && editorTextFocus",
+        "args": "k"
+    }
+]

vscodium/product.json

@@ -0,0 +1,9 @@
+{
+  "extensionsGallery": {
+    "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
+    "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
+    "itemUrl": "https://marketplace.visualstudio.com/items",
+    "controlUrl": "",
+    "recommendationsUrl": ""
+  }
+}

vscodium/settings.json

@@ -1,60 +1,73 @@
 {
-    "workbench.colorTheme": "Visual Studio Light",
+    "ansible.dockerImage": "",
-    "vim.neovimPath": "/usr/bin/nvim",
-    "explorer.confirmDelete": false,
-    "window.zoomLevel": 0,
-    "terraform.telemetry.enabled": false,
-    "editor.formatOnSave": true,
-    "vim.gdefault": true,
-    "vim.visualstar": true,
-    "vim.enableNeovim": true,
-    "git.detectSubmodulesLimit": 50,
-    "files.autoSave": "onFocusChange",
-    "editor.fontFamily": "'Inconsolata','Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'",
     "editor.accessibilitySupport": "off",
-    "editor.lineNumbers": "relative",
-    "editor.mouseWheelZoom": true,
-    "editor.renderWhitespace": "none",
     "editor.cursorSurroundingLines": 7,
-    "editor.minimap.renderCharacters": false,
+    "editor.fontFamily": "'Droid Sans Mono'",
+    "editor.formatOnSave": true,
+    "editor.lineNumbers": "off",
     "editor.minimap.showSlider": "always",
-    "editor.minimap.size": "fill",
+    "editor.renderWhitespace": "none",
+    "explorer.confirmDelete": false,
+    "explorer.confirmDragAndDrop": false,
+    "explorer.incrementalNaming": "smart",
+    "extensions.ignoreRecommendations": true,
     "files.eol": "\n",
     "files.hotExit": "off",
     "files.trimFinalNewlines": true,
     "files.trimTrailingWhitespace": true,
-    "workbench.enableExperiments": false,
+    "git.detectSubmodulesLimit": 50,
-    "workbench.startupEditor": "newUntitledFile",
-    "workbench.activityBar.visible": false,
-    "workbench.iconTheme": "material-icon-theme",
-    "workbench.tree.indent": 12,
-    "window.menuBarVisibility": "toggle",
-    "window.title": "${rootName}${separator}${dirty}${activeEditorShort}${separator}VSCode",
-    "explorer.confirmDragAndDrop": false,
-    "explorer.incrementalNaming": "smart",
-    "search.smartCase": true,
-    "extensions.ignoreRecommendations": true,
-    "terminal.external.linuxExec": "alacritty",
-    "problems.showCurrentInStatus": true,
     "problems.decorations.enabled": false,
-    "update.mode": "none",
+    "problems.showCurrentInStatus": true,
+    "rust-client.autoStartRls": false,
+    "rust-client.disableRustup": true,
+    "search.smartCase": true,
     "telemetry.enableCrashReporter": false,
     "telemetry.enableTelemetry": false,
-    "ansible.dockerImage": "",
+    "terminal.external.linuxExec": "",
-    "vim.cursorStylePerMode.normal": "block",
+    "terminal.integrated.mouseWheelScrollSensitivity": 3,
+    "terraform.telemetry.enabled": false,
+    "update.mode": "none",
     "vim.cursorStylePerMode.insert": "line",
+    "vim.cursorStylePerMode.normal": "block",
     "vim.cursorStylePerMode.replace": "underline",
     "vim.easymotion": true,
+    "vim.enableNeovim": true,
+    "vim.gdefault": true,
     "vim.hlsearch": true,
     "vim.leader": "<space>",
+    "vim.neovimPath": "/usr/bin/nvim",
+    "vim.vimrc.enable": true,
+    "vim.visualstar": true,
+    "editor.wordWrap": "off",
+    "vscode-neovim.neovimExecutablePaths.linux": "/usr/bin/nvim",
+    "window.menuBarVisibility": "toggle",
+    "window.title": "[code] ${rootName}${separator}${dirty}${activeEditorShort}${separator}VSCode",
     "workbench.colorCustomizations": {
         "statusBar.background": "#005f5f",
         "statusBar.noFolderBackground": "#005f5f",
         "statusBar.debuggingBackground": "#005f5f"
     },
-    "vim.vimrc.enable": true,
+    "workbench.enableExperiments": false,
-    "editor.fontSize": 15,
+    "workbench.iconTheme": "Monokai Classic Icons",
-    "rust-client.disableRustup": true,
+    "workbench.startupEditor": "newUntitledFile",
-    "rust-client.autoStartRls": false,
+    "workbench.tree.indent": 14,
-    "terminal.integrated.mouseWheelScrollSensitivity": 3
+    "security.workspace.trust.enabled": false,
-}
+    "scm.inputFontSize": 12,
+    "debug.console.fontSize": 12,
+    "terminal.integrated.fontSize": 12,
+    "files.autoSave": "onFocusChange",
+    "editor.fontWeight": "normal",
+    "editor.cursorStyle": "block",
+    "editor.minimap.renderCharacters": false,
+    "editor.minimap.size": "fit",
+    "workbench.colorTheme": "Monokai Classic",
+    "workbench.tree.renderIndentGuides": "always",
+    "breadcrumbs.icons": false,
+    "window.titleSeparator": " — ",
+    "explorer.excludeGitIgnore": true,
+    "puppet.editorService.formatOnType.enable": true,
+    "puppet.installType": "agent",
+    "puppet.installDirectory": "/usr/bin/puppet",
+    "window.zoomLevel": 0.1,
+    "workbench.activityBar.visible": false
+}

x/Xresources.j2

@@ -1,74 +1 @@
 Xcursor.theme: Vanilla-DMZ
-
-URxvt.scrollBar: false
-
-URxvt.font: xft:Inconsolata:size={{ machine.font_size }}
-URxvt.letterSpace: {{ machine.letter_space }}
-
-URxvt.perl-ext-common: default,matcher,selection-to-clipboard,resize-font,selection-to-clipboard
-URxvt.url-launcher: /usr/bin/xdg-open
-URxvt.matcher.button: 1
-URxvt.saveLines: 10000
-
-URxvt.keysym.C-udiaeresis: perl:matcher:last
-URxvt.keysym.C-adiaeresis: perl:matcher:list
-
-URxvt.matcher.rend.0: Uline Bold fg5
-
-URxvt.internalBorder: 3
-URxvt.externalBorder: 0
-
-URxvt.cursorBlink: true
-URxvt.title: term
-URxvt.jumpScroll: true
-URxvt.skipScroll: true
-URxvt.secondaryScreen: 1
-URxvt.secondaryScroll: 0
-URxvt.secondaryWheel: 1
-
-URxvt.keysym.C-Up:     font-size:increase
-URxvt.keysym.C-Down:   font-size:decrease
-URxvt.keysym.C-S-Up:   font-size:incglobal
-URxvt.keysym.C-S-Down: font-size:decglobal
-URxvt.keysym.C-equal:  font-size:reset
-URxvt.keysym.C-slash:  font-size:show
-
-
-URxvt.fading: 15
-
-! special
-*.foreground:   #f8f8f2
-*.background:   #272822
-*.cursorColor:  #f8f8f2
-
-! black
-*.color0:       #272822
-*.color8:       #75715e
-
-! red
-*.color1:       #f92672
-*.color9:       #f92672
-
-! green
-*.color2:       #a6e22e
-*.color10:      #a6e22e
-
-! yellow
-*.color3:       #f4bf75
-*.color11:      #f4bf75
-
-! blue
-*.color4:       #66d9ef
-*.color12:      #66d9ef
-
-! magenta
-*.color5:       #ae81ff
-*.color13:      #ae81ff
-
-! cyan
-*.color6:       #a1efe4
-*.color14:      #a1efe4
-
-! white
-*.color7:       #f8f8f2
-*.color15:      #f9f8f5

x/xinitrc

@@ -20,6 +20,7 @@ fi
 
 start_wm() {
     log "starting i3"
+    systemctl --user import-environment
     systemctl --user start windowmanager.target
     sleep 1
     systemctl --user start autostart.target

zsh/zprofile.j2

@@ -1,25 +1,19 @@
-_path=("$HOME/bin"
+source /etc/profile
-       "$HOME/.optbin"
+
-       "/usr/local/sbin"
+_path=(
-       "/usr/local/bin"
+    "$HOME/bin"
-       "/usr/sbin"
+    "$HOME/.optbin"
-       "/usr/bin"
+    "$HOME/.cargo/bin"
-       "/sbin"
+)
-       "/bin"
-       "/usr/bin/core_perl"
-       "/usr/games")
 
-PATH=""
 for part in ${_path[@]} ; do
-    PATH="$PATH:${part}"
+    PATH="${part}:$PATH"
 done
-PATH="${PATH#:}"
 export PATH
 
 export EDITOR="nvim"
 export VISUAL="nvim"
 export BROWSER="firefox"
-export TERMBIN="{{ machine.terminal_binary }}"
 
 export PAGER="less"
 export LESS="FRX"
@@ -39,9 +33,7 @@ export LC_COLLATE=C
 
 export DOTFILES=~/dotfiles
 
-export GOPATH=~/dev/go
+export GOPATH=~/.go
-export GOROOT=/usr/lib/go
-
 export PATH=$PATH:$(go env GOPATH)/bin
 
 export ACPI_LID_NAME=LID
@@ -55,6 +47,22 @@ umask 0022
 export {{ k }}="{{ v }}"
 {% endfor %}
 
+export FEATURE_DIR="${RUNDIR}/features/"
+rm -rf "${FEATURE_DIR}"/
+mkdir -p "${FEATURE_DIR}"
+
+[[ $MACHINE_HAS_NEXTCLOUD     == "true" ]] && touch "${FEATURE_DIR}"/nextcloud
+[[ $MACHINE_HAS_KEEPASSX      == "true" ]] && touch "${FEATURE_DIR}"/keepassx
+[[ $MACHINE_HAS_STEAM         == "true" ]] && touch "${FEATURE_DIR}"/steam
+[[ $MACHINE_HAS_RESTIC_BACKUP == "true" ]] && touch "${FEATURE_DIR}"/restic_backup
+[[ $MACHINE_HAS_ELEMENT       == "true" ]] && touch "${FEATURE_DIR}"/element
+
+[[ $MACHINE_TYPE == "laptop" ]] && touch "${FEATURE_DIR}"/machine_is_laptop
+
+{% if user.gpg_agent %}
+touch "${FEATURE_DIR}"/gpg_agent
+{% endif %}
+
 # Make all environment variables also usable in the systemd user instancee
 systemctl --user import-environment
 

zsh/zshrc.d/20_aliases.sh

@@ -1,8 +1,9 @@
 alias vim="nvim"
 
-### COMMON OPERATIONS
+### BETTER COMMANDS
-alias ll='ls -AlFh'
+alias ls="exa --oneline --icons --group-directories-first"
-alias la='ls -A'
+alias ll='ls --all --long --classify --group --modified --time-style=long-iso --git'
+alias la='ls --all'
 
 alias spm="sudo pacman"
 
@@ -31,8 +32,6 @@ alias tmux="tmux -2"
 alias chmod="chmod -c"
 alias chown="chown -c"
 
-alias ls="ls --group-directories-first --classify --color=auto"
-
 alias diff="diff --color=auto"
 
 alias grep='grep --color=auto'
@@ -68,13 +67,11 @@ alias twa="task add"
 alias twd="task done"
 alias inbox="task add +inbox"
 
-alias yaml2json="python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)'"
+alias yaml2json="python3 -c 'import sys, yaml, json; json.dump([d for d in yaml.safe_load_all(sys.stdin)][-1], sys.stdout, indent=4)'"
-alias json2yaml="python -c 'import sys, yaml, json; yaml.safe_dump(json.loads(sys.stdin.read()), stream=sys.stdout)'"
+alias json2yaml="python3 -c 'import sys, yaml, json; yaml.safe_dump(json.loads(sys.stdin.read()), stream=sys.stdout)'"
 
 alias currentbranch='git rev-parse --abbrev-ref HEAD'
 
-alias pass=mypass
-
 alias issh="ssh -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null"
 alias gfix='git commit --amend --no-edit'
 alias gfixa='git commit --amend --no-edit --all '
@@ -89,6 +86,11 @@ alias sysu="systemctl --user"
 
 alias gpg=gpg2
 
+alias alacritty="alacritty --config-file $HOME/.config/alacritty.yml"
+
+alias d=docker
+alias dc=docker-compose
+
 gitmaster() {
     git stash push -m gitmaster-$(date -uIseconds) -u || return 1
     _branch=$(git rev-parse --abbrev-ref HEAD)
@@ -241,10 +243,6 @@ man() {
         man "$@"
 }
 
-embiggen() {
-    enscript --no-header --media=A4 --landscape --font="DejaVuSansMono30" -o - | ps2pdf - | zathura -
-}
-
 resolvecd() {
     cd "$(readlink -f $(pwd))"
 }

zsh/zshrc.d/40_functions.sh

@@ -141,7 +141,7 @@ man() {
 }
 
 embiggen() {
-    enscript --no-header --media=A4 --landscape --font="DejaVuSansMono30" -o - | ps2pdf - | zathura -
+    enscript --no-header --media=A4 --landscape --font="DejaVuSansMono30" -o - 2>/dev/null | ps2pdf - | zathura -
 }
 
 resolvecd() {
@@ -214,3 +214,33 @@ kubectl_pod() {
 kubectl_deployment() {
     kubectl-env mycloud get -n "${1}" deployment --selector=${2} -o jsonpath='{.items[*].metadata.name}'
 }
+
+# The semver_ checks are inspired by
+# https://stackoverflow.com/questions/4023830/how-to-compare-two-strings-in-dot-separated-version-format-in-bash
+semver_lte() {
+    v1="${1}"
+    v2="${2}"
+
+    printf '%s\n%s' "${v1}" "${v2}" | sort --version-sort --check=silent
+}
+
+semver_lt() {
+    v1="${1}"
+    v2="${2}"
+
+    semver_lte "${v1}" "${v2}" && [[ ! "${v1}" == "${v2}" ]]
+}
+
+semver_gte() {
+    v1="${1}"
+    v2="${2}"
+
+    ! semver_lt "${v1}" "${v2}"
+}
+
+semver_gt() {
+    v1="${1}"
+    v2="${2}"
+
+    ! semver_lte "${v1}" "${v2}"
+}

zsh/zshrc.j2

@@ -18,3 +18,16 @@ if [[ -f /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]] ; the
 elif [[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]] ; then
     source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 fi
+
+{% if user.ssh_agent %}
+if ! pgrep -u "$USER" ssh-agent > /dev/null ; then
+    ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
+fi
+if [[ ! "$SSH_AUTH_SOCK" ]]; then
+    source "$XDG_RUNTIME_DIR/ssh-agent.env" >/dev/null
+fi
+{% endif %}
+
+{% if distro == 'ubuntu' %}
+alias imv=imv-x11
+{% endif %}