vim: Add TOML config

The modules already support the click events natively.

.gitignore

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

Makefile

@@ -1,27 +1,17 @@
-DISTRO := $(shell . /etc/os-release && echo $$NAME)
-
 venv = ./venv
 requirements = requirements.txt
 activate = . $(venv)/bin/activate
 pip = pip
-
-ifeq ($(DISTRO),Ubuntu)
-	ansible_run = $(activate) && ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
-else
-	ansible_run =ansible-playbook -e ansible_python_interpreter=/usr/bin/python3 --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
-endif
+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}
 
 .PHONY: all
-all: | venv
+all: | venv $(ansible)
 	$(ansible_run)
 
-.PHONY: config
-config: | venv
-	$(ansible_run) --skip-tags system-update
-
-.PHONY: system-update
-system-update: venv
-	$(ansible_run) --tags system-update
+.PHONY: update
+update: $(ansible)
+	$(ansible_run) --tags update
 
 .PHONY: reboot
 reboot:
@@ -35,11 +25,11 @@ poweroff:
 weekend: | update poweroff
 
 .PHONY: packages
-packages: venv
+packages: $(ansible)
 	$(ansible_run) --tags packages
 
 .PHONY: dotfiles
-dotfiles: venv
+dotfiles: $(ansible)
 	$(ansible_run) --tags dotfiles
 
 .PHONY: clean
@@ -50,14 +40,11 @@ clean:
 test:
 	./test-in-docker.sh
 
-ifeq ($(DISTRO), Ubuntux)
+$(ansible): venv
+
 venv:
-		python3 -m venv $(venv)
-		$(activate) && $(pip) install -r $(requirements)
-else
-venv:
-	true
-endif
+	python3 -m venv $(venv)
+	$(activate) && $(pip) install -r $(requirements)
 
 .PHONY: freeze
 freeze:

_machines/ares.yml

@@ -15,15 +15,6 @@ 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
   gpg_agent: true

_machines/neptune.yml

@@ -59,12 +59,12 @@ users:
     - personal_projects
 
 screen:
-  1: DP-3
-  2: DP-3
-  3: DP-4
-  4: DP-4
-  5: DP-4
-  6: DP-4
+  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

autostart/autostart.target.j2

@@ -6,15 +6,8 @@ Wants=blueman.service
 Wants=dpms.service
 Wants=dunst.service
 Wants=element.service
-{% for profile, config in (user.firefox_profiles|default({})).items() %}
-{% if config.bigger_font|default(false) is sameas false %}
+{% for profile in (user.firefox_profiles|default({})).keys() %}
 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
@@ -32,5 +25,4 @@ 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

@@ -1,9 +0,0 @@
-[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

@@ -1,8 +0,0 @@
-[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/restic/restic-backup
+ExecStart=%h/bin/restic-backup
 RemainAfterExit=true
 PassEnvironment=DISPLAY

autostart/services/yubikey-touch-detector.service

@@ -1,8 +1,6 @@
 [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 ~/code/personal/time-tracking/
+cd ~/projects/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 $2" in
-    "set-paused false")
+case "$1" in
+    enable)
         log "Enabling dunst"
         systemctl --user --no-block kill --signal SIGUSR2 dunst
 
         ;;
-    "set-paused true")
+    disable)
         log "Disabling dunst"
         systemctl --user --no-block kill --signal SIGUSR1 dunst
         ;;

bin/nato

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 import sys
-import os.path
 
 hash = {
     'A': 'Alpha',
@@ -44,45 +43,6 @@ 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

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

bin/pf

@@ -1,14 +0,0 @@
-#!/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,9 +5,6 @@ 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
@@ -65,9 +62,6 @@ 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 = "#ff964f"
+    frame_color = "#e16b40"
 
     # Define a color for the separator.
     # possible values are:

git/gitconfig.j2

@@ -120,5 +120,3 @@
 
 [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 = "ssh://git@github.com/hakoerber/rbackupd.git"
+url = "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/wifiqr.git"
+url = "ssh://git@github.com/hakoerber/wifi-qr.git"
 type = "ssh"
 
 [[trees.repos]]
@@ -74,7 +74,7 @@ type = "ssh"
 name = "misc/xftwidth"
 
 [[trees.repos.remotes]]
-name = "github"
+name = "origin"
 url = "ssh://git@github.com/hakoerber/xftwidth.git"
 type = "ssh"
 
@@ -83,6 +83,10 @@ name = "upstream"
 url = "https://github.com/vixus0/xftwidth"
 type = "https"
 
+[[trees.repos]]
+name = "x-hidecursor"
+remotes = []
+
 [[trees.repos]]
 name = "git-repo-manager"
 
@@ -120,6 +124,11 @@ 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"
 
@@ -195,11 +204,7 @@ type = "ssh"
 
 [[trees.repos]]
 name = "lea-michael-hochzeit"
-
-[[trees.repos.remotes]]
-name = "origin"
-url = "ssh://git@code.hkoerber.de:2222/hannes/lea-michi-hochzeit.git"
-type = "ssh"
+remotes = []
 
 [[trees.repos]]
 name = "builddoc"
@@ -231,11 +236,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]]
@@ -243,7 +248,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]]
@@ -308,18 +313,5 @@ type = "ssh"
 
 [[trees.repos.remotes]]
 name = "origin"
-url = "ssh://git@code.hkoerber.de:2222/hannes/aws-glacier-backup.git"
+url = "ssh://git@code.hkoerber.de:2222/hakoerber/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

@@ -1,15 +0,0 @@
-[Settings]
-gtk-theme-name=Breeze
-gtk-icon-theme-name=breeze-dark
-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

i3/config.j2

@@ -319,10 +319,10 @@ assign [class="^Wine$"] $workspace10
 ################################################################################
 
 # class                 border  backgr. text    indicator
-client.focused          #e5b567 #e5b567 #000000 #FF0000
-client.focused_inactive #272822 #5f676a #ffffff #484e50
-client.unfocused        #1C1C1C #272822 #cccccc #292d2e
-client.urgent           #272822 #900000 #ffffff #900000
+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
 
 ################################################################################
 ### APPLICATION SPECIFIC SETTINGS ##############################################
@@ -380,17 +380,17 @@ bar {
     colors {
         background #272822
         statusline #ffffff
-        separator #555555
-        # separator #e5b567
+        separator #444444
+        # separator #e16b40
 
         # focused_background #303030
         # focused_separator #272822
 
-        focused_workspace  #e5b567 #272822 #ffffff
+        focused_workspace  #e16b40 #272822 #ffffff
         active_workspace   #272822 #5f676a #ffffff
         inactive_workspace #272822 #272822 #dddddd
         urgent_workspace   #D00000 #D00000 #272822
-        binding_mode       #272822 #e5b567 #272822
+        binding_mode       #272822 #e16b40 #272822
     }
 
     i3bar_command i3bar

i3/scripts/i3exit

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

i3/scripts/presentation-mode

@@ -9,7 +9,7 @@ is_on() {
 
 switch_on() {
     touch "${_status_file}"
-    dunstctl set-paused true &
+    dunstctl disable &
     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 set-paused false &
+    dunstctl enable &
     systemctl --user --no-block start redshift.service
     systemctl --user --no-block start spotify.service
     ~/.i3/scripts/bar-update "external_script presentation_mode"

install.sh

@@ -68,6 +68,7 @@ _install() {
 if ! command -v python3 >/dev/null ; then
     printf 'Python3 not installed, installing ...\n'
     _install "python3"
+    _install "python3-venv"
     printf 'Done\n'
 fi
 
@@ -90,10 +91,6 @@ if ! python3 -c 'import venv' 2>/dev/null ; then
     printf 'Done\n'
 fi
 
-if [[ $NAME == "Arch Linux" ]] ; then
-    _install "ansible"
-fi
-
 cd "$DOTDIR" && make
 
 # fix permissions of the directory

packages.yml

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

playbook.yml

@@ -49,19 +49,6 @@
           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:
@@ -100,7 +87,7 @@
           changed_when: false
 
         when: distro == 'archlinux'
-      tags: [system-update]
+      tags: [update]
 
     - block:
       - name: install sudo
@@ -114,6 +101,9 @@
           name:
             - base-devel
             - git
+            - cargo
+            - asp
+            - bat
         become: true
 
       - name: create build user on arch
@@ -148,7 +138,7 @@
         shell: |
           set -o errexit
 
-          if pacman -Qi paru-bin >/dev/null 2>&1; then
+          if pacman -Qi paru >/dev/null 2>&1; then
               exit 100
           fi
           exit 0
@@ -166,9 +156,9 @@
           mkdir -p /tmp/paru-build
           cd /tmp/paru-build
 
-          curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/paru-bin.tar.gz
-          tar xvf paru-bin.tar.gz
-          cd paru-bin
+          curl -L -O https://aur.archlinux.org/cgit/aur.git/snapshot/paru.tar.gz
+          tar xvf paru.tar.gz
+          cd paru
           makepkg
         args:
           executable: /bin/bash
@@ -180,7 +170,7 @@
         shell: |
           set -o errexit
 
-          pacman --noconfirm -U /tmp/paru-build/paru-bin/paru-bin-*.pkg.tar.zst
+          pacman --noconfirm -U /tmp/paru-build/paru/paru-*.pkg.tar.zst
           rm -rf /tmp/paru-build
         args:
           executable: /bin/bash
@@ -196,7 +186,7 @@
           file: packages.yml
 
       - name: force-update iptables to iptables-nft on arch
-        shell: pacman -Q iptables && yes | pacman -S iptables-nft
+        shell: pacman -Q iptables-nft || yes | pacman -S iptables-nft
         changed_when: false
         become: true
         when: distro == 'archlinux'
@@ -221,15 +211,6 @@
         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) }}"
@@ -239,14 +220,12 @@
           query: "{{ 'list.*.%s[]'|format(distro) }}"
 
       - name: remove packages
-        apt:
+        package:
           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:
@@ -421,18 +400,8 @@
           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 --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal
+        shell: curl https://sh.rustup.rs -sSf | sh -s -- -y
         args:
           creates: /var/lib/rust_build/.cargo/bin/rustup
         become: true
@@ -440,62 +409,38 @@
         when: distro == 'ubuntu'
 
       - name: add rustup stable toolchain
-        shell: "{{ cargo_env }} && rustup toolchain install stable && rustup default stable"
+        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"
+        shell: . ~/.cargo/env && rustup toolchain install nightly
         become: true
         become_user: rust_build
         changed_when: false
 
-      - name: add rustup additional toolchains
-        shell: "{{ cargo_env }} && rustup toolchain install {{ item }}"
+      - name: update rustup nightly toolchain
+        shell: . ~/.cargo/env && rustup update nightly
         become: true
         become_user: rust_build
         changed_when: false
-        loop: "{{ cargo_crate_list|map(attribute='toolchain', default='none')|reject('in', ['none', 'stable', 'nightly']) }}"
-
-      - 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) }}"
-        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 --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 }}
+          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/{{ binary_id_cratesio }}
+          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 }}"
@@ -504,11 +449,10 @@
       - name: build rust crates from git
         shell: |
           set -o errexit
-          {{ cargo_env }}
-          rustup run {{ item.toolchain|default('stable') }} cargo install --features "{{ item.features|default([])|join(' ') }}" {{ "--target " ~ item.target if item.target is defined else '' }} --git {{ item.url }} --branch {{ item.branch }}
-          mv /var/lib/rust_build/.cargo/bin/{{ item.binary }} /var/lib/rust_build/.cargo/bin/{{ binary_id_git }}
+          . ~/.cargo/env
+          rustup run {{ item.toolchain|default('stable') }} cargo install --git {{ item.url }} --branch {{ item.branch }}
         args:
-          creates: /var/lib/rust_build/.cargo/bin/{{ binary_id_git }}
+          creates: /var/lib/rust_build/.cargo/bin/{{ item.binary }}
         become: true # do not build as root!
         become_user: rust_build
         loop: "{{ cargo_crate_list }}"
@@ -525,27 +469,27 @@
 
       - name: move binaries for crates.io
         shell: |
-          mv /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }} /usr/local/lib/binaries/{{ binary_id_cratesio }}
-          ln -s /usr/local/lib/binaries/{{ binary_id_cratesio }} /var/lib/rust_build/.cargo/bin/{{ binary_id_cratesio }}
+          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/{{ binary_id_cratesio }}
+          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/{{ 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 }}
+          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/{{ binary_id_git }}
+          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/{{ binary_id_cratesio }}
+          src: /usr/local/lib/binaries/{{ item.binary }}.{{ item.version }}
           dest: /usr/local/bin/{{ item.binary }}
           owner: root
           group: root
@@ -557,7 +501,7 @@
 
       - name: link binaries for git
         file:
-          src: /usr/local/lib/binaries/{{ binary_id_git }}
+          src: /usr/local/lib/binaries/{{ item.binary }}
           dest: /usr/local/bin/{{ item.binary }}
           owner: root
           group: root
@@ -566,57 +510,6 @@
         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) }}"
-        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) }}"
-        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) }}"
-        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) }}"
-        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
 
@@ -672,7 +565,7 @@
         copy:
           dest: /etc/profile.d/go.sh
           content: |
-            export PATH=/usr/local/go/bin:$PATH
+            export PATH=$PATH:/usr/local/go/bin
             export GOROOT=/usr/local/go
           owner: root
           group: root
@@ -705,16 +598,12 @@
         tempfile:
           state: directory
         register: alacritty_build_tempdir
-        become: true
-        become_user: rust_build
         when: not alacritty_binary.stat.exists
 
       - name: build alacritty
-        shell: . ~/.cargo/env && rustup run stable cargo install alacritty --root ./out
+        command: 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
@@ -726,8 +615,6 @@
         file:
           path: "{{ alacritty_build_tempdir.path }}"
           state: absent
-        become: true
-        become_user: rust_build
         when: not alacritty_binary.stat.exists
 
       when: distro == 'ubuntu'
@@ -763,7 +650,6 @@
         file:
           path: "{{ yubikey_touch_detector_build_tempdir.path }}"
           state: absent
-        become: true
         when: not yubikey_touch_detector_binary.stat.exists
 
       when: distro == 'ubuntu'
@@ -773,8 +659,8 @@
       - block:
         - name: add spotify apt key
           apt_key:
-            url: "https://download.spotify.com/debian/pubkey_5E3C45D7B312C643.gpg"
-            id: "5E3C45D7B312C643"
+            url: "https://download.spotify.com/debian/pubkey_0D811D58.gpg"
+            id: "D1742AD60D811D58"
           become: true
 
         - name: add spotify repository
@@ -793,7 +679,7 @@
       - block:
         - name: install spotify from AUR via paru
           shell: |
-            curl -sS https://download.spotify.com/debian/pubkey_5E3C45D7B312C643.gpg | gpg --import
+            curl -sS https://download.spotify.com/debian/pubkey_0D811D58.gpg | gpg --import
             yes 1 | paru --skipreview --aur --batchinstall --noconfirm -S spotify
           become: true
           become_user: paru
@@ -831,15 +717,6 @@
       become: true
       become_user: root
 
-    - name: fix permissions for dotfiles directory
-      shell: |
-        chown --changes --recursive dotfiles:dotfiles /var/lib/dotfiles
-        chmod --changes --recursive g+wX /var/lib/dotfiles
-      register: dotfiles_permission_change
-      become: true
-      become_user: root
-      changed_when: dotfiles_permission_change.stdout_lines|length > 0
-
     - set_fact:
         users: "{{ machine.users }}"
       tags:

screencfg/neptune/default.yml

@@ -6,13 +6,9 @@ outputs:
       mode: 1920x1080
       scale: 1x1
       pos: "0x0" # beware of hex
-  - name: DP-1
+  - name: DP-1-1
     disable: true
-  - name: DP-2
+  - name: DP-1-2
     disable: true
-  - name: DP-3
-    disable: true
-  - name: DP-4
-    disable: true
-  - name: DP-5
+  - name: DP-1-3
     disable: true

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

@@ -1,21 +0,0 @@
-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

test-in-docker.sh

@@ -21,8 +21,6 @@ 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 \
@@ -40,10 +38,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.*\)/CacheDir = \/var\/cache\/pacman\/pkg_host\/\n\1/'"'"' /etc/pacman.conf
+            sed -i '"'"'s/^#\?\(CacheDir.*\)/\1\nCacheDir = \/var\/cache\/pacman\/pkg_host\//'"'"' /etc/pacman.conf
 
-            mkdir -p /var/cache/pacman/pkg_host/
-            pacman -Syu --noconfirm linux
+            pacman -Syu --noconfirm linux python3
+            mkdir /var/cache/pacman/pkg_host/
             cd $(mktemp -d)
             tar xf /tmp/dotfiles.tar.gz -C .
             ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh

tmux/tmux.conf

@@ -1,7 +1,5 @@
 set -g default-command "${SHELL}"
-# This *has* to be set to something with `screen-`, do not set this bindly
-# to $TERM, e.g. "alacritty"!
-set -g default-terminal "screen-256color"
+set -g default-terminal "xterm-256color"
 
 set -g set-titles on
 set -g set-titles-string '#S'
@@ -40,36 +38,26 @@ set-window-option -g pane-base-index 1
 set -g status-position bottom
 set -g status-justify left
 
-# https://wiki.archlinux.org/title/tmux#256_colors
-set -ga terminal-overrides ",alacritty:Tc"
 
-setw -g pane-border-status bottom
-setw -g pane-border-format ''
-
-setw -g pane-border-lines double
-setw -g pane-border-style "fg=#555555"
-setw -g pane-active-border-style "fg=#e5b567"
-setw -g pane-border-indicators colour
-
-set-option -g status-style bg=default
+set-option -g status-bg '#272822'
+set-option -g status-fg white
 
 set-window-option -g window-status-format ' #I: #W #F '
 set-window-option -g window-status-current-format ' #I: #W #F '
-set-window-option -g window-status-current-style "bg=#e5b567,fg=black"
 
 set-window-option -g monitor-activity on
-set-window-option -g visual-activity off
-set-window-option -g window-status-activity-style "bg=#ff77777,fg=black"
+set -g visual-activity on
 
 set-window-option -g automatic-rename on
 set-window-option -g automatic-rename-format '#{pane_current_command}'
 
 set-window-option -g window-status-separator '  '
 
-set -g status-left " #[bg=#6c99bb,fg=#2e2e2e] #{session_name} #[bg=default]  "
-set -g status-right "#[bg=#CCCCCC,fg=#555555] #{host} #[bg=default] "
+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 -g status-style "bg=#272822,fg=#FFFFFF"
 set -g message-style "bg=#CCCCCC,fg=#555555"
 
 # vertical = | in this case

user.yml

@@ -314,7 +314,7 @@
     register: ycm_before_update
     changed_when: false
     failed_when: ycm_before_update.rc not in (0, 200)
-    tags: [user-update]
+    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'
@@ -329,12 +329,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: [user-update]
+    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: [user-update]
+    tags: [update]
 
   - name: get ycm version after update
     shell: |
@@ -344,12 +344,15 @@
       executable: /bin/bash
     register: ycm_after_update
     changed_when: false
-    tags: [user-update]
+    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
+      python3 ./install.py --force-sudo
     args:
       executable: /bin/bash
     register: ycm_compile_output
@@ -358,7 +361,7 @@
       (ycm_before_update.rc == 200)
       or
       (ycm_before_update.stdout != ycm_after_update.stdout)
-    tags: [user-update]
+    tags: [update]
   tags: [vim-plugins]
 
 - block:
@@ -379,6 +382,7 @@
   - set_fact:
       firefox_preferences:
         browser.aboutConfig.showWarning: false
+        browser.download.useDownloadDir: false
         extensions.pocket.enabled: false
         toolkit.legacyUserProfileCustomizations.stylesheets: true
         browser.contentblocking.category: "strict"
@@ -410,22 +414,6 @@
         # "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:

variables.yml

@@ -1,39 +1,28 @@
-terraform_version: 1.1.9
-kubectl_version: v1.23.6
-go_version: "1.18.3"
-portfolio_performace_version: "0.57.2"
+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: 1.2.0
+    version: 0.10.2
   - crate: ripgrep
     binary: rg
     version: 13.0.0
-    features:
-      - pcre2
-      - simd-accel
-    toolchain: nightly # necessary for SIMD
-    required_packages:
-      - ubuntu: libpcre2-dev
-        archlinux: pcre2
   - crate: fd-find
     binary: fd
-    version: 8.4.0
+    version: 8.2.1
   - crate: bat
     binary: bat
-    version: 0.21.0
+    version: 0.18.3
   - crate: exa
     binary: exa
     version: 0.10.1
-    toolchain: "1.60" # Fails with 1.61, see https://github.com/rust-lang/rust/issues/97255
   - crate: watchexec-cli
     binary: watchexec
-    version: 1.20.2
+    version: 1.17.1
   - url: https://github.com/hakoerber/git-repo-manager
     binary: grm
-    branch: develop
+    branch: master
     source: git
     toolchain: nightly
-    features:
-      - static-build
-    target: x86_64-unknown-linux-musl

vim/vimrc

@@ -13,8 +13,8 @@ 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 'sickill/vim-monokai'
+Plug 'patstockwell/vim-monokai-tasty'
 " Plug 'sjl/gundo.vim'
 Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-fugitive'
@@ -25,7 +25,7 @@ Plug 'junegunn/goyo.vim'
 Plug 'junegunn/limelight.vim'
 " Plug 'sheerun/vim-polyglot'
 " Plug 'freitass/todo.txt-vim'
-Plug 'Valloric/YouCompleteMe', {'commit': '4df6f35f0c9f9aec21a3f567397496b5dee6acc7'}
+Plug 'Valloric/YouCompleteMe'
 Plug 'nathanaelkane/vim-indent-guides'
 
 "Plugin 'Lokaltog/vim-easymotion'
@@ -47,7 +47,7 @@ Plug 'vimwiki/vimwiki'
 Plug 'rodjek/vim-puppet'
 Plug 'suan/vim-instant-markdown'
 "Plug 'marshallward/vim-restructuredtext'
-Plug 'vim-syntastic/syntastic'
+"Plug 'vim-syntastic/syntastic'
 "Plug 'ElmCast/elm-vim'
 "Plug 'avh4/elm-format'
 
@@ -73,19 +73,6 @@ Plug 'evanleck/vim-svelte', {'branch': 'main'}
 
 Plug 'cespare/vim-toml', { 'branch': 'main' }
 
-"Plug 'rust-lang/rust.vim'
-
-" Plug 'autozimu/LanguageClient-neovim', {
-"     \ 'branch': 'next',
-"     \ 'do': 'bash install.sh',
-"     \ }
-
-Plug 'neovim/nvim-lspconfig'
-Plug 'simrat39/rust-tools.nvim'
-
-"Plug 'dense-analysis/ale'
-
-
 call plug#end()
 filetype plugin indent on
 
@@ -187,8 +174,6 @@ set linebreak
 set wrap
 set wrapscan
 
-" == to use guicolors in terminal ==
-set termguicolors
 
 " === keybinds ===
 set pastetoggle=<F11>
@@ -259,7 +244,7 @@ nnoremap Q <nop>
 " let g:solarized_contrast="normal"
 " let g:solarized_visibility="normal"
 syntax enable
-silent! colorscheme monokai
+silent! colorscheme vim-monokai-tasty
 
 " == tagbar ==
 nnoremap <F10> :TagbarToggle<CR>
@@ -289,7 +274,7 @@ let g:tagbar_foldlevel = 99 " unfold all
 "let g:airline#extensions#whitespace#checks = ['trailing']
 
 let g:lightline = {
-      \ 'colorscheme': 'wombat',
+      \ 'colorscheme': 'powerline',
       \ 'active': {
       \   'left': [ [ 'mode', 'paste' ],
       \             [ 'readonly', 'filename', 'modified', 'helloworld' ] ],
@@ -370,47 +355,3 @@ let g:go_info_mode='gopls'
 
 " https://stackoverflow.com/a/8585343
 map <leader>q :bp<bar>sp<bar>bn<bar>bd<CR>
-
-let g:rustfmt_autosave = 1
-
-let g:LanguageClient_serverCommands = {
-\ 'rust': ['rust-analyzer'],
-\ }
-
-" let g:ale_linters = {'rust': ['analyzer']}
-
-lua <<EOF
-local nvim_lsp = require'lspconfig'
-
-local opts = {
-    tools = { -- rust-tools options
-        autoSetHints = true,
-        hover_with_actions = true,
-        inlay_hints = {
-            show_parameter_hints = false,
-            parameter_hints_prefix = "",
-            other_hints_prefix = "",
-        },
-    },
-
-    -- all the opts to send to nvim-lspconfig
-    -- these override the defaults set by rust-tools.nvim
-    -- see https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md#rust_analyzer
-    server = {
-        -- on_attach is a callback called when the language server attachs to the buffer
-        -- on_attach = on_attach,
-        settings = {
-            -- to enable rust-analyzer settings visit:
-            -- https://github.com/rust-analyzer/rust-analyzer/blob/master/docs/user/generated_config.adoc
-            ["rust-analyzer"] = {
-                -- enable clippy on save
-                checkOnSave = {
-                    command = "clippy"
-                },
-            }
-        }
-    },
-}
-
-require('rust-tools').setup(opts)
-EOF

zsh/zprofile.j2

@@ -7,7 +7,7 @@ _path=(
 )
 
 for part in ${_path[@]} ; do
-    PATH="${part}:$PATH"
+    PATH="$PATH:${part}"
 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([d for d in yaml.safe_load_all(sys.stdin)][-1], sys.stdout, indent=4)'"
+alias yaml2json="python3 -c 'import sys, yaml, json; json.dump(yaml.safe_load(sys.stdin), 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'