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

Makefile

@@ -1,17 +1,16 @@
-venv = ./venv
-requirements = requirements.txt
-activate = . $(venv)/bin/activate
-pip = pip
-ansible = venv/bin/ansible-playbook
-ansible_run = $(activate) && ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff --verbose ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
+ansible_run = ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
 
 .PHONY: all
-all: | venv $(ansible)
+all:
 	$(ansible_run)
 
-.PHONY: update
-update: $(ansible)
-	$(ansible_run) --tags update
+.PHONY: config
+config:
+	$(ansible_run) --skip-tags system-update
+
+.PHONY: system-update
+system-update:
+	$(ansible_run) --tags system-update
 
 .PHONY: reboot
 reboot:
@@ -25,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

@@ -15,8 +15,18 @@ users:
         - 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_agent_for_ssh: true
   gpg_key:
@@ -45,9 +55,9 @@ screen:
 screencfgs: []
 
 workspace:
-  1: www
-  9: comm
-  10: music
+  1: ""
+  9: ""
+  10: ""
 
 environment:
   MACHINE_TYPE: "workstation"

_machines/mars.yml

@@ -18,6 +18,7 @@ users:
       manage_css: false
   mail: hannes.koerber@tradebyte.com
   git_gpg_sign: false
+  ssh_agent: true
   gpg_agent: false
   gpg_agent_for_ssh: false
   environment:
@@ -42,6 +43,7 @@ users:
       manage_css: true
   mail: hannes@hkoerber.de
   git_gpg_sign: false
+  ssh_agent: false
   gpg_agent: true
   gpg_agent_for_ssh: true
   gpg_key:
@@ -71,14 +73,14 @@ screen:
   0: eDP-1
 
 workspace:
-  1: www
-  2: www
-  3: term-local
-  4: term-remote
-  7: comm
-  8: pass
-  9: music
-  10: pim
+  1: ""
+  2: ""
+  3: " local"
+  4: " remote"
+  7: ""
+  8: ""
+  9: ""
+  10: ""
 
 screencfgs:
   - name: three-screens

_machines/neptune.yml

@@ -18,6 +18,7 @@ users:
       manage_css: false
   mail: hannes.koerber@tradebyte.com
   git_gpg_sign: false
+  ssh_agent: true
   gpg_agent: false
   gpg_agent_for_ssh: false
   environment:
@@ -27,6 +28,10 @@ users:
     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
@@ -42,6 +47,7 @@ users:
       manage_css: true
   mail: hannes@hkoerber.de
   git_gpg_sign: false
+  ssh_agent: false
   gpg_agent: true
   gpg_agent_for_ssh: true
   gpg_key:
@@ -59,26 +65,26 @@ users:
     - 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
+  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: www
-  2: www
-  3: term-local
-  4: term-remote
-  7: comm
-  8: pass
-  9: music
-  10: pim
+  1: ""
+  2: ""
+  3: " local"
+  4: " remote"
+  7: ""
+  8: ""
+  9: ""
+  10: ""
 
 screencfgs:
   - name: three-screens

alacritty/alacritty.yml.j2

@@ -21,7 +21,7 @@ env:
   # 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: xterm-256color
+  TERM: alacritty
 
 window:
   # Window dimensions (changes require restart)
@@ -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'

autostart/autostart.target.j2

@@ -6,8 +6,15 @@ Wants=blueman.service
 Wants=dpms.service
 Wants=dunst.service
 Wants=element.service
-{% for profile in (user.firefox_profiles|default({})).keys() %}
+{% 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
@@ -25,4 +32,5 @@ Wants=steam.service
 Wants=touchpad.service
 Wants=xresources.service
 Wants=yubikey-touch-detector.service
+Wants=kdeconnect.service
 

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/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/restic.service

@@ -3,6 +3,6 @@ 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/yubikey-touch-detector.service

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

bin/check

@@ -2,7 +2,7 @@
 
 set -o errexit
 
-cd ~/projects/personal/time-tracking/
+cd ~/code/personal/time-tracking/
 source venv/bin/activate
 source ~/.attendance_env
 

bin/dunstctl

@@ -8,13 +8,13 @@ log() {
     printf '[%s] %s\n' "$(date -uIseconds)" "$*" >> "$_logfile"
 }
 
-case "$1" in
-    enable)
+case "$1 $2" in
+    "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/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)

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
@@ -50,10 +53,12 @@ dotfiles:
     template: true
   - from: redshift/redshift.conf
     to: .config/redshift.conf
-  - from: vscode/settings.json
-    to: .config/Code/User/settings.json
-  - from: vscode/keybindings.json
-    to: .config/Code/User/keybindings.json
+  - from: vscodium/product.json
+    to: .config/VSCodium/product.json
+  - from: vscodium/settings.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
@@ -62,6 +67,9 @@ dotfiles:
   - 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

dunst/dunstrc.j2

@@ -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

@@ -120,3 +120,5 @@
 
 [init]
 	defaultBranch = master
+[safe]
+	directory = /var/lib/dotfiles

grm/personal_projects.toml

@@ -6,7 +6,7 @@ name = "misc/rbackupd"
 
 [[trees.repos.remotes]]
 name = "github"
-url = "git@github.com:hakoerber/rbackupd.git"
+url = "ssh://git@github.com/hakoerber/rbackupd.git"
 type = "ssh"
 
 [[trees.repos]]
@@ -59,7 +59,7 @@ name = "misc/wifiqr"
 
 [[trees.repos.remotes]]
 name = "github"
-url = "ssh://git@github.com/hakoerber/wifi-qr.git"
+url = "ssh://git@github.com/hakoerber/wifiqr.git"
 type = "ssh"
 
 [[trees.repos]]
@@ -74,7 +74,7 @@ type = "ssh"
 name = "misc/xftwidth"
 
 [[trees.repos.remotes]]
-name = "origin"
+name = "github"
 url = "ssh://git@github.com/hakoerber/xftwidth.git"
 type = "ssh"
 
@@ -83,10 +83,6 @@ name = "upstream"
 url = "https://github.com/vixus0/xftwidth"
 type = "https"
 
-[[trees.repos]]
-name = "x-hidecursor"
-remotes = []
-
 [[trees.repos]]
 name = "git-repo-manager"
 
@@ -124,11 +120,6 @@ name = "github"
 url = "ssh://git@github.com/hakoerber/acimaker.git"
 type = "ssh"
 
-[[trees.repos.remotes]]
-name = "private"
-url = "git@code.sys.haktec.de:container/acimaker.git"
-type = "ssh"
-
 [[trees.repos]]
 name = "container/drone-kaniko"
 
@@ -204,7 +195,11 @@ type = "ssh"
 
 [[trees.repos]]
 name = "lea-michael-hochzeit"
-remotes = []
+
+[[trees.repos.remotes]]
+name = "origin"
+url = "ssh://git@code.hkoerber.de:2222/hannes/lea-michi-hochzeit.git"
+type = "ssh"
 
 [[trees.repos]]
 name = "builddoc"
@@ -236,11 +231,11 @@ url = "ssh://git@github.com/hakoerber/fizzbuzz.git"
 type = "ssh"
 
 [[trees.repos]]
-name = "ggj/2018/the-lost-son"
+name = "ggj/2018-the-lost-son"
 
 [[trees.repos.remotes]]
 name = "origin"
-url = "ssh://git@github.com:niklas-heer/the-lost-son.git"
+url = "ssh://git@github.com/niklas-heer/the-lost-son.git"
 type = "ssh"
 
 [[trees.repos]]
@@ -248,7 +243,7 @@ name = "ggj/2019-claim-your-world"
 
 [[trees.repos.remotes]]
 name = "origin"
-url = "ssh://git@github.com:theintroverts/claim-your-world.git"
+url = "ssh://git@github.com/theintroverts/claim-your-world.git"
 type = "ssh"
 
 [[trees.repos]]
@@ -313,5 +308,18 @@ type = "ssh"
 
 [[trees.repos.remotes]]
 name = "origin"
-url = "ssh://git@code.hkoerber.de:2222/hakoerber/aws-glacier-backup.git"
+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,6 +1,6 @@
 [Settings]
 gtk-theme-name=Breeze
-gtk-icon-theme-name=breeze-dark
+gtk-icon-theme-name=breeze
 gtk-font-name=DejaVu Sans {{ machine.font_size|int - 2 }}
 gtk-cursor-theme-name=breeze_cursors
 gtk-cursor-theme-size=0

gtk/gtkrc-2.0.j2

@@ -2,7 +2,7 @@
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
 gtk-theme-name="Breeze"
-gtk-icon-theme-name="breeze-dark"
+gtk-icon-theme-name="breeze"
 gtk-font-name="DejaVu Sans {{ machine.font_size| int - 2 }}"
 gtk-cursor-theme-name="breeze_cursors"
 gtk-cursor-theme-size=0

i3/config.j2

@@ -226,27 +226,7 @@ assign [class="^Wine$"] $workspace10
 
     bindsym $mod+Shift+v exec --no-startup-id redshift-toggle
 
-    # bindsym $mod+$pim_toggle \
-    #     mark --add _source; \
-    #     focus output eDP-1; \
-    #     mark --add _origin; \
-    #     workspace $workspace10; \
-    #     mark --add _destination; \
-    #     [con_mark="^_destination$"] swap container with mark "_source"; \
-    #     [con_mark="^_source$"]      focus; unmark _source; \
-    #     [con_mark="^_origin$"]      focus; unmark _origin; \
-    #     [con_mark="^_destination$"] focus; unmark _destination; \
-
-    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;
+    bindsym $mod+$pim_toggle exec --no-startup-id ~/.i3/scripts/swap-from-workspace.sh $workspace10
 
 ################################################################################
 ### MODES ######################################################################
@@ -319,10 +299,10 @@ assign [class="^Wine$"] $workspace10
 ################################################################################
 
 # class                 border  backgr. text    indicator
-client.focused          #E16B40 #E16B40 #000000 #FF0000
-client.focused_inactive #333333 #5f676a #ffffff #484e50
-client.unfocused        #333333 #202020 #cccccc #292d2e
-client.urgent           #2f343a #900000 #ffffff #900000
+client.focused          #e5b567 #e5b567 #000000 #FF0000
+client.focused_inactive #272822 #5f676a #ffffff #484e50
+client.unfocused        #1C1C1C #272822 #cccccc #292d2e
+client.urgent           #272822 #ff7777 #000000 #900000
 
 ################################################################################
 ### APPLICATION SPECIFIC SETTINGS ##############################################
@@ -378,19 +358,19 @@ bar {
     font pango:Inconsolata, FontAwesome {{ machine.font_size }}
 
     colors {
-        background #272822
+        background #000000
         statusline #ffffff
-        separator #444444
-        # separator #e16b40
+        separator #555555
 
-        # focused_background #303030
-        # focused_separator #272822
+        focused_separator #e5b567
+        focused_background #272822
 
-        focused_workspace  #e16b40 #272822 #ffffff
-        active_workspace   #272822 #5f676a #ffffff
+        #                  border  bg      text
+        focused_workspace  #e5b567 #4f676a #ffffff
+        active_workspace   #272822 #4f676a #ffffff
         inactive_workspace #272822 #272822 #dddddd
-        urgent_workspace   #D00000 #D00000 #272822
-        binding_mode       #272822 #e16b40 #272822
+        urgent_workspace   #272822 #ff7777 #272822
+        binding_mode       #272822 #e5b567 #272822
     }
 
     i3bar_command i3bar

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

@@ -52,7 +52,7 @@ _install() {
     _package="$1" ; shift
     if [[ $NAME == "Ubuntu" ]] ; then
         if ! (( cache_updated )) ; then
-            apt-get update
+            sudowrap apt-get update
             cache_updated=1
         fi
         sudowrap apt-get install --assume-yes "${_package}"
@@ -68,7 +68,6 @@ _install() {
 if ! command -v python3 >/dev/null ; then
     printf 'Python3 not installed, installing ...\n'
     _install "python3"
-    _install "python3-venv"
     printf 'Done\n'
 fi
 
@@ -78,21 +77,13 @@ if ! command -v make >/dev/null ; then
     printf 'Done\n'
 fi
 
-# Required for compiling modules in venv.
-if ! command -v gcc >/dev/null ; then
-    printf 'gcc not installed, installing ...\n'
-    _install "gcc"
-    printf 'Done\n'
+if [[ $NAME == "Arch Linux" ]] ; then
+    _install "ansible"
 fi
 
-if ! python3 -c 'import venv' 2>/dev/null ; then
-    printf 'Python3 venv module not installed, installing ...\n'
-    _install python3-venv
-    printf 'Done\n'
+if [[ $NAME == "Ubuntu" ]] ; then
+    _install "ansible"
+    _install "python3-jmespath"
 fi
 
 cd "$DOTDIR" && make
-
-# fix permissions of the directory
-sudowrap chgrp -R dotfiles "${DOTDIR}"
-sudowrap chmod g+wX "${DOTDIR}"

packages.yml

@@ -183,6 +183,9 @@ packages:
         - python-ruamel-yaml
         - python-gitpython
         - python-semver
+    black:
+      ubuntu: ["black"]
+      archlinux: ["python-black"]
     xbacklight:
       ubuntu: ["xbacklight"]
       archlinux: ["xorg-xbacklight"]
@@ -377,7 +380,16 @@ packages:
       archlinux: ["ncdu"]
     font-utils:
       ubuntu: ["woff-tools", "woff2"]
-      archinux: ["woff2"]
+      archlinux: ["woff2"]
+    jq:
+      ubuntu: ["jq"]
+      archlinux: ["jq"]
+    musl:
+      ubuntu: ["musl", "musl-tools"]
+      archlinux: ["musl"]
+    kdeconnect:
+      ubuntu: ["kdeconnect"]
+      archlinux: ["kdeconnect"]
 
   remove:
     mousepad:

playbook.yml

@@ -49,6 +49,19 @@
           become: true
         when: distro == 'ubuntu'
 
+      - block:
+        - name: install ansible requirements
+          package:
+            name: "{{ packages[distro] }}"
+            state: present
+          become: true
+          vars:
+            packages:
+              archlinux:
+                - python-jmespath
+              ubuntu:
+                - python3-jmespath
+
       - block:
         - name: enable multilib repository
           blockinfile:
@@ -81,13 +94,95 @@
             state: present
           become: true
 
-        - name: clean cache
-          command: paccache -rk2 -ruk0
-          become: true
-          changed_when: false
+        - block:
+          - name: install pacman cache clean service
+            copy:
+              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]
+      tags: [system-update]
+
+    - block:
+      - name: create dotfiles group
+        group:
+          name: dotfiles
+          state: present
+        become: true
+        become_user: root
+
+      - 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
@@ -101,9 +196,6 @@
           name:
             - base-devel
             - git
-            - cargo
-            - asp
-            - bat
         become: true
 
       - name: create build user on arch
@@ -138,7 +230,7 @@
         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
@@ -156,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
-          tar xvf paru.tar.gz
-          cd paru
+          curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz
+          tar xvf paru-bin.tar.gz
+          cd paru-bin
           makepkg
         args:
           executable: /bin/bash
@@ -170,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
@@ -186,7 +278,7 @@
           file: packages.yml
 
       - name: force-update iptables to iptables-nft on arch
-        shell: pacman -Q iptables-nft || yes | pacman -S iptables-nft
+        shell: pacman -Q iptables && yes | pacman -S iptables-nft
         changed_when: false
         become: true
         when: distro == 'archlinux'
@@ -211,6 +303,15 @@
         assert:
           that: "defined_packages_remove|length == distro_packages_remove|length"
 
+      - name: remove packages
+        package:
+          name: "{{ packages|json_query(query) }}"
+          state: absent
+        become: true
+        vars:
+          query: "{{ 'remove.*.%s[]'|format(distro) }}"
+        when: distro != 'ubuntu'
+
       - name: install packages
         package:
           name: "{{ packages|json_query(query) }}"
@@ -220,12 +321,14 @@
           query: "{{ 'list.*.%s[]'|format(distro) }}"
 
       - name: remove packages
-        package:
+        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:
@@ -400,8 +503,18 @@
           system: true
         become: true
 
+      - set_fact:
+          cargo_env: . ~/.cargo/env
+        when: distro == 'ubuntu'
+
+      - set_fact:
+          # Do NOT just use `"true"`. Due to some YAML fuckery, it will be
+          # capitalized and the commands will fail.
+          cargo_env: "/bin/true"
+        when: distro == 'archlinux'
+
       - name: install rustup on ubuntu
-        shell: curl https://sh.rustup.rs -sSf | sh -s -- -y
+        shell: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal
         args:
           creates: /var/lib/rust_build/.cargo/bin/rustup
         become: true
@@ -409,38 +522,62 @@
         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: update rustup stable toolchain
-        shell: . ~/.cargo/env && rustup update stable
+        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
+        shell: "{{ cargo_env }} && rustup toolchain install nightly"
         become: true
         become_user: rust_build
         changed_when: false
 
-      - name: update rustup nightly toolchain
-        shell: . ~/.cargo/env && rustup update nightly
+      - 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
+          {{ cargo_env }}
 
-          rustup run {{ item.toolchain|default('stable') }} cargo install --version {{ item.version }} {{ item.crate }}
-          mv /var/lib/rust_build/.cargo/bin/{{ item.binary }} /var/lib/rust_build/.cargo/bin/{{ item.binary }}.{{ item.version }}
+          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/{{ item.binary }}.{{ item.version }}
+          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 }}"
@@ -449,10 +586,11 @@
       - name: build rust crates from git
         shell: |
           set -o errexit
-          . ~/.cargo/env
-          rustup run {{ item.toolchain|default('stable') }} cargo install --git {{ item.url }} --branch {{ item.branch }}
+          {{ 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/{{ item.binary }}
+          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 }}"
@@ -469,27 +607,27 @@
 
       - name: move binaries for crates.io
         shell: |
-          mv /var/lib/rust_build/.cargo/bin/{{ item.binary }}.{{ item.version }} /usr/local/lib/binaries/{{ item.binary }}.{{ item.version }}
-          ln -s /usr/local/lib/binaries/{{ item.binary }}.{{ item.version }} /var/lib/rust_build/.cargo/bin/{{ item.binary }}.{{ item.version }}
+          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/{{ item.binary }}.{{ item.version }}
+          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/{{ item.binary }} /usr/local/lib/binaries/{{ item.binary }}
-          ln -s /usr/local/lib/binaries/{{ item.binary }} /var/lib/rust_build/.cargo/bin/{{ item.binary }}
+          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/{{ item.binary }}
+          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/{{ item.binary }}.{{ item.version }}
+          src: /usr/local/lib/binaries/{{ binary_id_cratesio }}
           dest: /usr/local/bin/{{ item.binary }}
           owner: root
           group: root
@@ -501,7 +639,7 @@
 
       - name: link binaries for git
         file:
-          src: /usr/local/lib/binaries/{{ item.binary }}
+          src: /usr/local/lib/binaries/{{ binary_id_git }}
           dest: /usr/local/bin/{{ item.binary }}
           owner: root
           group: root
@@ -510,6 +648,57 @@
         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
 
@@ -529,6 +718,7 @@
           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:
@@ -565,7 +755,7 @@
         copy:
           dest: /etc/profile.d/go.sh
           content: |
-            export PATH=$PATH:/usr/local/go/bin
+            export PATH=/usr/local/go/bin:$PATH
             export GOROOT=/usr/local/go
           owner: root
           group: root
@@ -598,12 +788,16 @@
         tempfile:
           state: directory
         register: alacritty_build_tempdir
+        become: true
+        become_user: rust_build
         when: not alacritty_binary.stat.exists
 
       - name: build alacritty
-        command: cargo install alacritty --root ./out
+        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
@@ -615,6 +809,8 @@
         file:
           path: "{{ alacritty_build_tempdir.path }}"
           state: absent
+        become: true
+        become_user: rust_build
         when: not alacritty_binary.stat.exists
 
       when: distro == 'ubuntu'
@@ -633,7 +829,7 @@
         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 get -u github.com/maximbaz/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
@@ -650,6 +846,7 @@
         file:
           path: "{{ yubikey_touch_detector_build_tempdir.path }}"
           state: absent
+        become: true
         when: not yubikey_touch_detector_binary.stat.exists
 
       when: distro == 'ubuntu'
@@ -659,8 +856,8 @@
       - block:
         - name: add spotify apt key
           apt_key:
-            url: "https://download.spotify.com/debian/pubkey_0D811D58.gpg"
-            id: "D1742AD60D811D58"
+            url: "https://download.spotify.com/debian/pubkey_5E3C45D7B312C643.gpg"
+            id: "5E3C45D7B312C643"
           become: true
 
         - name: add spotify repository
@@ -679,7 +876,7 @@
       - block:
         - name: install spotify from AUR via paru
           shell: |
-            curl -sS https://download.spotify.com/debian/pubkey_0D811D58.gpg | gpg --import
+            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
@@ -689,34 +886,6 @@
 
       tags: [spotify]
 
-    - name: create dotfiles group
-      group:
-        name: dotfiles
-        state: present
-      become: true
-      become_user: root
-
-    - 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
-
     - set_fact:
         users: "{{ machine.users }}"
       tags:

requirements.txt

@@ -1,12 +0,0 @@
-ansible==4.6.0
-ansible-core==2.11.5
-cffi==1.14.6
-cryptography==35.0.0
-Jinja2==3.0.1
-jmespath==0.10.0
-MarkupSafe==2.0.1
-packaging==21.0
-pycparser==2.20
-pyparsing==2.4.7
-PyYAML==5.4.1
-resolvelib==0.5.4

screencfg/neptune/default.yml

@@ -6,9 +6,13 @@ outputs:
       mode: 1920x1080
       scale: 1x1
       pos: "0x0" # beware of hex
-  - name: DP-1-1
+  - name: DP-1
     disable: true
-  - name: DP-1-2
+  - name: DP-2
     disable: true
-  - name: DP-1-3
+  - name: DP-3
+    disable: true
+  - name: DP-4
+    disable: true
+  - name: DP-5
     disable: 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-gothic2.sh

@@ -1,14 +1,22 @@
 #!/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
 
-BASEDIR=/var/games/gothic2
+
+STEAMAPPS=/var/games/steamapps/
+
+BASEDIR="${STEAMAPPS}/common/Gothic II"
 
 export GAMEDATA=${BASEDIR}/data/
 export ARCHIVE=${BASEDIR}/gothic2.data.tar.zstd
-export WINEPREFIX=${BASEDIR}/wineprefix
+export WINEPREFIX="${STEAMAPPS}/compatdata/39510/pfx/"
 export WINEARCH=win64
 
 export WINEVERSION=6.3
@@ -17,17 +25,17 @@ DOWNLOADDIR=~/download/gothic2
 
 mkdir -p "${WINEPREFIX}"
 
-if [[ "$(wine --version)" != "wine-${WINEVERSION}" ]] ; then
-    printf '%s\n' "Wine version ${WINEVERSION} required" >&2
-    exit 1
-fi
+# 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 "$1" .
+    tar -cv --zstd -p -f "${ARCHIVE}" -C "${GAMEDATA}" .
 }
 
 extract() {
@@ -118,16 +126,12 @@ case $1 in
 
         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 "http://www.gothic-dx11.de/download/Normalmaps_LHiver.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
 
-        laatmp=$(mktemp -d)
-
-        unzip -o LaaHack.zip -d "${laatmp}"
-
         # winetricks -q dxvk
         winetricks -q directmusic
         if command -v setup_dxvk >/dev/null ; then
@@ -137,7 +141,7 @@ case $1 in
             winetricks dxvk
         fi
 
-        read -p 'During installation, use "Z:\var\games\gothic2\data" as the install directory! <Enter> to continue, <CTRL+C> to abort '
+        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
@@ -150,13 +154,26 @@ case $1 in
 
         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}"
@@ -165,7 +182,6 @@ case $1 in
         read -p "Now run the game once and exit! [<Enter> to continue] "
 
         ini
-        ln Data/ModVDF/LHE204_DE.mod Data/LHE204_DE.mod
         ;;
     ini)
         ini

test-in-docker.sh

@@ -21,6 +21,8 @@ gzip -k -f -v "${tmpdir}/dotfiles.tar"
 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 \
@@ -38,10 +40,10 @@ test_ares() {
             # At worst, the cache directory will be ignored if it does not exist
             # Pacman will always prefer the first cache directory, so newly downloaded
             # packages will stay in the container
-            sed -i '"'"'s/^#\?\(CacheDir.*\)/\1\nCacheDir = \/var\/cache\/pacman\/pkg_host\//'"'"' /etc/pacman.conf
+            sed -i '"'"'s/^#\?\(CacheDir.*\)/CacheDir = \/var\/cache\/pacman\/pkg_host\/\n\1/'"'"' /etc/pacman.conf
 
-            pacman -Syu --noconfirm linux python3
-            mkdir /var/cache/pacman/pkg_host/
+            mkdir -p /var/cache/pacman/pkg_host/
+            pacman -Syu --noconfirm linux
             cd $(mktemp -d)
             tar xf /tmp/dotfiles.tar.gz -C .
             ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh

tmux/tmux.conf

@@ -1,68 +1,76 @@
-set -g default-command "${SHELL}"
-set -g default-terminal "xterm-256color"
+set-option -g default-command "${SHELL}"
+# 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 -g set-titles-string '#S'
-setw -g automatic-rename
+set-option -g set-titles on
+set-option -g set-titles-string '#S'
+set-option -g automatic-rename
 
-set -g prefix C-a
-unbind C-b
-bind C-a send-prefix
+set-option -g escape-time 0
+set-option -g aggressive-resize on
 
-unbind C-j
+set-option -g mouse on
 
-set -s escape-time 0
-set-window-option -g aggressive-resize on
-
-set -g mouse on
-
-set -g mode-keys vi
+set-option -g mode-keys vi
 
 set-option -g renumber-windows on
 
-bind-key k confirm kill-window
-bind-key K confirm kill-server
+set-option -g history-limit 50000
 
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
+set-option -g base-index 1
+set-option -g pane-base-index 1
 
-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-window-option -g pane-base-index 1
+set-option -g pane-border-status off
+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 -g status-justify left
+set-option -g pane-border-style "fg=#555555"
+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 status-fg white
+set-option -g window-status-format ' #I: #W #F '
+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-window-option -g window-status-current-format ' #I: #W #F '
+set-option -g monitor-activity on
+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 -g visual-activity on
+set-option -g automatic-rename on
+set-option -g automatic-rename-format '#{pane_current_command}'
 
-set-window-option -g automatic-rename on
-set-window-option -g automatic-rename-format '#{pane_current_command}'
+set-option -g window-status-separator '  '
 
-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 -g status-right "#[bg=#CCCCCC,fg=#555555] #{host} #[bg=#272822] "
-set -g status-left-length 100
+set-option -g message-style "bg=#CCCCCC,fg=#555555"
 
-set -g status-style "bg=#272822,fg=#FFFFFF"
-set -g message-style "bg=#CCCCCC,fg=#555555"
+# Use C-a as the prefix
+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 '"'
+unbind-key %
+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

@@ -302,20 +302,6 @@
       src: ~/.vim/autoload/plug.vim
       force: true
 
-  - name: get ycm version before update
-    shell: |
-      if ! [[ -d ~/.local/share/nvim/plugged/YouCompleteMe ]] ; then
-          exit 200
-      fi
-      cd ~/.local/share/nvim/plugged/YouCompleteMe
-      git rev-parse HEAD
-    args:
-      executable: /bin/bash
-    register: ycm_before_update
-    changed_when: false
-    failed_when: ycm_before_update.rc not in (0, 200)
-    tags: [update]
-
   - name: install vim plugins
     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_plugin_install
@@ -329,39 +315,12 @@
     command: sh -c 'PATH=/usr/local/go/bin:$PATH GOROOT=/usr/local/go GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +PlugUpdate +qall'
     register: vim_plugin_update
     changed_when: vim_plugin_update.stderr != ""
-    tags: [update]
+    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: [update]
-
-  - name: get ycm version after update
-    shell: |
-      cd ~/.local/share/nvim/plugged/YouCompleteMe
-      git rev-parse HEAD
-    args:
-      executable: /bin/bash
-    register: ycm_after_update
-    changed_when: false
-    tags: [update]
-
-  - name: compile youcompleteme
-    # --force-sudo is required, as the script refuses to run in a sudo
-    # environment (i.e. if the SUDO_USER env variable is set). But of course,
-    # ansible uses that to assume the other user. It's fine.
-    shell: |
-      cd ~/.local/share/nvim/plugged/YouCompleteMe
-      python3 ./install.py --force-sudo
-    args:
-      executable: /bin/bash
-    register: ycm_compile_output
-    failed_when: ycm_compile_output.rc not in (0, 200)
-    when: >
-      (ycm_before_update.rc == 200)
-      or
-      (ycm_before_update.stdout != ycm_after_update.stdout)
-    tags: [update]
+    tags: [user-update]
   tags: [vim-plugins]
 
 - block:
@@ -382,7 +341,6 @@
   - set_fact:
       firefox_preferences:
         browser.aboutConfig.showWarning: false
-        browser.download.useDownloadDir: false
         extensions.pocket.enabled: false
         toolkit.legacyUserProfileCustomizations.stylesheets: true
         browser.contentblocking.category: "strict"
@@ -414,6 +372,22 @@
         # "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:
@@ -428,6 +402,14 @@
       state: directory
       mode: '0755'
 
+  - name: check if host application file already exists
+    stat:
+      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 }}
@@ -435,6 +417,8 @@
       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'
@@ -444,8 +428,10 @@
   - name: firefox - configure path to passff
     lineinfile:
       path: ~/.mozilla/native-messaging-hosts/passff.json
-      search_string: '"path": "PLACEHOLDER"'
-      line: "  \"path\": \"/home/{{ user.name }}/.mozilla/native-messaging-hosts/passff.py\","
+      regexp: '"path": ".*"'
+      line: "  \"path\": \"{{ path }}\","
+    vars:
+      path: "/home/{{ user.name }}/.mozilla/native-messaging-hosts/passff.py"
 
   - name: firefox - create chrome directory
     file:
@@ -491,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:
@@ -563,6 +550,7 @@
       owner: "{{ user.name }}"
       group: "{{ user_group_name }}"
       mode: '0755'
+      force: false
 
   - name: make kubectl executable
     file:
@@ -579,9 +567,13 @@
     - 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{{ terraform_version }}"
+      path: "/home/{{ user.name }}/.opt/terraform-v{{ tf_version }}"
     register: terraform_binary
 
   - name: create temporary download directory for terraform
@@ -592,8 +584,9 @@
 
   - name: get terraform
     get_url:
-      url: "https://releases.hashicorp.com/terraform/{{ terraform_version }}/terraform_{{ terraform_version }}_linux_amd64.zip"
+      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
@@ -604,7 +597,7 @@
     when: not terraform_binary.stat.exists
 
   - name: install terraform
-    command: mv "{{ terraform_download_dir.path }}/terraform" /home/{{ user.name }}/.opt/terraform-v{{ terraform_version }}
+    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
@@ -615,26 +608,28 @@
 
   - name: link terraform
     file:
-      src: /home/{{ user.name }}/.opt/terraform-v{{ terraform_version }}
+      src: /home/{{ user.name }}/.opt/terraform-v{{ tf_version }}
       dest: /home/{{ user.name }}/.optbin/terraform
       state: link
 
-  - name: get terraform version info
-    command: /home/{{ user.name }}/.optbin/terraform version -json
-    register: terraform_version_output
-    check_mode: false
-    changed_when: false
+  - 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: 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{{ terraform_version }} is out of date"
-    when: terraform_outdated is sameas true
-    ignore_errors: True
+    - 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

variables.yml

@@ -1,28 +1,42 @@
-terraform_version: 1.0.2
-kubectl_version: v1.22.3
-go_version: "1.17.1"
-portfolio_performace_version: "0.55.0"
+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: 0.10.2
+    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.2.1
+    version: 8.4.0
   - crate: bat
     binary: bat
-    version: 0.18.3
+    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.17.1
+    version: 1.20.2
+  - crate: mdbook
+    binary: mdbook
+    version: 0.4.18
   - url: https://github.com/hakoerber/git-repo-manager
     binary: grm
-    branch: master
+    branch: develop
     source: git
     toolchain: nightly
+    features:
+      - static-build
+    target: x86_64-unknown-linux-musl

vim/vimrc

@@ -4,74 +4,38 @@ call plug#begin('~/.local/share/nvim/plugged')
 
 " === plugins ===
 
-"Plug 'vim-airline/vim-airline'
-"Plug 'vim-airline/vim-airline-themes'
-Plug 'itchyny/lightline.vim'
-Plug 'godlygeek/tabular'
-Plug 'lepture/vim-jinja'
-Plug 'majutsushi/tagbar'
-" Plug 'nblock/vim-dokuwiki'
-Plug 'reedes/vim-pencil'
-Plug 'saltstack/salt-vim'
-"Plug 'sickill/vim-monokai'
-Plug 'patstockwell/vim-monokai-tasty'
-" 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'
+function! Cond(Cond, ...)
+  let opts = get(a:000, 0, {})
+  return a:Cond ? opts : extend(opts, { 'on': [], 'for': [] })
+endfunction
 
-"Plugin 'Lokaltog/vim-easymotion'
-"Plugin 'PeterRincker/vim-argumentative'
-"Plugin 'flazz/vim-colorschemes'
-"Plugin 'jmcantrell/vim-virtualenv'
-"Plugin 'kien/ctrlp.vim'
-"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'
+" editing plugins
+Plug 'godlygeek/tabular', Cond(!exists('g:vscode'))
+Plug 'nathanaelkane/vim-indent-guides', Cond(!exists('g:vscode'))
+Plug 'tpope/vim-commentary', Cond(!exists('g:vscode'))
+Plug 'airblade/vim-gitgutter', Cond(!exists('g:vscode'))
 
-Plug 'fatih/vim-go'
-Plug 'hashivim/vim-terraform'
+" ui
+Plug 'sickill/vim-monokai', Cond(!exists('g:vscode'))
+Plug 'itchyny/lightline.vim', Cond(!exists('g:vscode'))
 
-Plug 'editorconfig/editorconfig-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'))
 
-Plug 'leafgarland/typescript-vim'
+" 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'))
 
-Plug 'prettier/vim-prettier', { 'do': 'npm install' }
+"" markdown
+Plug 'suan/vim-instant-markdown', Cond(!exists('g:vscode'))
 
-Plug 'yuezk/vim-js'
-Plug 'maxmellon/vim-jsx-pretty'
-
-Plug 'evanleck/vim-svelte', {'branch': 'main'}
-
-"Plug 'neoclide/coc.nvim', {'branch': 'release'}
-
-" Plug 'Chiel92/vim-autoformat'
-
-Plug 'evanleck/vim-svelte', {'branch': 'main'}
-
-Plug 'cespare/vim-toml', { 'branch': 'main' }
 
 call plug#end()
 filetype plugin indent on
@@ -105,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
@@ -174,6 +138,8 @@ set linebreak
 set wrap
 set wrapscan
 
+" == to use guicolors in terminal ==
+set termguicolors
 
 " === keybinds ===
 set pastetoggle=<F11>
@@ -198,83 +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>
-
-nmap <leader>c :%w !xclip -selection clipboard<CR>
-nmap <leader>x :r !xclip -out -selection -clipboard<CR><CR>
-
-nmap <leader>f :Autoformat<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.
-"autocmd BufWinLeave *.* mkview
-"autocmd BufWinEnter *.* silent loadview
+if exists('g:vscode')
+    xmap gc  <Plug>VSCodeCommentary
+    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 ==
-" 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 vim-monokai-tasty
+    nnoremap <leader>m :InstantMarkdownPreview<CR>
 
-" == tagbar ==
-nnoremap <F10> :TagbarToggle<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
+    nnoremap <leader>u :GundoToggle<CR>
+    nnoremap <leader>d :diffupdate<CR>
 
-" == airline ==
-"let g:airline_right_sep = ''
-"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']
+    nmap <F9> :Goyo<CR>:TogglePencil<CR>:Limelight!!<CR>
+    nmap <leader>w :Goyo<CR>:TogglePencil<CR>:Limelight!!<CR>
 
-let g:lightline = {
-      \ 'colorscheme': 'powerline',
+    nmap <leader>c :%w !xclip -selection clipboard<CR>
+    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' ] ],
@@ -292,66 +228,44 @@ let g:lightline = {
       \ },
       \ }
 
-function! LightLineFilename()
-    return fnamemodify(expand('%F'), ":~:h")
-endfunction
+    function! LightLineFilename()
+        return fnamemodify(expand('%F'), ":~:h")
+    endfunction
 
-" == pencil ==
-let g:pencil#textwidth = 80
-let g:pencil#autoformat = 1
-let g:pencil#cursorwrap = 1
-let g:pencil#wrapModeDefault = 'soft'
-let g:pencil#cursorwrap = 0
+    " == pencil ==
+    let g:pencil#textwidth = 80
+    let g:pencil#autoformat = 1
+    let g:pencil#cursorwrap = 1
+    let g:pencil#wrapModeDefault = 'soft'
+    let g:pencil#cursorwrap = 0
 
-" == goyo ==
-let g:goyo_width = 100
-let g:goyo_height = "90%"
-let g:goyo_linenr = 0
+    " == goyo ==
+    let g:goyo_width = 100
+    let g:goyo_height = "90%"
+    let g:goyo_linenr = 0
 
-" == limelight ==
-let g:limelight_default_coefficient = 0.5
+    " == limelight ==
+    let g:limelight_default_coefficient = 0.5
 
-" === functions ===
-function! DeleteTrailingWS()
-     exe "normal mz"
-     %s/\s\+$//e
-     exe "normal `z"
-endfunction
-autocmd BufWritePre * :call DeleteTrailingWS()
+    " === functions ===
+    function! DeleteTrailingWS()
+        exe "normal mz"
+        %s/\s\+$//e
+        exe "normal `z"
+    endfunction
+    autocmd BufWritePre * :call DeleteTrailingWS()
 
-autocmd FileType yaml set shiftwidth=2
-autocmd FileType toml set shiftwidth=2
-set completeopt-=preview
-let g:ycm_add_preview_to_completeopt = 0
+    autocmd FileType yaml set shiftwidth=2
+    autocmd FileType toml set shiftwidth=2
+    autocmd FileType html setl shiftwidth=2
 
-set completeopt-=preview
-let g:ycm_add_preview_to_completeopt = 0
+    let g:instant_markdown_autostart = 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:terraform_fmt_on_save=1
+    let g:rustfmt_autosave = 1
 
-if has("autocmd")
-  au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
+    " https://stackoverflow.com/a/8585343
+    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
-
-" https://github.com/golang/tools/blob/master/gopls/doc/vim.md
-let g:go_def_mode='gopls'
-let g:go_info_mode='gopls'
-
-" https://stackoverflow.com/a/8585343
-map <leader>q :bp<bar>sp<bar>bn<bar>bd<CR>

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",
-    "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'",
+    "ansible.dockerImage": "",
     "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,
-    "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,
+    "git.detectSubmodulesLimit": 50,
     "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": "",
-    "vim.cursorStylePerMode.normal": "block",
+    "terminal.external.linuxExec": "",
+    "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,
-    "editor.fontSize": 15,
-    "rust-client.disableRustup": true,
-    "rust-client.autoStartRls": false,
-    "terminal.integrated.mouseWheelScrollSensitivity": 3
-}
+    "workbench.enableExperiments": false,
+    "workbench.iconTheme": "Monokai Classic Icons",
+    "workbench.startupEditor": "newUntitledFile",
+    "workbench.tree.indent": 14,
+    "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
+}

zsh/zprofile.j2

@@ -7,7 +7,7 @@ _path=(
 )
 
 for part in ${_path[@]} ; do
-    PATH="$PATH:${part}"
+    PATH="${part}:$PATH"
 done
 export PATH
 

zsh/zshrc.d/20_aliases.sh

@@ -67,7 +67,7 @@ alias twa="task add"
 alias twd="task done"
 alias inbox="task add +inbox"
 
-alias yaml2json="python3 -c 'import sys, yaml, json; json.dump(yaml.safe_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="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'

zsh/zshrc.d/40_functions.sh

@@ -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

@@ -19,6 +19,15 @@ elif [[ -f /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlightin
     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 %}