vim: Add TOML config

.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

@@ -3,19 +3,15 @@ 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}
+ansible_run = $(activate) && ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff --verbose ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
 
 .PHONY: all
 all: | venv $(ansible)
 	$(ansible_run)
 
-.PHONY: dryrun
-dryrun: $(ansible)
-	$(ansible_run) --check
-
 .PHONY: update
 update: $(ansible)
-	$(ansible_run) --tags update_system
+	$(ansible_run) --tags update
 
 .PHONY: reboot
 reboot:

_machines/ares.yml

@@ -1,6 +1,4 @@
 font_size: 12
-letter_space: 0
-terminal_binary: alacritty
 
 gpu: amd
 
@@ -8,7 +6,14 @@ 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
   mail: hannes@hkoerber.de
   git_gpg_sign: false
@@ -22,6 +27,8 @@ users:
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
   has_yubikey: true
+  repositories:
+    - personal_projects
 
 screen:
   1: DisplayPort-0
@@ -38,13 +45,15 @@ screen:
 screencfgs: []
 
 workspace:
+  1: www
+  9: comm
+  10: music
 
 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_HAS_ELEMENT: "true"
   MACHINE_RESOLUTION_X: "2560"

_machines/mars.yml

@@ -0,0 +1,90 @@
+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
+  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
+  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: www
+  2: www
+  3: term-local
+  4: term-remote
+  7: comm
+  8: pass
+  9: music
+  10: pim
+
+screencfgs:
+  - name: three-screens
+    key: F3
+
+environment:
+  MACHINE_TYPE: "laptop"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1080"

_machines/neptune.yml

@@ -1,15 +1,20 @@
-font_size: 11
+font_size: 12
-letter_space: 0
-terminal_binary: alacritty
 
 users:
 - name: hannes-work
   group: hannes-work
   vt: 1
   firefox_profiles:
-    - name: default
+    default:
+      extensions:
+        - ublock-origin
+        - privacy-badger17
+        - tree-style-tab
+        - i-dont-care-about-cookies
       manage_css: true
-    - name: meet
+    meet:
+      extensions:
+        - ublock-origin
       manage_css: false
   mail: hannes.koerber@tradebyte.com
   git_gpg_sign: false
@@ -21,11 +26,19 @@ users:
     MACHINE_HAS_ELEMENT: "false"
     MACHINE_HAS_KEEPASSX: "true"
   has_yubikey: false
+  repositories: []
 - name: hannes-private
   group: hannes-private
   vt: 2
   firefox_profiles:
-    - name: default
+    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
@@ -42,6 +55,8 @@ users:
     MACHINE_HAS_ELEMENT: "true"
     MACHINE_HAS_KEEPASSX: "false"
   has_yubikey: true
+  repositories:
+    - personal_projects
 
 screen:
   1: DP-1-1

alacritty/alacritty.yml.j2

@@ -14,7 +14,7 @@
 # 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
@@ -75,7 +75,7 @@ window:
   #startup_mode: Windowed
 
   # Window title
-  #title: Alacritty
+  title: "[terminal]"
 
   # Allow terminal applications to change Alacritty's window title.
   dynamic_title: true

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,12 +3,11 @@ BindsTo=windowmanager.target
 After=windowmanager.target
 
 Wants=blueman.service
-Wants=discord.service
 Wants=dpms.service
 Wants=dunst.service
 Wants=element.service
-{% for profile in user.firefox_profiles|default([]) %}
+{% for profile in (user.firefox_profiles|default({})).keys() %}
-Wants=firefox@{{ profile.name }}.service
+Wants=firefox@{{ profile }}.service
 {% endfor %}
 Wants=gpg-agent.service
 Wants=gnome-keyring.service
@@ -21,11 +20,9 @@ Wants=pasystray.service
 Wants=redshift.service
 Wants=restic.timer
 Wants=screencfg.service
-Wants=signal.service
 Wants=spotify.service
 Wants=steam.service
 Wants=touchpad.service
-Wants=wallpaper.timer
 Wants=xresources.service
 Wants=yubikey-touch-detector.service
 

autostart/services/blueman.service

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

autostart/services/discord.service

@@ -1,9 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-ConditionPathExists=%h/.var/run/features/discord
-
-[Service]
-ExecStart=/usr/bin/env discord
-PassEnvironment=DISPLAY

autostart/services/dpms.service

@@ -7,3 +7,4 @@ Type=oneshot
 ExecStart=/usr/bin/env xset s off
 ExecStart=/usr/bin/env xset dpms 0 0 300
 PassEnvironment=DISPLAY
+Restart=always

autostart/services/dunst.service

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

autostart/services/element.service

@@ -8,3 +8,4 @@ ConditionPathExists=%h/.var/run/features/element
 [Service]
 ExecStart=/usr/bin/env element-desktop
 PassEnvironment=DISPLAY
+Restart=always

autostart/services/firefox@.service

@@ -5,3 +5,4 @@ After=windowmanager.target
 [Service]
 ExecStart=/usr/bin/env firefox --setDefaultBrowser -P %i
 PassEnvironment=DISPLAY
+Restart=always

autostart/services/gnome-keyring.service

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

autostart/services/gpg-agent.service

@@ -7,3 +7,4 @@ ConditionPathExists=%h/.var/run/features/gpg_agent
 Type=forking
 ExecStart=/usr/bin/env gpg-agent --homedir %h/.gnupg --no-detach --daemon
 PassEnvironment=DISPLAY
+Restart=always

autostart/services/keepassx.service

@@ -6,3 +6,4 @@ ConditionPathExists=%h/.var/run/features/keepassx
 [Service]
 ExecStart=/usr/bin/env keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
 PassEnvironment=DISPLAY
+Restart=always

autostart/services/laptop-lid.service

@@ -4,5 +4,7 @@ After=windowmanager.target
 ConditionPathExists=%h/.var/run/features/machine_is_laptop
 
 [Service]
+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

@@ -8,6 +8,7 @@ ConditionPathExists=%h/.var/run/features/nextcloud
 [Service]
 ExecStart=/usr/bin/env nextcloud --background
 PassEnvironment=DISPLAY
+Restart=always
 
 MemoryHigh=20%
 MemoryMax=30%

autostart/services/nm-applet.service

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

autostart/services/pasystray.service

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

autostart/services/redshift.service

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

autostart/services/signal.service

@@ -1,7 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-
-[Service]
-ExecStart=/usr/bin/env signal-desktop
-PassEnvironment=DISPLAY

autostart/services/spotify.service

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

autostart/services/steam.service

@@ -8,3 +8,4 @@ ConditionPathExists=%h/.var/run/features/steam
 [Service]
 ExecStart=/usr/bin/env steam
 PassEnvironment=DISPLAY
+Restart=always

autostart/services/wallpaper.service

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

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/yubikey-touch-detector.service

@@ -5,3 +5,4 @@ After=windowmanager.target
 [Service]
 ExecStart=/usr/bin/env yubikey-touch-detector -libnotify
 PassEnvironment=DISPLAY
+Restart=always

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/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/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)

bin/tasktrack

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

grm/personal_projects.toml

@@ -0,0 +1,317 @@
+[[trees]]
+root = "~/projects"
+
+[[trees.repos]]
+name = "misc/rbackupd"
+
+[[trees.repos.remotes]]
+name = "github"
+url = "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/wifi-qr.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 = "origin"
+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 = "x-hidecursor"
+remotes = []
+
+[[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.remotes]]
+name = "private"
+url = "git@code.sys.haktec.de:container/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"
+remotes = []
+
+[[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/hakoerber/aws-glacier-backup.git"
+type = "ssh"

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
 
@@ -120,7 +120,6 @@ 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
 

i3/i3status.conf.j2

@@ -35,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 = ""

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"

packages.yml

@@ -11,9 +11,6 @@ packages:
         - cmake
         - maven
         - base-devel
-    golang:
-      ubuntu: ["golang-go"]
-      archlinux: ["go"]
     make:
       ubuntu: ["make"]
       archlinux: ["make"]
@@ -92,9 +89,6 @@ packages:
     pluma:
       ubuntu: ["pluma"]
       archlinux: ["pluma"]
-    vim:
-      ubuntu: ["vim"]
-      archlinux: ["gvim"]
     neovim:
       ubuntu: ["neovim"]
       archlinux: ["neovim", "python-pynvim"]
@@ -147,11 +141,15 @@ packages:
       ubuntu: ["ghostscript", "enscript"]
       archlinux: ["ghostscript", "enscript"]
     pandoc:
-      ubuntu: ["pandoc"]
+      ubuntu:
+        - pandoc
+        - texlive
+        - python3-sphinxcontrib.svg2pdfconverter # for html to pdf conversions
+        - texlive-latex-extra
       archlinux: ["pandoc", "texlive-core", "texlive-fontsextra", "texlive-latexextra"]
     libvirt:
       ubuntu: ["virt-manager", "libvirt-daemon"]
-      archlinux: ["virt-manager", "libvirt", "dnsmasq", "ebtables"]
+      archlinux: ["virt-manager", "libvirt", "dnsmasq", "ebtables", "dmidecode"]
     firefox:
       ubuntu: ["firefox"]
       archlinux: ["firefox"]
@@ -250,7 +248,7 @@ packages:
       archlinux: ["networkmanager"]
     pulseaudio:
       ubuntu: ["pulseaudio", "pulseaudio-utils"]
-      archlinux: ["pulseaudio", "pulseaudio-alsa"]
+      archlinux: ["pulseaudio", "pulseaudio-alsa", "lib32-libpulse"]
     iw:
       ubuntu: ["iw"]
       archlinux: ["iw"]
@@ -272,9 +270,6 @@ packages:
     xdg:
       ubuntu: ["xdg-utils"]
       archlinux: ["xdg-utils"]
-    docs:
-      ubuntu: ["manpages"]
-      archlinux: ["man-pages"]
     compton:
       ubuntu: ["compton"]
       archlinux: []
@@ -314,9 +309,9 @@ packages:
     dnf:
       ubuntu: []
       archlinux: []
-    rust:
+    rustup:
-      ubuntu: ["rustc", "cargo"]
+      ubuntu: []
-      archlinux: ["rust"]
+      archlinux: ["rustup"]
     musescore:
       ubuntu: ["musescore3"]
       archlinux: ["musescore"]
@@ -336,23 +331,14 @@ packages:
       ubuntu: []
       archlinux: ["steam"]
     man:
-      ubuntu: ["man"]
+      ubuntu: ["man-db", "manpages"]
       archlinux: ["man-db", "man-pages"]
-    discord:
-      ubuntu: []
-      archlinux: ["discord"]
     nextcloud:
       ubuntu: ["nextcloud-desktop"]
       archlinux: ["nextcloud-client"]
     kwallet:
       ubuntu: []
       archlinux: ["kwallet", "kwalletmanager"]
-    wallpapers:
-      ubuntu: []
-      archlinux: ["elementary-wallpapers", "deepin-community-wallpapers"]
-    wallutils:
-      ubuntu: []
-      archlinux: ["wallutils"]
     pv:
       ubuntu: ["pv"]
       archlinux: ["pv"]
@@ -389,6 +375,9 @@ packages:
     ncdu:
       ubuntu: ["ncdu"]
       archlinux: ["ncdu"]
+    font-utils:
+      ubuntu: ["woff-tools", "woff2"]
+      archinux: ["woff2"]
 
   remove:
     mousepad:
@@ -397,3 +386,21 @@ packages:
     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,34 +10,40 @@
       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 ('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
@@ -50,9 +56,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
@@ -65,13 +81,13 @@
             state: present
           become: true
 
-        - name: Clean cache
+        - name: clean cache
           command: paccache -rk2 -ruk0
           become: true
           changed_when: false
 
         when: distro == 'archlinux'
-      tags: [update_system]
+      tags: [update]
 
     - block:
       - name: install sudo
@@ -97,6 +113,26 @@
           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: |
@@ -152,6 +188,8 @@
       - name: force-update iptables to iptables-nft on arch
         shell: pacman -Q iptables-nft || yes | pacman -S iptables-nft
         changed_when: false
+        become: true
+        when: distro == 'archlinux'
 
       - set_fact:
           defined_packages: "{{ packages|json_query('keys(list)') }}"
@@ -352,6 +390,190 @@
         - 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: install rustup on ubuntu
+        shell: curl https://sh.rustup.rs -sSf | sh -s -- -y
+        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: update rustup stable toolchain
+        shell: . ~/.cargo/env && rustup update 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: update rustup nightly toolchain
+        shell: . ~/.cargo/env && rustup update nightly
+        become: true
+        become_user: rust_build
+        changed_when: false
+
+      - name: build rust crates from crates.io
+        shell: |
+          set -o errexit
+          . ~/.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 }}
+        args:
+          creates: /var/lib/rust_build/.cargo/bin/{{ item.binary }}.{{ item.version }}
+        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 --git {{ item.url }} --branch {{ item.branch }}
+        args:
+          creates: /var/lib/rust_build/.cargo/bin/{{ item.binary }}
+        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/{{ 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 }}
+        args:
+          creates: /usr/local/lib/binaries/{{ item.binary }}.{{ item.version }}
+        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 }}
+        args:
+          creates: /usr/local/lib/binaries/{{ item.binary }}
+        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 }}
+          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/{{ item.binary }}
+          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'
+      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"
+
+        - 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=$PATH:/usr/local/go/bin
+            export GOROOT=/usr/local/go
+          owner: root
+          group: root
+          mode: '0644'
+        become: true
+
+      tags: [go]
+
     - block:
       - name: install alacritty build dependencies
         package:
@@ -411,7 +633,7 @@
         when: not yubikey_touch_detector_binary.stat.exists
 
       - name: build yubikey-touch-detector
-        shell: env 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 get -u github.com/maximbaz/yubikey-touch-detector'
         args:
           chdir: "{{ yubikey_touch_detector_build_tempdir.path }}"
         when: not yubikey_touch_detector_binary.stat.exists
@@ -433,6 +655,7 @@
       when: distro == 'ubuntu'
       tags: [yubikey-touch-detector]
 
+    - block:
       - block:
         - name: add spotify apt key
           apt_key:
@@ -452,28 +675,19 @@
             update_cache: true
           become: true
         when: distro == 'ubuntu'
-      tags: [spotify]
 
       - block:
-      - name: add signal apt key
+        - name: install spotify from AUR via paru
-        apt_key:
+          shell: |
-          url: "https://updates.signal.org/desktop/apt/keys.asc"
+            curl -sS https://download.spotify.com/debian/pubkey_0D811D58.gpg | gpg --import
-          id: "D980A17457F6FB06"
+            yes 1 | paru --skipreview --aur --batchinstall --noconfirm -S spotify
           become: true
+          become_user: paru
+          args:
+            creates: /usr/bin/spotify
+        when: distro == 'archlinux'
 
-      - name: add signal repository
+      tags: [spotify]
-        apt_repository:
-          repo: "deb https://updates.signal.org/desktop/apt xenial main"
-          filename: spotify
-        become: true
-
-      - name: install signal
-        apt:
-          name: signal-desktop
-          update_cache: true
-        become: true
-      when: distro == 'ubuntu'
-      tags: [signal]
 
     - name: create dotfiles group
       group:
@@ -485,6 +699,7 @@
     - name: create dotfiles user
       user:
         name: dotfiles
+        group: dotfiles
         home: /var/lib/dotfiles
         create_home: false
         shell: /bin/bash
@@ -513,6 +728,7 @@
           become: true
           become_user: "{{ user.name }}"
       with_items: "{{ users }}"
+      no_log: True # less spam
       loop_control:
         loop_var: user
       tags:
@@ -522,3 +738,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)

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

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,183 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o xtrace
+set -o errexit
+
+BASEDIR=/var/games/gothic2
+
+export GAMEDATA=${BASEDIR}/data/
+export ARCHIVE=${BASEDIR}/gothic2.data.tar.zstd
+export WINEPREFIX=${BASEDIR}/wineprefix
+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 "$1" .
+}
+
+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 "http://www.gothic-dx11.de/download/Normalmaps_LHiver.zip"
+
+        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
+            setup_dxvk install
+        else
+            echo "WARNING: Using dxvk via winetricks, untested"
+            winetricks dxvk
+        fi
+
+        read -p 'During installation, use "Z:\var\games\gothic2\data" 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/
+
+        cp "${DOWNLOADDIR}"/Quickloot.vdf ./Data
+
+        t="./system/GD3D11/Textures/replacements/Normalmaps_xxx"
+        mkdir -p "${t}"
+        unzip -o "${DOWNLOADDIR}"/Normalmaps_LHiver.zip -d "${t}"
+        unset t
+
+        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
+        ln Data/ModVDF/LHE204_DE.mod Data/LHE204_DE.mod
+        ;;
+    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

@@ -40,7 +40,7 @@ test_ares() {
             # packages will stay in the container
             sed -i '"'"'s/^#\?\(CacheDir.*\)/\1\nCacheDir = \/var\/cache\/pacman\/pkg_host\//'"'"' /etc/pacman.conf
 
-            pacman -Syu --noconfirm python3
+            pacman -Syu --noconfirm linux python3
             mkdir /var/cache/pacman/pkg_host/
             cd $(mktemp -d)
             tar xf /tmp/dotfiles.tar.gz -C .
@@ -59,6 +59,17 @@ test_neptune() {
     '
 }
 
+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
@@ -66,8 +77,12 @@ case "${1:-all}" in
     neptune)
         test_neptune
         ;;
+    mars)
+        test_mars
+        ;;
     all)
         test_ares
         test_neptune
+        test_mars
         ;;
 esac

user.yml

@@ -218,6 +218,7 @@
       state: directory
       path: "{{ item }}"
     with_items:
+      - ~/tmp
       - ~/.var/lib
       - ~/.var/log
       - ~/.var/run
@@ -272,6 +273,7 @@
   tags:
     - dotfiles
 
+- block:
   - name: create intermediate directories for vim-plug
     file:
       path: "{{ item }}"
@@ -285,7 +287,6 @@
       - ~/.vim/
       - ~/.vim/autoload
 
-- block:
   - name: install vim-plug
     copy:
       src: contrib/vim-plug/plug.vim
@@ -301,37 +302,161 @@
       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: /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: install 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 +GoInstallBinaries +qall'
+    changed_when: false
+
+  - name: update vim plugins
+    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]
+
+  - 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
+    # --force-sudo is required, as the script refuses to run in a sudo
-    # in a sudo environment (i.e. if the SUDO_USER env variable
+    # environment (i.e. if the SUDO_USER env variable is set). But of course,
-    # is set). But of course, ansible uses that to assume the
+    # ansible uses that to assume the other user. It's fine.
-    # other user. It's fine.
     shell: |
-      cd ~/.local/share/nvim/plugged/YouCompleteMe/
+      cd ~/.local/share/nvim/plugged/YouCompleteMe
       python3 ./install.py --force-sudo
     args:
-      creates: "{{ lookup('fileglob', '~/.local/share/nvim/plugged/YouCompleteMe/third_party/ycmd/ycm_core.*so') }}"
+      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: [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
+        browser.download.useDownloadDir: 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
+
+  - 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: firefox - get passff host application
-    tags:
+    get_url:
-      - firefox
+      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 }}"
+    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
+      search_string: '"path": "PLACEHOLDER"'
+      line: "  \"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;
@@ -345,16 +470,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:
     - 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 }}
@@ -416,10 +537,6 @@
     - portfolio-performance
 
 - block:
-  - name: set kubectl version
-    set_fact:
-      kubectl_version: v1.22.2
-
   - name: get current stable version
     uri:
       url: https://storage.googleapis.com/kubernetes-release/release/stable.txt
@@ -447,6 +564,11 @@
       group: "{{ user_group_name }}"
       mode: '0755'
 
+  - name: make kubectl executable
+    file:
+      path: /home/{{ user.name }}/.opt/kubectl-{{ kubectl_version }}
+      mode: '0755'
+
   - name: link kubectl
     file:
       src: /home/{{ user.name }}/.opt/kubectl-{{ kubectl_version }}
@@ -457,10 +579,6 @@
     - kubectl
 
 - block:
-  - name: set terraform version
-    set_fact:
-      terraform_version: 1.0.2
-
   - name: stat current terraform binary
     stat:
       path: "/home/{{ user.name }}/.opt/terraform-v{{ terraform_version }}"
@@ -504,6 +622,7 @@
   - 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
@@ -584,15 +703,23 @@
   tags: [gpg]
 
 - block:
-  - name: stat passwordstore checkout
+  - name: add passwordstore init script
-    stat:
+    copy:
-      path: /home/{{ user.name }}/.password-store
+      dest: /home/{{ user.name }}/.optbin/pass
-    register: passwordstore_checkout
+      owner: "{{ user.name }}"
-  - name: check out passwordstore repository
+      group: "{{ user_group_name }}"
-    git:
+      mode: '0755'
-      dest: /home/{{ user.name }}/.password-store
+      content: |
-      repo: ssh://git@code.hkoerber.de:2222/hannes/passwordstore.git
+        #!/usr/bin/env bash
-      accept_hostkey: true
+
-    when: not passwordstore_checkout.stat.exists
+        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,28 @@
+terraform_version: 1.0.2
+kubectl_version: v1.22.3
+go_version: "1.17.1"
+portfolio_performace_version: "0.55.0"
+cargo_crate_list:
+  - crate: just
+    binary: just
+    version: 0.10.2
+  - crate: ripgrep
+    binary: rg
+    version: 13.0.0
+  - crate: fd-find
+    binary: fd
+    version: 8.2.1
+  - crate: bat
+    binary: bat
+    version: 0.18.3
+  - crate: exa
+    binary: exa
+    version: 0.10.1
+  - crate: watchexec-cli
+    binary: watchexec
+    version: 1.17.1
+  - url: https://github.com/hakoerber/git-repo-manager
+    binary: grm
+    branch: master
+    source: git
+    toolchain: nightly

vim/vimrc

@@ -13,7 +13,8 @@ Plug 'majutsushi/tagbar'
 " Plug 'nblock/vim-dokuwiki'
 Plug 'reedes/vim-pencil'
 Plug 'saltstack/salt-vim'
-Plug 'sickill/vim-monokai'
+"Plug 'sickill/vim-monokai'
+Plug 'patstockwell/vim-monokai-tasty'
 " Plug 'sjl/gundo.vim'
 Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-fugitive'
@@ -48,16 +49,16 @@ Plug 'suan/vim-instant-markdown'
 "Plug 'marshallward/vim-restructuredtext'
 "Plug 'vim-syntastic/syntastic'
 "Plug 'ElmCast/elm-vim'
-Plug 'avh4/elm-format'
+"Plug 'avh4/elm-format'
 
-Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+Plug 'fatih/vim-go'
 Plug 'hashivim/vim-terraform'
 
 Plug 'editorconfig/editorconfig-vim'
 
 Plug 'leafgarland/typescript-vim'
 
-Plug 'prettier/vim-prettier', { 'do': 'yarn install' }
+Plug 'prettier/vim-prettier', { 'do': 'npm install' }
 
 Plug 'yuezk/vim-js'
 Plug 'maxmellon/vim-jsx-pretty'
@@ -68,6 +69,10 @@ Plug 'evanleck/vim-svelte', {'branch': 'main'}
 
 " Plug 'Chiel92/vim-autoformat'
 
+Plug 'evanleck/vim-svelte', {'branch': 'main'}
+
+Plug 'cespare/vim-toml', { 'branch': 'main' }
+
 call plug#end()
 filetype plugin indent on
 
@@ -233,13 +238,13 @@ nnoremap Q <nop>
 " === plugin setup ===
 
 " == colorscheme ==
-set background=light
+" set background=light
-let g:solarized_termcolors=16
+" let g:solarized_termcolors=16
-let g:solarized_termtrans=1
+" let g:solarized_termtrans=1
-let g:solarized_contrast="normal"
+" let g:solarized_contrast="normal"
-let g:solarized_visibility="normal"
+" let g:solarized_visibility="normal"
 syntax enable
-silent! colorscheme monokai
+silent! colorscheme vim-monokai-tasty
 
 " == tagbar ==
 nnoremap <F10> :TagbarToggle<CR>
@@ -315,6 +320,7 @@ 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
 
@@ -346,3 +352,6 @@ 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>

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

zsh/zprofile.j2

@@ -1,19 +1,14 @@
-_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}"
 done
-PATH="${PATH#:}"
 export PATH
 
 export EDITOR="nvim"
@@ -38,6 +33,7 @@ export LC_COLLATE=C
 
 export DOTFILES=~/dotfiles
 
+export GOPATH=~/.go
 export PATH=$PATH:$(go env GOPATH)/bin
 
 export ACPI_LID_NAME=LID
@@ -58,7 +54,6 @@ 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_DISCORD       == "true" ]] && touch "${FEATURE_DIR}"/discord
 [[ $MACHINE_HAS_RESTIC_BACKUP == "true" ]] && touch "${FEATURE_DIR}"/restic_backup
 [[ $MACHINE_HAS_ELEMENT       == "true" ]] && touch "${FEATURE_DIR}"/element
 

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'
@@ -73,8 +72,6 @@ alias json2yaml="python3 -c 'import sys, yaml, json; yaml.safe_dump(json.loads(s
 
 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 '
@@ -91,6 +88,9 @@ 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)

zsh/zshrc.j2

@@ -18,3 +18,7 @@ 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 distro == 'ubuntu' %}
+alias imv=imv-x11
+{% endif %}