Use aws-cli v2

It's now available in the official repos

.gitignore

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

.gitmodules

@@ -1,3 +1,60 @@
-[submodule "contrib/vim-plug"]
-	path = contrib/vim-plug
-	url = https://github.com/junegunn/vim-plug
+[submodule "pkgbuilds/spotify"]
+	path = pkgbuilds/spotify
+	url = https://aur.archlinux.org/spotify.git
+[submodule "pkgbuilds/nodejs-intelephense"]
+	path = pkgbuilds/nodejs-intelephense
+	url = https://aur.archlinux.org/nodejs-intelephense.git
+[submodule "pkgbuilds/portfolio-performance-bin"]
+	path = pkgbuilds/portfolio-performance-bin
+	url = https://aur.archlinux.org/portfolio-performance-bin.git
+[submodule "pkgbuilds/terraform-ls-bin"]
+	path = pkgbuilds/terraform-ls-bin
+	url = https://aur.archlinux.org/terraform-ls-bin.git
+[submodule "pkgbuilds/grm-git"]
+	path = pkgbuilds/grm-git
+	url = https://aur.archlinux.org/grm-git.git
+[submodule "pkgbuilds/screencfg-git"]
+	path = pkgbuilds/screencfg-git
+	url = https://aur.archlinux.org/screencfg-git.git
+[submodule "pkgbuilds/google-earth-pro"]
+	path = pkgbuilds/google-earth-pro
+	url = https://aur.archlinux.org/google-earth-pro.git
+[submodule "pkgbuilds/aws-sam-cli"]
+	path = pkgbuilds/aws-sam-cli
+	url = https://aur.archlinux.org/aws-sam-cli.git
+[submodule "pkgbuilds/python-boto3-stubs"]
+	path = pkgbuilds/python-boto3-stubs
+	url = https://aur.archlinux.org/python-boto3-stubs.git
+[submodule "pkgbuilds/python-botocore-stubs"]
+	path = pkgbuilds/python-botocore-stubs
+	url = https://aur.archlinux.org/python-botocore-stubs.git
+[submodule "pkgbuilds/python-chevron"]
+	path = pkgbuilds/python-chevron
+	url = https://aur.archlinux.org/python-chevron.git
+[submodule "pkgbuilds/python-aws-lambda-builders"]
+	path = pkgbuilds/python-aws-lambda-builders
+	url = https://aur.archlinux.org/python-aws-lambda-builders.git
+[submodule "pkgbuilds/python-vdf"]
+	path = pkgbuilds/python-vdf
+	url = https://aur.archlinux.org/python-vdf.git
+[submodule "pkgbuilds/protontricks"]
+	path = pkgbuilds/protontricks
+	url = https://aur.archlinux.org/protontricks.git
+[submodule "pkgbuilds/slack-desktop"]
+	path = pkgbuilds/slack-desktop
+	url = https://aur.archlinux.org/slack-desktop.git
+[submodule "pkgbuilds/backblaze-b2"]
+	path = pkgbuilds/backblaze-b2
+	url = https://aur.archlinux.org/backblaze-b2.git
+[submodule "pkgbuilds/python-class-registry"]
+	path = pkgbuilds/python-class-registry
+	url = https://aur.archlinux.org/python-class-registry.git
+[submodule "pkgbuilds/python-rst2ansi"]
+	path = pkgbuilds/python-rst2ansi
+	url = https://aur.archlinux.org/python-rst2ansi.git
+[submodule "pkgbuilds/claude-code"]
+	path = pkgbuilds/claude-code
+	url = https://aur.archlinux.org/claude-code.git
+[submodule "pkgbuilds/aws-session-manager-plugin"]
+	path = pkgbuilds/aws-session-manager-plugin
+	url = https://aur.archlinux.org/aws-session-manager-plugin.git

Makefile

@@ -1,55 +1,24 @@
-venv = ./venv
-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}
+# Make sure to standardize locale, regardless of the machine config
+#
+# Having a different locale broke "yes | pacman -S" to force-install
+# iptables, for example
+export LC_ALL = en_US.UTF-8
 
-.PHONY: all
-all: $(ansible)
+ansible_run = ansible-playbook --inventory localhost, --diff ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
+
+.PHONY: config
+config:
 	$(ansible_run)
 
-.PHONY: dryrun
-dryrun: $(ansible)
-	$(ansible_run) --check
-
-.PHONY: update
-update: $(ansible)
-	$(ansible_run) --tags update_system
-
-.PHONY: reboot
-reboot:
-	sudo reboot
-
-.PHONY: poweroff
-poweroff:
-	sudo poweroff
-
-.PHONY: weekend
-weekend: | update poweroff
-
-.PHONY: packages
-packages: $(ansible)
-	$(ansible_run) --tags packages
-
-.PHONY: dotfiles
-dotfiles: $(ansible)
-	$(ansible_run) --tags dotfiles
-
-.PHONY: clean
-clean:
-	rm -rf venv
+.PHONY: maintenance
+maintenance:
+	./maintenance.sh
 
 .PHONY: test
 test:
 	./test-in-docker.sh
 
-$(ansible): venv
-
-venv:
-	python3 -m venv $(venv)
-	$(activate) && $(pip) install -r $(requirements)
-
-.PHONY: freeze
-freeze:
-	$(activate) && $(pip) freeze > $(requirements)
+.PHONY: fmt
+fmt:
+	git ls-files -z '*.md'   | xargs -0 prettier --print-width 80 --prose-wrap always --write
+	git ls-files -z '*.toml' | xargs -0 taplo format

README.md

@@ -1,25 +1,43 @@
 # dotfiles
 
-My configuration files.
+My configuration files for my systems. Uses Ansible for local configuration.
 
-# Installation
+## Supported OS
+
+Only Arch Linux is supported
+
+## Bootstrapping
+
+Bootstrapping is specific to the exact machine that is installed. See
+`_machines/` for machine-specific configuration, and `install_scripts/` for the
+machine install scripts.
+
+They are keyed by hostname.
+
+For easier installation, the install scripts are available via shortlinks. To
+(re)install a new machine from a Arch live environment:
+
+```
+curl --proto '=https' -O -sSfL https://s.hkoerber.de/i/bootstrap.sh && bash bootstrap.sh {host}
+```
+
+## Manual Installation
 
 Because it manages multiple users on the system, the directory is supposed to be
 at `/var/lib/dotfiles`.
 
-To setup the dotfiles:
+To set up the dotfiles:
 
 1. `git clone https://github.com/hakoerber/dotfiles.git ~/dotfiles`
 2. `cd ~/dotfiles && ./install.sh`
 
-# Partial application
+## Partial application
 
 To apply only a subset of the changes, use ansible tags that are available via
 the Makefile:
 
 | Command         | Description                                        |
-| --- | --- |
-| `make update` | Updates the system with the latest packages |
+| --------------- | -------------------------------------------------- |
 | `make packages` | Installs all defined packages (see `packages.yml`) |
 | `make dotfiles` | Manages the users' dotfiles                        |
 

_machines/ares.yml

@@ -1,40 +1,53 @@
-font_size: 10
-letter_space: 0
-terminal_binary: urxvt
+font_size: 11
 
 gpu: amd
+cpu: amd
+encrypted_root: true
 
 users:
 - name: hannes
   vt: 1
   firefox_profiles:
-    - name: lu9k8ywl.default
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
       manage_css: true
   mail: hannes@hkoerber.de
-  git_gpg_sign: false
+  ssh_agent: false
   gpg_agent: true
-  gpg_keys:
-    master_key: "0xB5C002530C6A2053"
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
 
 screen:
-  1: eDP-1
-  2: eDP-1
-  3: eDP-1
-  4: eDP-1
-  5: eDP-1
-  6: eDP-1
-  7: eDP-1
-  8: eDP-1
-  9: eDP-1
-  0: eDP-1
+  1: DisplayPort-0
+  2: DisplayPort-0
+  3: DisplayPort-0
+  4: DisplayPort-0
+  5: DisplayPort-0
+  6: DisplayPort-0
+  7: DisplayPort-0
+  8: DisplayPort-0
+  9: DisplayPort-0
+  0: DisplayPort-0
 
 workspace:
+  1: ""
+  9: ""
+  10: ""
 
 environment:
-  MACHINE_HAS_KEEPASSX: "false"
+  MACHINE_TYPE: "workstation"
+  MACHINE_HAS_KEEPASSXC: "false"
   MACHINE_HAS_NEXTCLOUD: "true"
-  MACHINE_HAS_RESTIC_BACKUP: "false"
-  MACHINE_HAS_SPOTIFY: "true"
-  MACHINE_HAS_TOUCHPAD: "false"
+  MACHINE_HAS_STEAM: "true"
+  MACHINE_RESOLUTION_X: "2560"
+  MACHINE_RESOLUTION_Y: "1440"

_machines/dionysus.yml

@@ -0,0 +1,61 @@
+font_size: 11
+
+gpu: intel
+cpu: intel
+encrypted_root: true
+
+users:
+- name: hannes
+  vt: 1
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
+      manage_css: true
+    media:
+      extensions:
+        - ublock-origin
+        - passff
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+      bigger_font: true
+  mail: hannes@hkoerber.de
+  ssh_agent: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "true"
+
+screen:
+  1: HDMI-1
+  2: HDMI-1
+  3: HDMI-1
+  4: HDMI-1
+  5: HDMI-1
+  6: HDMI-1
+  7: HDMI-1
+  8: HDMI-1
+  9: HDMI-1
+  0: HDMI-1
+
+workspace:
+  1: ""
+  2: ""
+  3: ""
+
+environment:
+  MACHINE_TYPE: "tv"
+  MACHINE_HAS_KEEPASSXC: "false"
+  MACHINE_HAS_NEXTCLOUD: "true"
+  MACHINE_HAS_STEAM: "false"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1080"

_machines/hera-tasks.yml

@@ -0,0 +1,265 @@
+---
+- name: Autoupdate
+  block:
+    - name: Deploy autoupdate script
+      copy:
+        owner: root
+        group: root
+        mode: "0755"
+        dest: /usr/local/bin/pacman-autoupdate
+        content: |
+          #!/usr/bin/env bash
+
+          set -o errexit
+          set -o nounset
+          set -o pipefail
+
+          # Prevent failures when not battery present
+          shopt -s nullglob
+
+          for battery in /sys/class/power_supply/*/capacity ; do
+              capacity="$(< "$battery")"
+              if (( "${capacity}" < 40 )) ; then
+                  printf "Battery at %s%%, exiting\n" "${capacity}" >&2
+                  exit 0
+              fi
+          done
+
+          if nmcli --terse --fields GENERAL.METERED dev show 2>/dev/null | grep -q "yes" ; then
+              printf "Detected metered connection, exiting\n" >&2
+              exit 0
+          fi
+
+          # Make sure that keys are up to date, otherwise sig checks may fail
+          pacman --sync --noprogressbar --noconfirm --refresh --needed archlinux-keyring
+
+          pacman --noprogressbar --noconfirm --sysupgrade
+
+    - name: Install pacman autoupdate service
+      ansible.builtin.copy:
+        dest: /etc/systemd/system/pacman-autoupdate.service
+        owner: root
+        group: root
+        mode: "0644"
+        content: |
+          [Service]
+          Type=oneshot
+          ExecStart=/usr/local/bin/pacman-autoupdate
+      become: true
+
+    - name: Install pacman autoupdate timer
+      ansible.builtin.copy:
+        dest: /etc/systemd/system/pacman-autoupdate.timer
+        owner: root
+        group: root
+        mode: "0644"
+        content: |
+          [Timer]
+          OnCalendar=daily
+          OnBootSec=5min
+          OnUnitInactiveSec=120min
+
+          [Install]
+          WantedBy=multi-user.target
+
+    - name: Enable pacman autoupdate timer
+      ansible.builtin.systemd:
+        name: pacman-autoupdate.timer
+        enabled: true
+        state: started
+        daemon_reload: true
+      become: true
+  become: true
+
+- name: User configuration
+  block:
+    - name: Create user group
+      ansible.builtin.group:
+        name: "herta"
+        state: present
+      become: true
+
+    - name: Create user
+      ansible.builtin.user:
+        name: "herta"
+        state: present
+        home: "/home/herta"
+        create_home: true
+        groups:
+          - dotfiles
+          - libvirt
+          - wheel
+          - wireshark
+          - docker
+          - sudonopw
+          - games
+          - kvm
+          - video
+        shell: /usr/bin/zsh
+        skeleton: /dev/null
+      become: true
+
+- name: Display Manager
+  block:
+    - name: Enable sddm
+      ansible.builtin.systemd:
+        name: sddm.service
+        enabled: true
+        daemon_reload: true
+      become: true
+
+    - name: Create sddm config folder
+      ansible.builtin.file:
+        state: directory
+        path: /etc/sddm.conf.d/
+        owner: root
+        group: root
+        mode: "0755"
+
+    - name: Enable autologin
+      ansible.builtin.copy:
+        dest: /etc/sddm.conf.d/autologin.conf
+        owner: root
+        group: root
+        mode: "0644"
+        content: |
+          [Autologin]
+          User=herta
+          Session=plasma
+
+    - name: Lock on startup
+      ansible.builtin.copy:
+        dest: /etc/xdg/kscreenlockerrc
+        owner: root
+        group: root
+        mode: "0644"
+        content: |
+          [Daemon]
+          LockOnStart=true
+
+- name: Backup
+  block:
+    - name: create restic config directory
+      file:
+        path: /etc/restic
+        state: directory
+        owner: root
+        group: root
+        mode: "0755"
+      become: true
+
+    - name: create restic exclude file
+      copy:
+        dest: /etc/restic/exclude.lst
+        content: |
+          /home/*/.cache/**
+          /home/*/.mozilla/firefox/*/Cache/**
+        owner: root
+        group: root
+        mode: "0755"
+      become: true
+
+    - name: create restic cache directory
+      file:
+        path: /var/cache/restic
+        state: directory
+        owner: root
+        group: root
+        mode: "0700"
+      become: true
+
+    - name: create restic wrapper script
+      copy:
+        owner: root
+        group: root
+        mode: "0700"
+        dest: /usr/local/bin/restic-cmd
+        content: |
+          #!/usr/bin/env bash
+          source /etc/restic/env
+
+          set -o nounset
+          set -o errexit
+          set -o pipefail
+
+          export B2_ACCOUNT_ID
+          export B2_ACCOUNT_KEY
+
+          export RESTIC_PASSWORD_FILE=/etc/restic/repopassword
+
+          restic \
+            --cache-dir=/var/cache/restic/ \
+            --repo="b2:${BUCKET_NAME}:hera" \
+            --password-file=/etc/restic/repopassword \
+            --verbose \
+            "${@}"
+      become: true
+
+    - name: add backup script
+      copy:
+        owner: root
+        group: root
+        mode: "0700"
+        dest: /usr/local/bin/restic-backup
+        content: |
+          #!/usr/bin/env bash
+
+          set -o nounset
+          set -o errexit
+          set -o pipefail
+
+          run() {
+            name="${1}" ; shift
+            printf '[%s] %s - start\n' "${name}" "$(date --utc --iso-8601=seconds)"
+            "${@}"
+            printf '[%s] %s - end\n' "${name}" "$(date --utc --iso-8601=seconds)"
+          }
+
+          run backup restic-cmd \
+              backup \
+              --exclude-file /etc/restic/exclude.lst \
+              /home/
+
+          run forget restic-cmd \
+              forget \
+              --prune \
+              --keep-daily 30 \
+              --keep-monthly 12 \
+              --keep-yearly 3
+      become: true
+
+
+    - name: Install restic backup service
+      ansible.builtin.copy:
+        dest: /etc/systemd/system/restic-backup.service
+        owner: root
+        group: root
+        mode: "0644"
+        content: |
+          [Service]
+          Type=oneshot
+          ExecStart=systemd-inhibit /usr/local/bin/restic-backup
+      become: true
+
+    - name: Install restic backup timer
+      ansible.builtin.copy:
+        dest: /etc/systemd/system/restic-backup.timer
+        owner: root
+        group: root
+        mode: "0644"
+        content: |
+          [Timer]
+          OnCalendar=daily
+          Persistent=true
+
+          [Install]
+          WantedBy=multi-user.target
+      become: true
+
+    - name: Enable restic backup timer
+      ansible.builtin.systemd:
+        name: restic-backup.timer
+        enabled: true
+        state: started
+        daemon_reload: true
+      become: true

_machines/hera.yml

@@ -0,0 +1,81 @@
+font_size: 11
+
+gpu: intel
+cpu: intel
+encrypted_root: false
+
+# make sure that display manager works
+system_default_target: "graphical.target"
+
+additional_packages:
+  - plasma-desktop
+  - konsole
+  - dolphin
+  - kdeplasma-addons
+  - plasma-nm
+  - plasma-pa
+  - plasma-systemmonitor
+  - sddm
+  - sddm-kcm
+  - thunderbird
+  # kde archive manager
+  - ark
+  # kde image viewer
+  - gwenview
+  # german language packs
+  - hunspell-de
+  - thunderbird-i18n-de
+  - firefox-i18n-de
+
+users:
+- name: hannes
+  vt: 1
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
+      manage_css: true
+    media:
+      extensions:
+        - ublock-origin
+        - passff
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+      bigger_font: true
+  mail: hannes@hkoerber.de
+  autologin: false
+  ssh_agent: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  environment: {}
+
+screen:
+  1: HDMI-1
+  2: HDMI-1
+  3: HDMI-1
+  4: HDMI-1
+  5: HDMI-1
+  6: HDMI-1
+  7: HDMI-1
+  8: HDMI-1
+  9: HDMI-1
+  0: HDMI-1
+
+workspace: []
+
+environment:
+  MACHINE_TYPE: "workstation"
+  MACHINE_HAS_KEEPASSXC: "false"
+  MACHINE_HAS_NEXTCLOUD: "false"
+  MACHINE_HAS_STEAM: "false"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1080"

_machines/neptune.yml

@@ -0,0 +1,77 @@
+font_size: 11
+
+gpu: nvidia
+cpu: intel
+encrypted_root: true
+
+users:
+- name: hannes-work
+  vt: 1
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - tree-style-tab
+        - i-dont-care-about-cookies
+      manage_css: true
+    meet:
+      extensions:
+        - ublock-origin
+      manage_css: false
+  mail: h.koerber@clipmyhorse.tv
+  ssh_agent: true
+  gpg_agent: false
+  gpg_agent_for_ssh: false
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "false"
+    MACHINE_HAS_KEEPASSXC: "true"
+
+- name: hannes-private
+  vt: 2
+  firefox_profiles:
+    default:
+      extensions:
+        - ublock-origin
+        - passff
+        - tree-style-tab
+        - i-dont-care-about-cookies
+        - floccus
+      manage_css: true
+  mail: hannes@hkoerber.de
+  ssh_agent: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "true"
+    MACHINE_HAS_KEEPASSXC: "false"
+
+screen:
+  1: DP-4-1-6
+  2: DP-4-1-6
+  3: DP-4-1-6
+  4: DP-4-1-6
+  5: DP-4-1-6
+  6: DP-4-1-6
+  7: eDP-1
+  8: eDP-1
+  9: eDP-1
+  0: eDP-1
+
+workspace:
+  1: ""
+  2: ""
+  3: ""
+  4: ""
+  7: ""
+  8: ""
+  9: ""
+  10: ""
+
+environment:
+  MACHINE_TYPE: "laptop"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1200"

_machines/tb-hak.yml

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

alacritty/alacritty.toml.j2

@@ -0,0 +1,40 @@
+[general]
+live_config_reload = true
+
+import = [
+    "~/.config/alacritty/themes/monokai.toml"
+]
+
+[env]
+TERM = "alacritty"
+WINIT_X11_SCALE_FACTOR = "1"
+
+[font]
+size = {{ machine.font_size }}
+
+[font.bold]
+family = "JetBrainsMono"
+style = "Bold"
+
+[font.bold_italic]
+family = "JetBrainsMono"
+style = "Bold Italic"
+
+[font.italic]
+family = "JetBrainsMono"
+style = "Italic"
+
+[font.normal]
+family = "JetBrainsMono"
+style = "Regular"
+
+[selection]
+save_to_clipboard = true
+
+[window]
+dynamic_title = true
+title = "[terminal]"
+
+[window.padding]
+x = 3
+y = 3

alacritty/themes/github_light.toml

@@ -0,0 +1,36 @@
+# github Alacritty Colors
+
+# Default colors
+[colors.primary]
+background = '#ffffff'
+foreground = '#24292f'
+
+# Normal colors
+[colors.normal]
+black = '#24292e'
+red = '#d73a49'
+green = '#28a745'
+yellow = '#dbab09'
+blue = '#0366d6'
+magenta = '#5a32a3'
+cyan = '#0598bc'
+white = '#6a737d'
+
+# Bright colors
+[colors.bright]
+black = '#959da5'
+red = '#cb2431'
+green = '#22863a'
+yellow = '#b08800'
+blue = '#005cc5'
+magenta = '#5a32a3'
+cyan = '#3192aa'
+white = '#d1d5da'
+
+[[colors.indexed_colors]]
+index = 16
+color = '#d18616'
+
+[[colors.indexed_colors]]
+index = 17
+color = '#cb2431'

alacritty/themes/monokai.toml

@@ -0,0 +1,23 @@
+[colors.primary]
+background = "#272822"
+foreground = "#f8f8f2"
+
+[colors.normal]
+black = "#272822"
+red = "#f92672"
+green = "#a6e22e"
+yellow = "#f4bf75"
+blue = "#66d9ef"
+magenta = "#ae81ff"
+cyan = "#a1efe4"
+white = "#f8f8f2"
+
+[colors.bright]
+black = "#75715e"
+red = "#f92672"
+green = "#a6e22e"
+yellow = "#f4bf75"
+blue = "#66d9ef"
+magenta = "#ae81ff"
+cyan = "#a1efe4"
+white = "#f9f8f5"

ansible.cfg

@@ -1,3 +1,5 @@
 [defaults]
 retry_files_enabled = False
 nocows = 1
+roles_path = ./ansible_roles
+interpreter_python = "auto_silent"

applications/firefox.desktop

@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Application
+Name=Firefox
+Exec=firefox-default --new-tab %u

autostart/autostart.sh

@@ -1,161 +0,0 @@
-#!/usr/bin/env bash
-
-set -o nounset
-# set -x
-
-selective=0
-if (( $# > 0 )) ; then
-    selective=1
-    services=("${@}")
-fi
-
-do_run() {
-    name="$1"
-    shift
-
-    run=0
-    if (( $selective )) ; then
-        for s in "${services[@]}" ; do
-            if [[ "$s" == "$name" ]] ; then
-                run=1
-            fi
-        done
-    else
-        run=1
-    fi
-
-    return $(( ! $run ))
-}
-
-get_unit_name() {
-    name="$1" ; shift
-    printf '%s' "${name}"
-}
-
-run_raw() {
-    name="$1"
-    shift
-
-    do_run "$name" || return
-
-    systemd-run \
-        --user \
-        --unit "$(get_unit_name "${name}")" \
-        --no-block \
-        --remain-after-exit \
-        --setenv=DISPLAY=${DISPLAY} \
-        "${@}"
-}
-
-run() {
-    name="$1"
-    shift
-
-    run_raw "$name" --property=Restart=always "${@}"
-}
-
-run_oneshot_multiple() {
-    name="$1"
-    shift
-
-    cmd=()
-    # hacky way to start two processes in oneshot mode
-    for c in "${@}" ; do
-        cmd+=(--property "ExecStart=/usr/bin/env ${c}")
-    done
-    cmd+=(true)
-
-    run_oneshot "$name" "${cmd[@]}"
-}
-
-run_oneshot() {
-    name="$1"
-    shift
-
-    run_raw "$name" --service-type=oneshot "${@}"
-}
-
-schedule() {
-    name="$1"; shift
-    spec="$1"; shift
-    do_run "$name" || return
-    systemd-run \
-        --user \
-        --unit "$(get_unit_name "${name}")" \
-        --no-block \
-        --setenv=DISPLAY=${DISPLAY} \
-        --on-calendar="${spec}" \
-        "${@}"
-}
-
-
-# wallpaper config
-wallpaper="$LIBDIR/wallpaper/current"
-
-# keyboard settings
-keyboard_layout=de
-keyboard_variant=nodeadkeys
-keyboard_repeat_delay=150
-keyboard_repeat_speed=50
-
-run_oneshot acpi bash -c 'grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup'
-
-run_oneshot xresources xrdb -merge -I${HOME} ~/.Xresources
-
-run_oneshot_multiple keyboard \
-    "setxkbmap -layout $keyboard_layout -variant $keyboard_variant" \
-    "xset r rate $keyboard_repeat_delay $keyboard_repeat_speed"
-
-if [[ "${MACHINE_HAS_TOUCHPAD}" == "true" ]] ; then
-    run_oneshot_multiple touchpad \
-        "synclient VertEdgeScroll=0" \
-        "synclient VertTwoFingerScroll=1" \
-        "synclient MaxSpeed=2.2" \
-        "synclient AccelFactor=0.08" \
-        "synclient TapButton1=1" \
-        "synclient CoastingSpeed=0" \
-        "synclient PalmDetect=1" \
-        "synclient PalmMinWidth=20" \
-        "synclient PalmMinZ=180"
-fi
-
-run gpg-agent gpg-agent --homedir "$HOME/.gnupg" --no-detach --daemon
-
-# run gnome-keyring_user gnome-keyring-daemon --start --components pkcs11,secrets --foreground
-run kwallet kwalletd --nofork
-
-# a service called dunst already exists and conflicts
-run dunst_user dunst -config ~/.config/dunstrc
-
-# disabled due to firefox flicker
-# run compton compton --backend glx --vsync opengl --no-dock-shadow --no-dnd-shadow
-
-run_oneshot wallpaper --property=ExecStartPre="/bin/sleep 1" feh --bg-scale "${wallpaper}"
-
-run blueman blueman-applet
-
-run nm-applet nm-applet
-
-run pasystray pasystray
-
-# redshift unit already exists
-run redshift_user redshift-gtk -c ~/.config/redshift.conf
-
-if [[ "${MACHINE_HAS_KEEPASSX}" == "true" ]] ; then
-    run keepassx keepassx --keyfile ~/.secret/main.key ~/.secret/main.kdbx
-fi
-
-if [[ "${MACHINE_HAS_SPOTIFY}" == "true" ]] ; then
-    run spotify spotify
-fi
-
-if [[ "${MACHINE_HAS_NEXTCLOUD}" == "true" ]] ; then
-    run nextcloud nextcloud --background
-fi
-
-if [[ "${MACHINE_HAS_RESTIC_BACKUP}" == "true" ]] ; then
-    [[ -x ~/bin/restic-backup ]] && schedule restic-backup "Mon..Fri 12:00:00" --on-calendar "Mon..Fri 09:00:00" --on-calendar "Mon..Fri 16:00:00" ~/bin/restic-backup
-fi
-
-
-run firefox firefox -P default

autostart/autostart.target.j2

@@ -0,0 +1,34 @@
+[Unit]
+BindsTo=windowmanager.target
+After=windowmanager.target
+
+Wants=dpms.service
+Wants=dunst.service
+{% for profile, config in (user.firefox_profiles|default({})).items() %}
+{% if config.bigger_font|default(false) is sameas false %}
+Wants=firefox@{{ profile }}.service
+{% endif %}
+{% endfor %}
+{% for profile, config in (user.firefox_profiles|default({})).items() %}
+{% if config.bigger_font|default(false) is sameas true %}
+Wants=firefox-gtk-override-bigger-font@{{ profile }}.service
+{% endif %}
+{% endfor %}
+Wants=gpg-agent.service
+Wants=gnome-keyring.service
+Wants=keepassxc.service
+Wants=keyboard.service
+Wants=laptop-lid.service
+Wants=nextcloud.service
+Wants=nm-applet.service
+Wants=pasystray.service
+Wants=redshift.service
+Wants=spotify.service
+Wants=steam.service
+Wants=touchpad.service
+Wants=xresources.service
+Wants=yubikey-touch-detector.service
+Wants=kdeconnect.service
+Wants=color-theme-dark.service
+Wants=workstation-mgr.service
+Wants=screencfg.service

autostart/services/dpms.service

@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env xset s off
+ExecStart=/usr/bin/env xset dpms 0 0 0
+PassEnvironment=DISPLAY

autostart/services/dunst.service

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

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

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

autostart/services/firefox@.service

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

autostart/services/gnome-keyring.service

@@ -0,0 +1,8 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStart=/usr/bin/env gnome-keyring-daemon --start --foreground --components secrets
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/gpg-agent.service

@@ -0,0 +1,11 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+ConditionPathExists=%t/features/gpg_agent
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/env gpg-agent --daemon
+PassEnvironment=DISPLAY GNUPGHOME
+
+Restart=always

autostart/services/i3.service

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

autostart/services/kdeconnect.service

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

autostart/services/keepassxc.service

@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+ConditionPathExists=%t/features/keepassxc
+
+[Service]
+ExecStart=/usr/bin/env keepassxc --keyfile %h/.secrets/main.keyx %h/.secrets/main.kdbx
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/keyboard.service

@@ -0,0 +1,10 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env setxkbmap -layout de -variant nodeadkeys
+ExecStart=/usr/bin/env xset r rate 150 50
+RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/laptop-lid.service

@@ -0,0 +1,10 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+ConditionPathExists=%t/features/machine_is_laptop
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env bash -c 'grep "^LID.*enabled" /proc/acpi/wakeup && echo " LID" | sudo tee /proc/acpi/wakeup || true'
+RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/mousespam.service

@@ -0,0 +1,5 @@
+[Service]
+Type=simple
+ExecStart=%h/bin/mousespam
+RemainAfterExit=True
+PassEnvironment=DISPLAY

autostart/services/nextcloud.service

@@ -0,0 +1,14 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+After=gnome-keyring.service
+
+ConditionPathExists=%t/features/nextcloud
+
+[Service]
+ExecStart=/usr/bin/env nextcloud --background
+PassEnvironment=DISPLAY
+Restart=always
+
+MemoryHigh=20%
+MemoryMax=30%

autostart/services/nm-applet.service

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

autostart/services/pasystray.service

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

autostart/services/redshift.service

@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+ExecStartPre=/usr/bin/env redshift-gtk -x
+ExecStart=/usr/bin/env redshift-gtk -c %h/.config/redshift.conf
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/screencfg.service

@@ -0,0 +1,8 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/screencfg watch --best
+Restart=always

autostart/services/spotify.service

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

autostart/services/steam.service

@@ -0,0 +1,12 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+After=i3.service
+
+ConditionPathExists=%t/features/steam
+
+[Service]
+# `-system-composer`: https://github.com/ValveSoftware/steam-for-linux/issues/10806
+ExecStart=/usr/bin/env steam -system-composer
+PassEnvironment=DISPLAY
+Restart=always

autostart/services/touchpad.service

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

autostart/services/windowmanager.target

@@ -0,0 +1,3 @@
+[Unit]
+Requires=i3.service
+After=i3.service

autostart/services/workstation-mgr.service

@@ -0,0 +1,8 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/workstation-mgr serve
+Restart=always

autostart/services/xresources.service

@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/env xrdb -merge -I%h %h/.config/Xresources
+RemainAfterExit=true
+PassEnvironment=DISPLAY

autostart/services/yubikey-touch-detector.service

@@ -0,0 +1,11 @@
+[Unit]
+BindsTo=autostart.target
+PartOf=gpg-agent.service
+After=windowmanager.target
+After=gpg-agent.service
+ConditionPathExists=%t/features/gpg_agent
+
+[Service]
+ExecStart=/usr/bin/env yubikey-touch-detector -libnotify
+PassEnvironment=DISPLAY
+Restart=always

bin/dunstctl

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -o nounset
-
-_logfile="$LOGDIR/dunstctl.log"
-
-log() {
-    printf '[%s] %s\n' "$(date -uIseconds)" "$*" >> "$_logfile"
-}
-
-case "$1" in
-    enable)
-        log "Enabling dunst"
-        systemctl --user --no-block kill --signal SIGUSR2 dunst_user
-
-        ;;
-    disable)
-        log "Disabling dunst"
-        systemctl --user --no-block kill --signal SIGUSR1 dunst_user
-        ;;
-    *)
-        >&2 printf 'Unknown command\n'
-        exit 1
-esac
-

bin/firefox-default

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exec /usr/bin/firefox --profile "$HOME/.mozilla/firefox/profile-default" "${@}"

bin/fuck-lxc

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-vagrant destroy -f
-killall vagrant
-killall -9 vagrant
-
-pgrep -fa lxc | grep -v fuck-lxc | awk '{print $1}' | xargs sudo kill -9
-
-sudo lxc-ls -1 | xargs -l1 sudo lxc-stop --kill --name ; sudo lxc-ls -1 | xargs -l1 sudo lxc-destroy --name
-
-pgrep -fa lxc | grep -v fuck-lxc | awk '{print $1}' | xargs sudo kill -9
-
-rm -rf .vagrant
-
-sudo systemctl restart nfs-kernel-server
-sudo systemctl restart lxc\*
-
-sudo apt-get install --reinstall lxc
-
-sudo systemctl restart nfs-kernel-server
-sudo systemctl restart lxc\*

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/git-sm-commit

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-set -o nounset
-
-submodule_count=$(git diff --staged --submodule=log | grep -c '^Submodule')
-
-if (( $submodule_count == 1 )) ; then
-    msg="Update submodule $(git diff --staged --submodule=log | grep '^Submodule' | cut -d ' ' -f 2)"
-else
-    msg="Update submodules"
-fi
-
-git commit --edit --no-status \
-    --message="$msg" \
-    --message "$(git diff --staged --color=never --submodule=log | sed 's/^S/\nS/' | sed 's/^Submodule /* /' | sed 's/  >/  */')"

bin/git-worktree-rm

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -o nounset
-
-rm -r "${1}"
-cd ./.gitdir
-git worktree remove "${1}"
-git branch -D "${1}"

bin/markdown-to-pdf

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+set -o nounset
+
+usage() {
+    cat <<EOF >&2
+$0 <input file> <output file>
+EOF
+}
+
+if (( $# != 2 )) ; then
+    usage
+    exit 1
+fi
+
+markdown_extensions=(
+    blank_before_header
+    space_in_atx_header
+    blank_before_blockquote
+    yaml_metadata_block
+    backtick_code_blocks
+    fancy_lists
+    native_divs
+    fenced_divs
+    task_lists
+    pipe_tables
+)
+
+function join_by { local d=$1; shift; local f=$1; shift; printf %s "$f" "${@/#/$d}"; }
+
+pandoc \
+    --from markdown+"$(join_by "+" "${markdown_extensions[@]}")"\
+    --to pdf \
+    --verbose \
+    --email-obfuscation=none \
+    --columns=2000 \
+    --fail-if-warnings \
+    --standalone \
+    --variable tables=true \
+    --variable euro=yes \
+    --variable colorlinks=yes \
+    --variable linestretch=1.3 \
+    --variable papersize=a4 \
+    --variable date=$(date --iso-8601=date) \
+    --variable fontsize=12pt \
+    --variable fontfamily=libertinus \
+    --variable familydefault=sfdefault \
+    --variable documentclass=scrartcl \
+    --variable fontfamilyoptions= \
+    --variable lof= \
+    --variable lot= \
+    -i "${1}" \
+    --output "${2}" \

bin/mousespam-toggle

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+systemctl --no-pager --user status mousespam && systemctl --no-pager --user stop mousespam || systemctl --no-pager --user start mousespam

bin/mypass

@@ -1,93 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import subprocess
-import yaml
-
-PASS = 'pass'
-
-def run(args):
-    return(subprocess.run(
-        args,
-        stdin=sys.stdin,
-        stdout=sys.stdout,
-        stderr=sys.stderr).returncode)
-
-def get_stdout(args):
-    return(subprocess.run(
-        args,
-        stdout=subprocess.PIPE).stdout)
-
-def extract_from_dict(d, k, last=None):
-    if '.' in k:
-        k1, k2 = k.split('.', 1)
-        try:
-            d1 = d[k1]
-            return extract_from_dict(d1, k2, last=k1)
-        except KeyError:
-            print("\"{}\" was not found in the data".format(k))
-            sys.exit(3)
-    else:
-        if not isinstance(d, dict):
-            print("element \"{}\" is not a dictionary".format(last))
-            sys.exit(3)
-        try:
-            return d[k]
-        except KeyError:
-            print("\"{}\" was not found in the data".format(k))
-            sys.exit(3)
-
-
-def cmd_get(*args):
-    if len(args) == 1:
-        print(get_stdout(['pass', 'show', args[0]]).split(b'\n')[0].decode())
-        return 0
-
-    if len(args) != 2:
-        print("what do you want to get?")
-        return 1
-
-    # get the pass output
-    out = get_stdout(['pass', 'show', args[0]])
-    try:
-        data = list(yaml.safe_load_all(out))[-1]
-    except yaml.scanner.ScannerError as e:
-        print("invalid YAML data: {}".format(str(e)))
-        return 2
-    except IndexError:
-        print("invalid YAML data: no YAML document found")
-        return 2
-
-    if not isinstance(data, dict):
-        print("invalid YAML data, not a dict")
-        return 2
-
-    keydata = extract_from_dict(data, args[1])
-    if isinstance(keydata, list) or isinstance(keydata, dict):
-        print(yaml.safe_dump(keydata, default_flow_style=False).strip())
-    else:
-        print(keydata)
-
-cmds = ['get']
-git_push_commands = ['insert', 'edit', 'generate', 'rm', 'mv', 'cp']
-
-def run_pass(argv):
-    return run([PASS] + argv[1:])
-
-def just_call_pass(argv):
-    sys.exit(run_pass(argv))
-
-if len(sys.argv) == 1:
-    just_call_pass(sys.argv)
-elif sys.argv[1] not in cmds:
-    if sys.argv[1] not in git_push_commands:
-        just_call_pass(sys.argv)
-    else:
-        e = run_pass(sys.argv)
-        if e == 0:
-            print("Pushing to remote repository...")
-            run([PASS, 'git', 'push'])
-            print("Done")
-        sys.exit(e)
-else:
-    sys.exit(globals()['cmd_' + sys.argv[1]](*sys.argv[2:]))

bin/nato

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

bin/natode

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

bin/pacman-remove-orphans

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+pacman -Qtdq | xargs --open-tty --no-run-if-empty sudo pacman -Rns

bin/pass

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o errexit
+
+if [[ ! -e "${PASSWORD_STORE_DIR}" ]] ; 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_DIR}"
+
+  printf '%s\n' 'Done'
+fi
+
+command -p pass "${@}"

bin/pf

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

bin/qr

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+qrencode "$*" -o - | imv -

bin/restic-backup

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

bin/screencfg

@@ -1,60 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-import subprocess
-import time
-import argparse
-
-import yaml
-
-XRANDR = 'xrandr'
-
-def run(cmd):
-    print('>>> ' + ' '.join(cmd))
-    start = time.time()
-    ret = subprocess.run(
-        cmd,
-        stdout=sys.stdout,
-        stderr=sys.stderr)
-    end = time.time()
-    print("exit code: {}".format(ret.returncode))
-    print("exec time: {}".format(end - start))
-
-def fail(msg, code=1):
-    print(msg)
-    sys.exit(code)
-
-parser = argparse.ArgumentParser()
-parser.add_argument('config')
-
-args = parser.parse_args()
-config_path = args.config
-
-try:
-    config = yaml.load(open(config_path))
-except FileNotFoundError:
-    fail("File {0} not found".format(config_path))
-
-# reset
-for output in config['outputs']:
-    if config.get('reset') and output.get('reset'):
-        run([XRANDR, '--output', output['name'], '--off'])
-        run([XRANDR, '--delmode', output['name'], output['opts']['mode']])
-        run([XRANDR, '--addmode', output['name'], output['opts']['mode']])
-        run([XRANDR, '--output', output['name'], '--mode', output['opts']['mode']])
-
-cmd = [XRANDR]
-for output in config['outputs']:
-    cmd.extend(['--output', output['name']])
-    if output.get('disable'):
-        cmd.append('--off')
-    else:
-        if output.get('primary', False):
-            cmd.append("--primary")
-        # cmd.append('--auto')
-        for k, v in output['opts'].items():
-            cmd.extend(['--{}'.format(k), str(v)])
-
-run(cmd)
-run(['i3-msg', 'restart'])
-run(['systemctl', '--user', 'restart', 'keyboard'])

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/switch-color-mode

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -o nounset
+
+set -x
+
+apply() {
+    local mode="${1}"
+
+    case "${mode}" in
+        dark)
+            theme=monokai
+            ;;
+        light)
+            theme=github_light
+            ;;
+    esac
+
+    sed -i "s#themes/.*\.toml#themes/${theme}.toml#" "${XDG_CONFIG_HOME}/alacritty/config.toml"
+
+    sed -i "s#theme = .*\$#theme = \"${theme}\"#" "${XDG_CONFIG_HOME}/helix/config.toml"
+
+    pkill -SIGUSR1 helix
+
+    printf '%s' "${mode}" > "${XDG_RUNTIME_DIR}"/color_mode
+}
+
+case "${1:-}" in
+    dark)
+        apply dark
+        ;;
+    light)
+        apply light
+        ;;
+    *)
+        exit 1
+        ;;
+esac

bin/terraform-get-targets

@@ -1,24 +1,24 @@
 #!/usr/bin/env bash
 # Stolen from https://devops.stackexchange.com/a/8984 and adapted to my use case
 
-if [[ -z "$@" ]]; then
+if (( $# == 0 )) ; then
   echo "Missing file input arguments"
   exit 1
 fi
 
 for FILE in "$@"
 do
-  RESOURCE=$(sed -n 's/^resource "\([^"]*\)" "\([^"]*\)".*/-target=\1.\2 /gp' $FILE)
-  MODULE=$(sed -n 's/^module "\([^"]*\)".*/-target=module.\1 /gp' $FILE)
+  RESOURCE=$(sed -n 's/^resource "\([^"]*\)" "\([^"]*\)".*/-target=\1.\2 /gp' "$FILE")
+  MODULE=$(sed -n 's/^module "\([^"]*\)".*/-target=module.\1 /gp' "$FILE")
   if [[ -z "$RESOURCE" ]] && [[ -z "$MODULE" ]]; then
-    echo "Cannot detect terraform resource and module in $FILE"
+    echo "Cannot detect terraform resource and module in $FILE" >&2
     exit 1
   fi
 
-  if [[ ! -z "$RESOURCE" ]]; then
+  if [[ -n "$RESOURCE" ]]; then
     echo -e $"$RESOURCE"
   fi
-  if [[ ! -z "$MODULE" ]]; then
+  if [[ -n "$MODULE" ]]; then
     echo -e $"$MODULE"
   fi
 done

bin/yaml2json

@@ -0,0 +1,4 @@
+#!/usr/bin/env python3
+import sys, yaml, json
+
+json.dump([d for d in yaml.safe_load_all(sys.stdin)][-1], sys.stdout, indent=4)

cargo/config.toml

@@ -0,0 +1,6 @@
+[build]
+rustc-wrapper = "sccache"
+
+[target.x86_64-unknown-linux-gnu]
+linker = "/usr/bin/clang"
+rustflags = ["-Clink-arg=--ld-path=/usr/bin/wild"]

detect-missing-packages.py

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

dotfiles.yml

@@ -1,53 +1,117 @@
 empty_directories:
-  - name: .i3
-  - name: .gnupg
+  - 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
+  - name: .config/i3status-rust
+  - name: .config/i3status-rust/icons
+  - name: .config/i3status-rust/themes
+  - name: .config/helix
+  - name: .config/git
+  - name: .config/tmux
+  - name: .config/i3
+  - name: .config/zsh
+  - name: .config/alacritty
+  - name: .local/state/gnupg/
     mode: '0700'
-  - name: .config/nvim
+  - name: .local/state/cargo/
 dotfiles:
-  - from: autostart/autostart.sh
-    to: .autostart.sh
   - from: git/gitconfig
-    to: .gitconfig
+    to: .config/git/config
     template: true
   - from: gnupg/dirmngr.conf
-    to: .gnupg/dirmngr.conf
+    to: .local/state/gnupg/dirmngr.conf
+  - from: gnupg/scdaemon.conf
+    to: .local/state/gnupg/scdaemon.conf
   - from: gnupg/gpg-agent.conf
-    to: .gnupg/gpg-agent.conf
+    to: .local/state/gnupg/gpg-agent.conf
+    template: true
   - from: gnupg/gpg.conf
-    to: .gnupg/gpg.conf
+    to: .local/state/gnupg/gpg.conf
     template: true
   - from: i3/config
-    to: .i3/config
+    to: .config/i3/config
     template: true
-  - from: i3/i3status.conf
-    to: .i3/i3status.conf
+  - from: i3/i3status-rust/config.toml
+    to: .config/i3status-rust/config.toml
     template: true
+  - from: i3/i3status-rust/themes/native.toml
+    to: .config/i3status-rust/themes/native.toml
+  - from: i3/i3status-rust/icons/awesome.toml
+    to: .config/i3status-rust/icons/awesome.toml
   - from: i3/scripts
-    to: .i3/scripts
+    to: .config/i3/scripts
+    dir: true
   - from: tmux/tmux.conf
-    to: .tmux.conf
-  - from: vim/vimrc
-    to: .config/nvim/init.vim
-  - from: vim/vimrc
-    to: .vimrc
+    to: .config/tmux/tmux.conf
   - from: x/Xresources
-    to: .Xresources
-    template: true
+    to: .config/Xresources
   - from: x/xinitrc
-    to: .xinitrc
+    to: .config/xinitrc
   - from: zsh/zprofile
-    to: .zprofile
+    to: .config/zsh/.zprofile
     template: true
   - from: zsh/zshrc
-    to: .zshrc
+    to: .config/zsh/.zshrc
     template: true
-  - from: zsh/zshrc.d
-    to: .zshrc.d
+  - from: zsh/zshenv
+    to: .zshenv
   - from: dunst/dunstrc
     to: .config/dunstrc
+    template: true
   - from: redshift/redshift.conf
     to: .config/redshift.conf
-  - from: vscode/settings.json
-    to: .config/Code/User/settings.json
-  - from: vscode/keybindings.json
-    to: .config/Code/User/keybindings.json
+  - from: vscodium/product.json
+    to: .config/VSCodium/product.json
+  - from: vscodium/settings.json
+    to: .config/VSCodium/User/settings.json
+  - from: vscodium/keybindings.json
+    to: .config/VSCodium/User/keybindings.json
+  - from: alacritty/alacritty.toml
+    to: .config/alacritty/config.toml
+    template: true
+  - from: alacritty/themes
+    to: .config/alacritty/themes
+    dir: true
+  - from: rofi/config
+    to: .config/rofi/config
+  - from: gtk/gtk-3.0.ini
+    to: .config/gtk-3.0/settings.ini
+    template: true
+  - from: gtk/gtk-3.0-bigger-font.ini
+    to: .config/gtk-3.0-overrides/bigger-font/gtk-3.0/settings.ini
+    template: true
+  - from: gtk/gtkrc-2.0
+    to: .config/gtkrc-2.0
+    template: true
+  - from: qt/qt5ct.conf
+    to: .config/qt5ct/qt5ct.conf
+  - from: scripts
+    to: scripts
+    dir: true
+  - from: helix/config.toml
+    to: .config/helix/config.toml
+  - from: helix/languages.toml
+    to: .config/helix/languages.toml
+  - from: screencfg/screencfg.toml
+    to: .config/screencfg.toml
+  - from: cargo/config.toml
+    to: .local/state/cargo/config.toml
+  - from: applications
+    to: .local/share/applications
+    dir: true
+dotfiles_remove:
+  - .gitconfig
+  - .vimrc
+  - .config/nvim/init.vim
+  - .tmux.conf
+  - .i3
+  - .gtkrc-2.0
+  - .opt
+  - .optbin
+  - .usr
+  - .var
+  - .screenrc
+  - .zshrc.d

drivers.yml

@@ -0,0 +1,34 @@
+cpu:
+  amd:
+    - amd-ucode
+  intel:
+    - intel-ucode
+  
+gpu:
+  amd:
+    - mesa
+    - mesa-utils
+    - lib32-mesa
+    - xf86-video-amdgpu
+    - vulkan-radeon
+    - lib32-vulkan-radeon
+    - libva-mesa-driver
+    - lib32-libva-mesa-driver
+    - mesa-vdpau
+    - lib32-mesa-vdpau
+    - vulkan-headers
+    - vulkan-tools
+  nvidia:
+    - mesa
+    - mesa-utils
+    - lib32-mesa
+    - vulkan-nouveau
+    - lib32-vulkan-nouveau
+    - vulkan-headers
+    - vulkan-tools
+  intel:
+    - mesa
+    - mesa-utils
+    - lib32-mesa
+    - vulkan-intel
+    - lib32-vulkan-intel

dunst/dunstrc.j2

@@ -29,7 +29,7 @@
     # the top and down respectively.
     # The width can be negative.  In this case the actual width is the
     # screen width minus the width defined in within the geometry option.
-    geometry = "300x10-20+20"
+    geometry = "300x10-20-40"
 
     # Show how many messages are currently hidden (because of geometry).
     indicate_hidden = yes
@@ -64,7 +64,7 @@
     frame_width = 2
 
     # Defines color of the frame around the notification window.
-    frame_color = "#e16b40"
+    frame_color = "#ff964f"
 
     # Define a color for the separator.
     # possible values are:
@@ -84,7 +84,7 @@
 
     ### Text ###
 
-    font = pango:Inconsolata 9
+    font = JetBrainsMono, Fontawesome {{ machine.font_size }}
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.

git/gitconfig.j2

@@ -2,9 +2,6 @@
     name = Hannes Körber
     email = {{ user.mail }}
     useConfigOnly = true
-{% if user.git_gpg_sign|bool %}
-    signingkey = {{ user.gpg_keys.master_key }}
-{% endif %}
 [github]
     user = hakoerber
 [alias]
@@ -44,7 +41,7 @@
 
     pushall = "!bash -c 'for r in $(git remote) ; do [[ "$r" != "upstream" ]] && { echo \"--- [$r] ---\" ; git push $r \"$@\" ; } ; done' -"
 
-    branch-clean = "!sh -c 'git branch --merged | grep -v -e master -e develop -e '^*' | xargs --no-run-if-empty git branch -d'"
+    branch-clean = "!sh -c 'git branch --merged | grep -v -e master -e develop -e main -e '^*' | xargs --no-run-if-empty git branch -d'"
     brc = "!git branch-clean"
 
     graph = log --graph --pretty=format:'%C(yellow)%h%Creset%C(bold red)% D%Creset %C(green)(%cr) %C(blue)%an<%ae>%Creset%n        %C(bold white)%s%Creset' --all
@@ -71,14 +68,18 @@
     fileMode = true
     whitespace = "blank-at-eol,space-before-tab,blank-at-eof"
     abbrev = 8
+    pager = delta
+[interactive]
+    diffFilter = delta --color-only
 [color]
     ui = true
 [column]
     ui = auto
 [push]
     default = simple
+    autoSetupRemote = true
 [merge]
-    tool = vimdiff
+    conflictstyle = diff3
 [gc]
     auto = 0
 [advice]
@@ -88,7 +89,7 @@
     commitBeforeMerge = false
     detachedHead = false
 [commit]
-    gpgSign = {{ user.git_gpg_sign|bool }}
+    gpgSign = false
     cleanup = strip
     status = true
 [status]
@@ -105,9 +106,37 @@
     autoStash = true
 [diff]
     submodule = log
-    mnemonicPrefix = true
     renameLimit = 1199
 [branch]
     autoSetupMerge = true
 [clean]
     requireForce = true
+[pull]
+    rebase = true
+    ff = only
+
+[url "ssh://git@code.hkoerber.de:2222/"]
+    insteadOf = https://code.hkoerber.de/
+
+# https://stackoverflow.com/a/71971739
+[url "https://github.com/"]
+    insteadOf = "git@github.com:"
+[url "git@github.com:"]
+    pushInsteadOf = "https://github.com/"
+    pushInsteadOf = "git@github.com:"
+
+[init]
+	defaultBranch = main
+[safe]
+	directory = /var/lib/dotfiles
+	directory = /var/lib/dotfiles/*
+[includeIf "gitdir:/var/lib/dotfiles/.git"]
+    path = /var/lib/dotfiles/gitcfg
+[delta]
+    navigate = true # use n and N to move between diff sections
+
+    # delta detects terminal colors automatically; set one of these to disable auto-detection
+    # dark = true
+    # light = true
+[rerere]
+    enabled = true

gitcfg

@@ -0,0 +1,3 @@
+[user]
+    email = hannes@hkoerber.de
+    name = Hannes Körber

gnupg/gpg-agent.conf.j2

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

gnupg/gpg.conf.j2

@@ -34,12 +34,7 @@ fixed-list-mode
 no-mangle-dos-filenames
 require-cross-certification
 
-{% if not (distro == 'ubuntu' and ansible_distribution_version == '18.04') -%}
-{# looks like the gpg version in that ubuntu release it too old and does not
-{# contain the setting #}
 # do not cache keys for symmetric encryption
 no-symkey-cache
 
-{% endif -%}
-
 keyserver-options no-honor-keyserver-url no-auto-key-retrieve include-revoked

gnupg/scdaemon.conf

@@ -0,0 +1,2 @@
+# makes yubikey work more reliably
+disable-ccid

gpgkeys/hannes@hkoerber.de.gpg.asc

@@ -0,0 +1,109 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF52F2UBEADVm8w92aR5UoDq94jcCh5hEpbjIWrrmyBb3p7Z4x9loASIDNly
+6SrHjpFONw7EdCNzT2zQCCCoKezKfzALuU3xQ3Vl5fhtp3Ij/HGonSEFhz4ibhUC
+MsbCsUEU7yG/lzmz0dtk9UIWfVKDe8yhLCVxi+dUi2Lat58daQjO9OGjRP+Z5mMi
+ZtGzmV2UQHWmMipKlxx9yDpX5l1i2qduNXfC2ki+uBudzNNaZtwk9t690UXa6DHz
+xxnUJqewWG3zyFmhBrixOBF5Pdc+Uy79HOLfifZ+SRSpSKf7Dp7SiUE7XL0slWOD
+xxRRZPW5u6heSgFnVCLjtupLUSUCccNnvTKrKB1iOEjkpko7Q7FVMe5bTQOrO1de
+cr2PpGC3GeR6K1n0PYAwd49HgVZjCUqXzbz4Zeh9KRuM62geNTZjJxuuP7dbJP86
+p23+7uiODwVhdzvEP/ElYlwEGLGFFurbnqZ3DwFggdrQ6cOkSjQblt6xzxxlROo4
+HoyupyNz4I5yWqN+k4wk2+1A8TsSwKh1PAHG7C2LLZsKn4pSsdYgoaQaYsod89kZ
+mA1Sr4IEe9rhG6TnofxHqHegzifPM0XPmYlwVccAF+lb+CrvWbSBHHA5FVE/PCBe
+Xc4GYWghnobhK8kfgFZhr8BrBFFH+sAw8CYNbgg7O90HK7jnK79BlgU31QARAQAB
+tCNIYW5uZXMgS8O2cmJlciA8aGFubmVzQGhrb2VyYmVyLmRlPokCTAQTAQoANhYh
+BJc65I1xt2c1xHErW7XAAlMMaiBTBQJedhdlAhsBBAsJCAcEFQoJCAUWAgMBAAIe
+AQIXgAAKCRC1wAJTDGogUyIxEACZXR+fN+bb6PYW821k8oXO/MvNiiqtWC9CuLjP
+y1/eu/ZJUmeOca/8HsJsp0hOAJ7oUn3MBiW7gCVZ/2hQ+ywCtcDWp2PElutCiAyg
+QgN1IEg9RAcx+7RmHC0SEafhnyT4ogi7hJ9SK3kPnf5Ryli6qNFAWb3dtfSENYLK
+dqtzMi9+CvcsNKKMN+yhubVrQi5MHlqu7L4bdE4BW5bzsbbhLaPfmc/JYFkImF5v
+dXnOBA9gx2bVREoTw/GPioed9hpPu1ZWZC5we+WD4eEGrQD/LG/XyGUh6wQwsC7P
+aMXOydok7DHzUrCdvZ372Giv71cNV1++e6G+PdEqVo2FCp04Syzug5GwRbSAZ9B3
+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
+imtrGD9EhItdmZ8PBdC2kAx3vWEM
+=553W
+-----END PGP PUBLIC KEY BLOCK-----

grm/github.toml

@@ -0,0 +1,8 @@
+provider = "github"
+token_command = "pass show github | ~/bin/yaml2json | jq -r '.personal_access_token.grm.value'"
+root = "~/code/github.com"
+worktree = true
+force_ssh = true
+
+[filters]
+owner = true

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

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

gtk/gtk-3.0.ini.j2

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

gtk/gtkrc-2.0.j2

@@ -0,0 +1,17 @@
+# DO NOT EDIT! This file will be overwritten by LXAppearance.
+# Any customization should be done in ~/.gtkrc-2.0.mine instead.
+
+gtk-theme-name="Breeze"
+gtk-icon-theme-name="breeze"
+gtk-font-name="DejaVu Sans {{ machine.font_size| int - 2 }}"
+gtk-cursor-theme-name="breeze_cursors"
+gtk-cursor-theme-size=0
+gtk-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"

helix/config.toml

@@ -0,0 +1,39 @@
+theme = "monokai"
+
+[editor]
+idle-timeout = 0
+completion-trigger-len = 2
+
+[editor.statusline]
+left = ["mode", "separator", "file-name", "file-modification-indicator"]
+
+right = [
+  "spinner",
+  "spacer",
+  "diagnostics",
+  "separator",
+  "selections",
+  "separator",
+  "position",
+  "position-percentage",
+  "file-type",
+]
+
+mode.normal = "N"
+mode.insert = "I"
+mode.select = "S"
+
+[editor.lsp]
+display-inlay-hints = true
+
+[editor.cursor-shape]
+insert = "bar"
+
+[editor.file-picker]
+hidden = false
+
+[editor.indent-guides]
+render = true
+
+[editor.soft-wrap]
+enable = true

helix/languages.toml

@@ -0,0 +1,15 @@
+
+[[language]]
+name = "bash"
+indent = { unit = "    ", tab-width = 4 }
+
+[language-server.pylsp.config.pylsp.plugins]
+flake8 = { enabled = false }
+
+[[language]]
+name = "python"
+indent = { unit = "    ", tab-width = 4 }
+
+[[language]]
+name = "dockerfile"
+indent = { unit = "    ", tab-width = 4 }

i3/config.j2

@@ -17,10 +17,10 @@
     set $mod Mod4
 
     # The default terminal
-    set $terminal "{{ machine.terminal_binary }} -title terminal"
-    set $calc "{{ machine.terminal_binary }} -title calc -e $SHELL -i -c calc"
+    set $terminal "alacritty --config-file ~/.config/alacritty/config.toml"
+    set $calc "alacritty --config-file ~/.config/alacritty/config.toml -e $SHELL -i -c calc"
 
-    set $scriptdir ~/.i3/scripts
+    set $scriptdir ~/.config/i3/scripts
 
     # Keys for the exit mode
     set $key_lock      l
@@ -77,8 +77,8 @@
     set $focus_parent q
     set $focus_child  a
 
-    set $floating_toggle   Shift+space
-    set $focus_mode_toggle space
+    set $floating_toggle   Shift+p
+    set $focus_mode_toggle p
 
     set $prev_on_output u
     set $next_on_output i
@@ -93,6 +93,7 @@
 
     set $kill Shift+Q
 
+    set $screenshot o
 
 ################################################################################
 ### WORKSPACE ASSIGNMENTS ######################################################
@@ -109,9 +110,19 @@ workspace $workspace8 output {{ machine.screen.8 }}
 workspace $workspace9 output {{ machine.screen.9 }}
 workspace $workspace10 output {{ machine.screen.0 }}
 
-assign [class="^Keepassx$"] $workspace8
+assign [class="^KeePassXC$"] $workspace8
+
+# See https://github.com/i3/i3/issues/2060
+for_window [class="^Spotify$"] move to workspace $workspace9
 assign [class="^Spotify$"] $workspace9
+
 assign [class="^Google-chrome$"] $workspace7
+assign [class="^Chromium$"] $workspace7
+assign [class="^[Ss]team$"] $workspace5
+for_window [class="^[Ss]team$"] move to workspace $workspace5
+
+assign [class="^dota2$"] $workspace10
+assign [class="^Wine$"] $workspace10
 
 ################################################################################
 ### KEYBINDINGS ################################################################
@@ -193,34 +204,19 @@ assign [class="^Google-chrome$"] $workspace7
 
     ### START APPLICATIONS #####################################################
 
-    bindsym $mod+d exec --no-startup-id ~/.i3/scripts/appmenu
+    bindsym $mod+d exec --no-startup-id rofi -show combi -combi-modi run -display-combi "run"
+
     bindsym $mod+Return       exec $terminal
     bindsym $mod+Shift+Return exec $calc
 
-    bindsym F1 exec --no-startup-id ~/.i3/scripts/shutdown-menu
-    bindsym F2 exec --no-startup-id ~/.i3/scripts/screenmenu
+    bindsym F1 exec --no-startup-id workstation-client power menu
 
-    bindsym $mod+F1 exec --no-startup-id ~/.i3/scripts/i3exit lock
-    bindsym $mod+F2 exec --no-startup-id screencfg ~/.screencfg/all.yml ; exec --no-startup-id ~/.autostart/30_keyboard.sh
-    bindsym $mod+F3 exec --no-startup-id screencfg ~/.screencfg/laptop.yml ; exec --no-startup-id ~/.autostart/30_keyboard.sh
-    bindsym $mod+F4 exec --no-startup-id ~/.i3/scripts/i3exit suspend
-    bindsym $mod+Home exec --no-startup-id ~/.i3/scripts/shutdown-menu
+    bindsym $mod+F1 exec --no-startup-id workstation-client power lock
 
-    bindsym $mod+Shift+v exec --no-startup-id redshift-toggle
+    bindsym $mod+$screenshot exec --no-startup-id sh -c 'maim | xclip -selection clipboard -t image/png'
+    bindsym $mod+Shift+$screenshot exec --no-startup-id sh -c 'maim --select | xclip -selection clipboard -t image/png'
 
-    bindsym $mod+Shift+$scratchpad move scratchpad
-    bindsym $mod+$scratchpad scratchpad show
-
-    bindsym $mod+$pim_toggle \
-        unmark _destination; \
-        mark _source; \
-        workspace $workspace10; \
-        mark --add _destination; \
-        [con_mark="^_destination$"] swap container with mark "_source"; \
-        [con_mark="^_source$"] focus; \
-        unmark _source; \
-        [con_mark="^_destination$"] focus; \
-        unmark _destination;
+    bindsym $mod+$pim_toggle exec --no-startup-id $scriptdir/swap-from-workspace $workspace10
 
 ################################################################################
 ### MODES ######################################################################
@@ -286,17 +282,17 @@ assign [class="^Google-chrome$"] $workspace7
     floating_minimum_size 0 x 0
     floating_maximum_size 0 x 0
 
-    font pango:Inconsolata {{ machine.font_size }}
+    font pango:JetBrainsMono {{ machine.font_size }}
 
 ################################################################################
 ### COLOR SETTINGS #############################################################
 ################################################################################
 
 # class                 border  backgr. text    indicator
-client.focused          #E16B40 #E16B40 #000000 #FF0000
-client.focused_inactive #333333 #5f676a #ffffff #484e50
-client.unfocused        #333333 #202020 #cccccc #292d2e
-client.urgent           #2f343a #900000 #ffffff #900000
+client.focused          #e5b567 #e5b567 #000000 #FF0000
+client.focused_inactive #272822 #5f676a #ffffff #484e50
+client.unfocused        #1C1C1C #272822 #cccccc #292d2e
+client.urgent           #272822 #ff7777 #000000 #900000
 
 ################################################################################
 ### APPLICATION SPECIFIC SETTINGS ##############################################
@@ -312,45 +308,31 @@ bindsym $mod+F9 exec --no-startup-id evolution
 ### SPECIAL KEYBINDS ###########################################################
 ################################################################################
 
-bindsym XF86Sleep exec --no-startup-id $scriptdir/i3exit suspend
-bindsym XF86AudioMute exec --no-startup-id $scriptdir/pa-volume mute-toggle
-bindsym XF86AudioRaiseVolume exec --no-startup-id $scriptdir/pa-volume set-vol +3
-bindsym XF86AudioLowerVolume exec --no-startup-id $scriptdir/pa-volume set-vol -3
+bindsym XF86Sleep exec --no-startup-id workstation-client power lock
 
-bindsym XF86AudioPlay exec $scriptdir/spotify-control toggle
-bindsym XF86AudioNext exec $scriptdir/spotify-control next
-bindsym XF86AudioPrev exec $scriptdir/spotify-control previous
+bindsym XF86AudioMute exec        --no-startup-id workstation-client pulseaudio output toggle
+bindsym XF86AudioRaiseVolume exec --no-startup-id workstation-client pulseaudio output inc
+bindsym XF86AudioLowerVolume exec --no-startup-id workstation-client pulseaudio output dec
 
-# keys seemingly switched
-bindsym XF86MonBrightnessUp   exec --no-startup-id xbacklight -inc 8 ; exec --no-startup-id $scriptdir/update-status
-bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 8 ; exec --no-startup-id $scriptdir/update-status
+bindsym XF86AudioPlay exec --no-startup-id workstation-client spotify toggle
+bindsym XF86AudioNext exec --no-startup-id workstation-client spotify next
+bindsym XF86AudioPrev exec --no-startup-id workstation-client spotify previous
 
-bindsym $mod+o exec --no-startup-id xautorandr ; exec --no-startup-id kill -SIGUSR2 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)'"
-bindsym $mod+p exec --no-startup-id kill -SIGUSR1 $(cat $RUNDIR/wallchanger.$XDG_SESSION_ID.pid)
+bindsym XF86MonBrightnessUp   exec --no-startup-id workstation-client brightness inc
+bindsym XF86MonBrightnessDown exec --no-startup-id workstation-client brightness dec
 
-bindsym $mod+m exec --no-startup-id $scriptdir/pa-volume mute-toggle-mic
+bindsym $mod+m     exec --no-startup-id workstation-client pulseaudio input toggle
+bindsym $mod+space exec --no-startup-id workstation-client pulseaudio input toggle
+bindsym KP_Enter   exec --no-startup-id workstation-client pulseaudio input toggle
 
-
-
-# exec --no-startup-id autostart
-
-
-
-
-
-
-
-###############################################################################
+##############################################################################
 ### BARS #######################################################################
 ################################################################################
-#
+
 bar {
     mode dock
     position bottom
 
-
-#tray_output HDMI3
-    tray_output primary
     tray_padding 2
 
     strip_workspace_numbers no
@@ -361,24 +343,23 @@ bar {
 
     id bar-0
 
-    font pango:Inconsolata, FontAwesome {{ machine.font_size }}
+    font pango:JetBrainsMono, FontAwesome {{ machine.font_size }}
 
     colors {
         background #272822
         statusline #ffffff
-        separator #444444
-        # separator #e16b40
+        separator #555555
 
-        # focused_background #303030
-        # focused_separator #272822
+        focused_separator #e5b567
+        focused_background #272822
 
-        focused_workspace  #e16b40 #272822 #ffffff
-        active_workspace   #272822 #5f676a #ffffff
+        #                  border  bg      text
+        focused_workspace  #e5b567 #4f676a #ffffff
+        active_workspace   #272822 #4f676a #ffffff
         inactive_workspace #272822 #272822 #dddddd
-        urgent_workspace   #D00000 #D00000 #272822
-        binding_mode       #272822 #e16b40 #272822
+        urgent_workspace   #272822 #ff7777 #272822
+        binding_mode       #272822 #e5b567 #272822
     }
 
-    i3bar_command i3bar
-    status_command py3status --standalone --dbus-notify -c ~/.i3/i3status.conf
+    status_command i3status-rs ~/.config/i3status-rust/config.toml
 }

i3/i3status-rust/config.toml.j2

@@ -0,0 +1,106 @@
+icons_format = "{icon}"
+
+[icons]
+icons = "awesome"
+
+[icons.overrides]
+microphone = ""
+volume = ""
+bat = "\uf240"
+music = "\uf1bc"
+
+[theme]
+theme = "native"
+
+[theme.overrides]
+warning_fg = "#000000"
+warning_bg = "#F4Bf75"
+critical_fg = "#000000"
+critical_bg = "#F92672"
+end_separator = ""
+
+[[block]]
+block = "music"
+player = "spotify"
+separator = " — "
+format = " $icon {$combo $prev $play $next|-} "
+
+[[block]]
+block = "sound"
+driver = "pulseaudio"
+max_vol = 100
+format = " $icon{ $volume.eng(w:2)|} "
+
+[[block.click]]
+button = "left"
+cmd = "workstation-client pulseaudio output toggle"
+update = true
+
+[[block]]
+block = "sound"
+driver = "pulseaudio"
+device_kind = "source"
+format = "  $icon  "
+
+[block.theme_overrides]
+warning_fg = { link = "idle_fg" }
+warning_bg = { link = "idle_bg" }
+idle_fg = { link = "warning_fg" }
+idle_bg = { link = "warning_bg" }
+
+[[block.click]]
+button = "left"
+cmd = "workstation-client pulseaudio input toggle"
+update = true
+
+[[block]]
+block = "net"
+format = " $icon{ $signal_strength|}{ $ssid.str(max_width:10) | }"
+
+[[block]]
+block = "battery"
+interval = 10
+format = " $icon $percentage $time "
+charging_format = " $icon $percentage "
+missing_format = ""
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+signal = 1
+command_on = "workstation-client present toggle ; pkill -SIGRTMIN+1 i3status-rs"
+command_off = "workstation-client present toggle ; pkill -SIGRTMIN+1 i3status-rs"
+command_state = "[[ $(workstation-client present status) == on ]] && echo active"
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+command_on = "workstation-client theme light"
+command_off = "workstation-client theme dark"
+command_state = "[[ $(workstation-client theme status) == light ]] && echo 1"
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+command_on = "workstation-client redshift start"
+command_off = "workstation-client redshift stop"
+command_state = "[[ $(workstation-client redshift status) == active ]] && echo 1"
+signal = 0
+
+[[block]]
+block = "toggle"
+format = "   $icon "
+command_on = "workstation-client spotify start"
+command_off = "workstation-client spotify stop"
+command_state = "[[ $(workstation-client spotify status) == active ]] && echo 1"
+signal = 0
+
+[[block]]
+block = "custom"
+json = true
+command = "ping -n -q -w 2 -c 1 8.8.8.8 >/dev/null 2>/dev/null && printf '{\"text\":\"\",\"state\":\"Info\"}' || printf '{\"text\":\"\",\"state\":\"Critical\"}'"
+
+[[block]]
+block = "time"
+interval = 1
+format = " $timestamp.datetime(f:'[CW %V] %a %d.%m.%Y %H:%M:%S', l:de_DE) "

i3/i3status-rust/icons/awesome.toml

@@ -0,0 +1,94 @@
+# FontAwesome 4: https://fontawesome.com/v4.7.0/cheatsheet/
+backlight_empty = "\U0001f315"
+backlight_full = "\U0001f311"
+backlight_1 = "\U0001f314"
+backlight_2 = "\U0001f314"
+backlight_3 = "\U0001f314"
+backlight_4 = "\U0001f314"
+backlight_5 = "\U0001f313"
+backlight_6 = "\U0001f313"
+backlight_7 = "\U0001f313"
+backlight_8 = "\U0001f313"
+backlight_9 = "\U0001f313"
+backlight_10 = "\U0001f312"
+backlight_11 = "\U0001f312"
+backlight_12 = "\U0001f312"
+backlight_13 = "\U0001f312"
+bat_charging = "\uf1e6"           # fa-plug
+bat_discharging = "\uf242"        # fa-battery-half
+bat_10 = "\uf244"                 # fa-battery-empty
+bat_20 = "\uf243"                 # fa-battery-quarter
+bat_30 = "\uf243"                 # fa-battery-quarter
+bat_40 = "\uf243"                 # fa-battery-quarter
+bat_50 = "\uf242"                 # fa-battery-half
+bat_60 = "\uf242"                 # fa-battery-half
+bat_70 = "\uf241"                 # fa-battery-three-quarters
+bat_80 = "\uf241"                 # fa-battery-three-quarters
+bat_90 = "\uf241"                 # fa-battery-three-quarters
+bat_full = "\uf240"               # fa-battery-full
+bat_not_available = "\uf244"      # fa-battery-empty
+bell = "\uf0f3"                   # fa-bell
+bell-slash = "\uf1f7"             # fa-bell-slash-o
+bluetooth = "\uf294"              # fa-bluetooth-b
+calendar = "\uf073"               # fa-calendar
+cogs = "\uf085"                   # fa-cogs
+cpu = "\uf0e4"                    # fa-dashboard
+cpu_boost_off = "\uf204"          # fa-toggle-off
+cpu_boost_on = "\uf205"           # fa-toggle-on
+disk_drive = "\uf0a0"             # fa-hdd-o
+docker = "\uf21a"                 # fa-ship
+github = "\uf09b"                 # fa-github
+gpu = "\uf26c"                    # fa-television
+headphones = "\uf025"             # fa-headphones
+joystick = "\uf11b"               # fa-gamepad
+keyboard = "\uf11c"               # fa-keyboard-o
+mail = "\uf0e0"                   # fa-envelope
+memory_mem = "\uf2db"             # fa-microchip
+memory_swap = "\uf0a0"            # fa-hdd-o
+mouse = "\uf245"                  # fa-mouse-pointer
+music = "\uf001"                  # fa-music
+music_next = "\uf061"             # fa-arrow-right
+music_pause = "\uf04c"            # fa-pause
+music_play = "\uf04b"             # fa-play
+music_prev = "\uf060"             # fa-arrow-left
+net_bridge = "\uf0e8"             # fa-sitemap
+net_down = "\u2b07"
+net_loopback = "LO"
+net_modem = "\uf095"              # fa-phone
+net_up = "\u2b06"
+net_vpn = "\uf023"                # fa-lock
+net_wired = "\uf0ac"              # fa-globe
+net_wireless = "\uf1eb"           # fa-wifi
+notification = "\uf0a2"           # fa-bell-o
+phone = "\uf10b"                  # fa-mobile
+phone_disconnected = "\U0001f4f5" # https://unicode-table.com/en/1F4F5/
+ping = "\u21ba"
+pomodoro = "\U0001f345"
+pomodoro_break = "\uf0f4"         # fa-coffee
+pomodoro_paused = "\uf04c"        # fa-pause
+pomodoro_started = "\uf04b"       # fa-play
+pomodoro_stopped = "\uf04d"       # fa-stop
+resolution = "\uf096"             # fa-square-o
+tasks = "\uf0ae"                  # fa-tasks
+thermometer = "\uf2c8"            # fa-thermometer-3
+time = "\uf017"                   # fa-clock-o
+toggle_off = "\uf204"             # fa-toggle-off
+toggle_on = "\uf205"              # fa-toggle-on
+unknown = "\uf128"                # fa-question
+update = "\uf062"                 # fa-arrow-up
+uptime = "\uf017"                 # fa-clock-o
+volume_empty = "\uf026"           # fa-volume-off
+volume_full = "\uf028"            # fa-volume-up
+volume_half = "\uf027"            # fa-volume-down
+volume_muted = "\uf026 \uf00d"
+microphone_empty = "\uf130"       # fa-microphone
+microphone_full = "\uf130"        # fa-microphone
+microphone_half = "\uf130"        # fa-microphone
+microphone_muted = "\uf131"       # fa-microphone-slash
+weather_clouds = "\uf0c2"         # fa-cloud
+weather_default = "\uf0c2"        # fa-cloud
+weather_rain = "\uf043"           # fa-tint
+weather_snow = "\uf2dc"           # fa-snowflake-o
+weather_sun = "\uf185"            # fa-sun-o
+weather_thunder = "\uf0e7"        # fa-bolt
+xrandr = "\uf26c"                 # fa-television

i3/i3status-rust/themes/native.toml

@@ -0,0 +1 @@
+

i3/i3status.conf.j2

@@ -1,97 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-    interval = 1
-    # color = '#FFFFFF'
-    # color_good = '#00FF00'
-    # color_bad = '#FF0000'
-    # color_degraded = '#FFFF00'
-    color = '#FFFFFF'
-    color_good = '#FFFFFF'
-    color_bad = '#F92672'
-    color_degraded = '#F4Bf75'
-}
-
-
-order += "volume_status output"
-order += "volume_status input"
-order += spotify
-order += "wifi"
-order += "external_script presentation_mode"
-order += online_status
-order += "battery_level all"
-order += "clock"
-
-battery_level all {
-    battery_id = "all"
-    format = "   {icon}   {percent}% {time_remaining} "
-    measurement_mode = "sys"
-    charging_character = ""
-    blocks = ""
-    notification = true
-    hide_when_full = false
-    hide_seconds = true
-    notify_low_level = true
-    threshold_full = 95
-}
-
-clock {
-    format = ["{DE}", "{NZ}", "{Cuba}", "{MX}", "{CZ}", "{NL}", "{VN}"]
-    format_time = "      {name} \[KW %V\] %a %d.%m.%Y %H:%M:%S "
-}
-
-wifi {
-    bitrate_bad = 0
-    bitrate_degraded = 0
-    format_down = "      down "
-    format_up = "      {signal_percent} {ssid} "
-}
-
-spotify {
-    format = "      {title} - {artist} "
-    format_down = "      off "
-    format_stopped = "      stopped "
-    cache_timeout = 1
-    color_offline = '#FFFFFF'
-    on_click 1 = "exec $HOME/.i3/scripts/spotify-control toggle"
-    on_click 3 = "exec $HOME/.i3/scripts/spotify-control next"
-}
-
-external_script presentation_mode {
-    format = " Present: {output} "
-    script_path = "$HOME/.i3/scripts/presentation-mode status"
-    strip_output = True
-    on_click 1 = "exec $HOME/.i3/scripts/presentation-mode toggle"
-
-}
-
-online_status {
-    format = " {icon} "
-}
-
-volume_status output {
-    cache_timeout = 10
-    format = "      {percentage}% "
-    format_muted = "      mute "
-    thresholds = []
-    command = "pactl"
-    color_muted = '#FFFFFF'
-    on_click 1 = "exec $HOME/.i3/scripts/pa-volume mute-toggle"
-}
-
-volume_status input {
-    cache_timeout = 10
-    format = "      active "
-    format_muted = "      mute "
-    thresholds = [(0, 'good'), (1, 'bad')]
-    command = "pactl"
-    color_muted = '#FFFFFF'
-    is_input = True
-    on_click 1 = "exec $HOME/.i3/scripts/pa-volume mute-toggle-mic"
-}

i3/scripts/appmenu

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-dmenu_run -fn 'Inconsolata:size=10' -b -i -l 10 -p '>' -nb '#222222' -nf '#ffffff' -sb '#e16b40' -sf '#000001'

i3/scripts/bar-update

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ "$1" ]] ; then
-    modules="$1"
-else
-    modules=all
-fi
-
-py3-cmd refresh "$modules"

i3/scripts/i3exit

@@ -1,105 +0,0 @@
-#!/bin/bash
-
-### From http://www.archlinux.org/index.php/i3
-
-_logfile="$LOGDIR/i3/i3exit.log"
-LOCKSCREEN="$LIBDIR/wallpaper/lockscreen"
-
-_fallback_color="000000"
-
-touch "$_logfile"
-
-log()
-{
-    echo "$*"
-    echo "[$(date +%FT%T)] $*" >> "$_logfile"
-}
-
-lock()
-{
-    set -x
-    playing=0
-    # if dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' string:'PlaybackStatus'|grep -q Playing ; then
-    #     playing=1
-    # fi
-    # echo $playing
-    # (( $playing )) && dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Pause
-    if [[ -f "$LOCKSCREEN" ]] ; then
-        i3lock --nofork --show-failed-attempts --ignore-empty-password \
-            --image "$LOCKSCREEN"
-    else
-        i3lock --nofork --show-failed-attempts --ignore-empty-password \
-            --color "$_fallback_color"
-    fi
-    # (( $playing )) && dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Play
-}
-
-screen_off() {
-    :
-    xset dpms force off
-}
-
-reset_screen() {
-    xset -dpms
-    xset s off
-}
-
-lock_and_screen_off() {
-    lock &
-    _pid=$!
-    dunstctl disable
-    screen_off
-    xset dpms 0 0 5
-    wait $_pid
-    dunstctl enable
-    reset_screen
-}
-
-disable_lid_switch() {
-    grep "^${ACPI_LID_NAME}.*enabled" /proc/acpi/wakeup && echo " ${ACPI_LID_NAME}" | sudo tee /proc/acpi/wakeup
-}
-
-signal="$1"
-log "[I] Received signal \"$signal\"."
-
-case "$signal" in
-    lock)
-        log "[I] Locking session."
-        lock_and_screen_off
-        ;;
-    logout)
-        log "[I] Exiting i3."
-        i3-msg exit
-        ;;
-    suspend)
-        log "[I] Suspending."
-        lock &
-        disable_lid_switch
-        sleep 0.1
-        systemctl suspend
-        ;;
-    hibernate)
-        log "[I] Hibernating."
-        disable_lid_switch
-        sudo systemctl hibernate
-        ;;
-    reboot)
-        log "[I] Rebooting."
-        systemctl reboot
-        ;;
-    shutdown)
-        log "[I] Shutting down."
-        systemctl poweroff
-        ;;
-    screen-off)
-        log "[I] Turning screen off."
-        screen_off
-        ;;
-    *)
-        echo "Usage: $0 {lock|logout|suspend|hibernate|reboot|shutdown}"
-        log "[E] Signal \"$signal\" unknown. Aborting."
-        exit 2
-esac
-
-log "[I] Done."
-exit 0

i3/scripts/pa-volume

@@ -1,137 +0,0 @@
-#!/bin/bash
-
-# name of the sink. execute pactl list sinks to get a list
-SINKNAME="$(pactl info | grep '^Default Sink:' | cut -d ' ' -f 3-)"
-
-# name of the sink. execute pactl list sinks to get a list
-SOURCENAME="$(pactl info | grep '^Default Source:' | cut -d ' ' -f 3-)"
-
-#SINKNAME="alsa_output.usb-Logitech_Logitech_Wireless_Headset_88C626354D45-00.analog-stereo"
-# this is the worst
-SINK=$(( $(pactl list sinks | grep "Name: " | grep -n "${SINKNAME}"$ | grep -o "^[[:digit:]]*") -1))
-
-SOURCE=$(( $(pactl list sources | grep "Name: " | grep -n "${SOURCENAME}"$ | grep -o "^[[:digit:]]*") -1))
-
-
-getvol() {
-    echo $(pactl list sinks | grep "^[[:space:]]*Volume" | head -n $(( $SINK + 1 )) | tail -n 1 | grep -o "[[:digit:]]*%" | head -n 1 | cut -d "%" -f 1)
-}
-
-setvol() {
-    if [[ $1 =~ [+-][0-9]+ ]] ; then
-        oldvol="$(getvol)"
-        echo "oldvol $oldvol"
-        delta="$(echo "$1" | cut -c 2-)"
-        echo "delta $delta"
-        if [[ "$(echo "$1" | cut -c 1)" == "+" ]] ; then
-            echo "+"
-            newvol=$(( $oldvol + $delta ))
-        else
-            echo "-"
-            newvol=$(( $oldvol - $delta ))
-            echo $newvol
-        fi
-        if [[ $newvol -gt 100 ]]; then
-            echo "capping at 100 percent"
-            newvol=100
-        fi
-        if [[ $newvol -lt 0 ]]; then
-            echo "capping at 0 percent"
-            newvol=0
-        fi
-        echo "newvol $newvol"
-    else
-        newvol="$1"
-    fi
-    pactl set-sink-volume $SINKNAME $(( $newvol * 65536 / 100 ))
-}
-
-ismuted() {
-    muted=$(pactl list sinks | grep "^[[:space:]]*Mute" | head -n $(( $SINK + 1 )) | tail -n 1 | cut -d " " -f 2)
-    if [[ $muted == "no" ]]; then
-        echo 0
-    else
-        echo 1
-    fi
-}
-
-mute() {
-    pactl set-sink-mute $SINKNAME 1
-}
-
-unmute() {
-    pactl set-sink-mute $SINKNAME 0
-}
-
-mute-toggle() {
-    pactl set-sink-mute $SINKNAME toggle
-}
-
-mute-toggle-mic() {
-    pactl set-source-mute $SOURCENAME toggle
-}
-
-status() {
-    if [[ $(ismuted) == "1" ]] ; then
-        echo "mute"
-        return
-    fi
-    echo "$(getvol)%"
-}
-
-usage() {
-    echo "Usage:"
-    echo
-    echo "$0 get-vol"
-    echo "$0 set-vol VOL_PERC"
-}
-
-update_status_bar_sink() {
-    ~/.i3/scripts/bar-update "volume_status output"
-}
-
-update_status_bar_source() {
-    ~/.i3/scripts/bar-update "volume_status input"
-}
-
-case "$1" in
-    "sink")
-        echo $SINKNAME
-        echo $SINK
-        ;;
-    "get-vol")
-        echo $(getvol)
-        ;;
-    "set-vol")
-        if [[ -z "$2" ]] ; then
-            usage
-        else
-            setvol "$2"
-        fi
-        update_status_bar_sink
-        ;;
-    "mute")
-        mute
-        update_status_bar_sink
-        ;;
-    "unmute")
-        unmute
-        update_status_bar_sink
-        ;;
-    "mute-toggle")
-        mute-toggle
-        update_status_bar_sink
-        ;;
-    "mute-toggle-mic")
-        mute-toggle-mic
-        update_status_bar_source
-        ;;
-    "is-muted")
-        echo $(ismuted)
-        ;;
-    "status")
-        echo $(status)
-        ;;
-    *)
-        usage
-esac

i3/scripts/presentation-mode

@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-_status_file="${XDG_RUNTIME_DIR}/presentation-mode-on"
-_autostart="$HOME/.autostart.sh"
-
-is_on() {
-    [[ -e "${_status_file}" ]]
-}
-
-switch_on() {
-    touch "${_status_file}"
-    dunstctl disable &
-    systemctl --user --no-block stop redshift_user
-    systemctl --user --no-block stop spotify
-}
-
-switch_off() {
-    rm -f "${_status_file}"
-    dunstctl enable &
-    "$_autostart" redshift_user spotify
-}
-
-
-case "$1" in
-    status)
-        if is_on ; then
-            printf "on\n"
-            printf '#F4BF75'
-        else
-            printf "off\n"
-            # printf '#F4BF75'
-        fi
-        ;;
-    toggle)
-        if is_on ; then
-            switch_off
-        else
-            switch_on
-        fi
-        ;;
-    off)
-        switch_off
-        ;;
-    on)
-        switch_on
-        ;;
-esac
-
-

i3/scripts/shutdown-menu

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-options=(
-"lock"
-"logout"
-"suspend"
-"hibernate"
-"reboot"
-"shutdown"
-"screen-off")
-
-i=1
-output=$(
-for option in "${options[@]}"; do
-    echo "($i) $option"
-    (( i++ ))
-done | dmenu -fn 'Inconsolata:size=10' -b -i -l 10 -p '>' -nb '#222222' -nf '#ffffff' -sb '#e16b40' -sf '#000000')
-
-[[ "$output" ]] && "$(dirname "$0")"/i3exit "${output#(*) }"

i3/scripts/spotify-control

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-case "$1" in
-toggle)
-    cmd="PlayPause"
-    ;;
-next)
-    cmd="Next"
-    ;;
-previous)
-    cmd="Previous"
-    ;;
-*)
-    echo "wrong argument $1"
-    exit 1
-    ;;
-esac
-
-dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player."${cmd}"
-~/.i3/scripts/bar-update spotify

i3/scripts/spotify-current

@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-import dbus
-session_bus = dbus.SessionBus()
-spotify_bus = session_bus.get_object("org.mpris.MediaPlayer2.spotify",
-                                     "/org/mpris/MediaPlayer2")
-spotify_properties = dbus.Interface(spotify_bus,
-                                    "org.freedesktop.DBus.Properties")
-metadata = spotify_properties.Get("org.mpris.MediaPlayer2.Player", "Metadata")
-
-# The property Metadata behaves like a python dict
-# for key, value in metadata.items():
-#     print(key, value)
-
-# To just print the title
-print("{}: {} - [{}]".format(
-    metadata['xesam:artist'][0],
-    metadata['xesam:title'],
-    metadata['xesam:album']
-))
-

i3/scripts/swap-from-workspace

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

install.sh

@@ -8,81 +8,48 @@
 set -o errexit
 set -o nounset
 
+# Make sure to standardize locale, regardless of the machine config
+#
+# Having a different locale broke "yes | pacman -S" to force-install
+# iptables, for example
+export LC_ALL="en_US.UTF-8"
+
 DOTDIR="/var/lib/dotfiles"
-_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-
-if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] && [[ "${_SCRIPT_DIR}" != "${DOTDIR}" ]] ; then
-    if [[ -e "${DOTDIR}" ]] ; then
-        2>&1 printf "${DOTDIR} already exists. This seems unsafe.\n"
-        exit 1
-    fi
-    printf "Moving directory to $DOTDIR ...\n"
-    sudo=""
-    if (( $(id -u ) != 0 )) ; then
-        sudo=sudo
-    fi
-    $sudo mv --no-target-directory "${_SCRIPT_DIR}" "${DOTDIR}"
-    printf "Done\n"
-else
-    printf "Already working in ${DOTDIR}, nothing to do\n"
-fi
-
-cd "${DOTDIR}"
 
 os_release_file=/etc/os-release
 if [[ ! -e "${os_release_file}" ]] ; then
-    2>&1 printf "Could not find ${os_release_file}, exiting"
+    2>&1 printf 'Could not find %, exiting\n' "${os_release_file}"
     exit 1
 fi
 
-source /etc/os-release
+# shellcheck source=/etc/os-release
+source "${os_release_file}"
 
 sudowrap() {
-    if (( $(id -u ) != 0 )) ; then
+    if (( $(id -u) != 0 )) ; then
         sudo "${@}"
     else
         "${@}"
     fi
 }
 
-_install() {
-    _package="$1" ; shift
-    if [[ $NAME == "Fedora" ]] ; then
-        sudowrap dnf install --assumeyes "${_package}"
-    elif [[ $NAME == "Ubuntu" ]] ; then
-        sudowrap apt-get install --assume-yes "${_package}"
-    elif [[ $NAME == "Arch Linux" ]] ; then
-        sudowrap pacman -S --noconfirm "${_package}"
+cache_updated=0
+install() {
+    local package="$1" ; shift
+
+    if [[ $NAME == "Arch Linux" ]] ; then
+        if (( ! cache_updated )) ; then
+            sudowrap pacman -Sy
+            cache_updated=1
+        fi
+        sudowrap pacman -S --needed --noconfirm "${package}"
     else
-        2>&1 printf "Unsupported distro $NAME, exiting"
+        2>&1 printf 'Unsupported distro %s, exiting\n' "$NAME"
         exit 1
     fi
 }
 
+command -v make    >/dev/null || install "make"
+command -v ansible >/dev/null || install "ansible"
 
-if ! command -v python3 >/dev/null ; then
-    printf 'Python3 not installed, installing ...\n'
-    _install "python3"
-    printf 'Done\n'
-fi
-
-if ! command -v make >/dev/null ; then
-    printf 'Make not installed, installing ...\n'
-    _install "make"
-    printf 'Done\n'
-fi
-
-# Required for compiling modules in venv.
-if ! command -v gcc >/dev/null ; then
-    printf 'gcc not installed, installing ...\n'
-    _install "gcc"
-    printf 'Done\n'
-fi
-
-if ! python3 -c 'import venv' 2>/dev/null ; then
-    printf 'Python3 venv module not installed, installing ...\n'
-    _install python3-venv
-    printf 'Done\n'
-fi
-
-cd "$DOTDIR" && make
+cd "${DOTDIR}" && make

install_scripts/ares-bootstrap.sh

@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -o nounset
-set -o errexit
-
-pacman -Sy --noconfirm git # yes its a partial upgrade, but thats just the live cd
-
-cd /root
-git clone --recursive https://code.hkoerber.de/hannes/dotfiles.git
-
-./dotfiles/install_scripts/ares.sh /dev/sda
-
-mv /root/dotfiles /mnt/root/dotfiles
-cat << EOF > /mnt/root/.bash_profile
-if /root/dotfiles/install.sh ; then
-    rm -f /root/.bash_profile
-    reboot
-fi
-EOF
-
-umount -R /mnt
-
-read -p "> Ready for reboot. Press enter for shutdown, then remove the installation media and boot again "
-poweroff

install_scripts/ares.sh

@@ -1,22 +1,18 @@
 #!/usr/bin/env bash
 
-# Parameters:
-#
-# $1: Device
-
 set -o xtrace
 set -o nounset
 set -o errexit
 
-DEVICE="${1:?}"
+DEVICE="/dev/sda"
 
 if [[ ! -b "${DEVICE}" ]] ; then
-    printf '%s does not look like a device' "${DEVICE}"
+    printf '%s does not look like a device\n' "${DEVICE}"
     exit 1
 fi
 
 if [[ ! -d /sys/firmware/efi/efivars ]] ; then
-    printf 'efivars does not exist, looks like the system is not booted in EFI mode'
+    printf 'efivars does not exist, looks like the system is not booted in EFI mode\n'
     exit 1
 fi
 
@@ -29,15 +25,17 @@ sed -e 's/\s*\([^#]*\).*/\1/' << EOF | sfdisk ${DEVICE}
     device: ${DEVICE}
 
     ${DEVICE}1 : name=uefi      , size=512M , type=uefi
-    ${DEVICE}2 : name=boot      , size=200M , type=linux
+    ${DEVICE}2 : name=boot      , size=1G   , type=linux
     ${DEVICE}3 : name=cryptpart ,             type=linux
 EOF
 
 # might take a bit for the new partion table to be updated in-kernel
 sleep 1
 
-cryptsetup --batch-mode luksFormat --iter-time 1000 ${DEVICE}3
-cryptsetup --batch-mode open ${DEVICE}3 cryptpart
+while : ; do
+    cryptsetup --batch-mode luksFormat --iter-time 1000 ${DEVICE}3
+    cryptsetup --batch-mode open --tries 1 ${DEVICE}3 cryptpart && break
+done
 
 pvcreate /dev/mapper/cryptpart
 vgcreate vgbase /dev/mapper/cryptpart
@@ -61,7 +59,7 @@ mount ${DEVICE}2 /mnt/boot
 mkswap /dev/vgbase/swap
 swapon /dev/vgbase/swap
 
-pacstrap /mnt base linux linux-firmware networkmanager amd-ucode lvm2 grub efibootmgr
+pacstrap /mnt base linux-zen linux-firmware networkmanager amd-ucode lvm2 grub efibootmgr
 
 genfstab -U /mnt >> /mnt/etc/fstab
 
@@ -91,7 +89,7 @@ cat <<EOF > /etc/hosts
 127.0.1.1 ares
 EOF
 
-sed -i 's/^HOOKS=.*$/HOOKS=(base udev autodetect keyboard keymap consolefont modconf block encrypt lvm2 filesystems resume fsck)/' /etc/mkinitcpio.conf
+sed -i 's/^HOOKS=.*$/HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block encrypt lvm2 filesystems resume fsck)/' /etc/mkinitcpio.conf
 
 mkinitcpio -P
 
@@ -106,6 +104,32 @@ grub-mkconfig -o /boot/grub/grub.cfg
 systemctl enable NetworkManager
 
 passwd
+
+# enable root autologin on first boot
+
+mkdir /etc/systemd/system/getty@tty1.service.d/
+cat << EOF > /etc/systemd/system/getty@tty1.service.d/autologin.conf
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root %I $TERM
+EOF
+# ExecStartPost=/bin/rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
+# ExecStartPost=/bin/rmdir /etc/systemd/system/getty@tty1.service.d/
+
+# Run
+cat << 'EOF' > /root/.bash_profile
+    if [[ "\$(tty)" == "/dev/tty1" ]] ; then
+        while ! ping -w 3 -c 3 8.8.8.8 ; do
+            nmtui
+            sleep 5
+        done
+        rm -rf /etc/systemd/system/getty@tty1.service.d/
+        if /var/lib/dotfiles/install.sh ; then
+            rm -f /root/.bash_profile
+            reboot
+        fi
+    fi
+EOF
 CHROOTSCRIPT
 
 chmod +x /mnt/chroot-script.sh

install_scripts/bootstrap.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o errexit
+
+host="${1}" ; shift
+
+pacman -Sy --noconfirm git # yes its a partial upgrade, but thats just the live cd
+
+cd /root
+git clone --recursive https://code.hkoerber.de/hannes/dotfiles.git
+
+./dotfiles/install_scripts/"${host}".sh
+
+mv /root/dotfiles /mnt/var/lib/dotfiles
+
+read -rp "> Ready for reboot. Press enter for shutdown, then remove the installation media and boot again "
+
+poweroff

install_scripts/dionysus.sh

@@ -0,0 +1,137 @@
+#!/usr/bin/env bash
+
+set -o xtrace
+set -o nounset
+set -o errexit
+
+DEVICE="/dev/nvme0n1"
+
+if [[ ! -b "${DEVICE}" ]] ; then
+    printf '%s does not look like a device\n' "${DEVICE}"
+    exit 1
+fi
+
+if [[ ! -d /sys/firmware/efi/efivars ]] ; then
+    printf 'efivars does not exist, looks like the system is not booted in EFI mode\n'
+    exit 1
+fi
+
+loadkeys de-latin1
+
+timedatectl set-ntp true
+
+sed -e 's/\s*\([^#]*\).*/\1/' << EOF | sfdisk ${DEVICE}
+    label: gpt
+    device: ${DEVICE}
+
+    ${DEVICE}p1 : name=uefi      , size=512M , type=uefi
+    ${DEVICE}p2 : name=boot      , size=1G   , type=linux
+    ${DEVICE}p3 : name=cryptpart ,             type=linux
+EOF
+
+# might take a bit for the new partion table to be updated in-kernel
+sleep 1
+
+while : ; do
+    cryptsetup --batch-mode luksFormat --iter-time 1000 ${DEVICE}p3
+    cryptsetup --batch-mode open --tries 1 ${DEVICE}p3 cryptpart && break
+done
+
+pvcreate /dev/mapper/cryptpart
+vgcreate vgbase /dev/mapper/cryptpart
+
+lvcreate -L 16G vgbase -n swap
+lvcreate -l 100%FREE vgbase -n root
+
+yes | mkfs.fat -F32 ${DEVICE}p1
+yes | mkfs.ext4 ${DEVICE}p2
+yes | mkfs.ext4 /dev/vgbase/swap
+yes | mkfs.ext4 /dev/vgbase/root
+
+mount /dev/vgbase/root /mnt
+
+mkdir /mnt/efi
+mount ${DEVICE}p1 /mnt/efi
+
+mkdir /mnt/boot
+mount ${DEVICE}p2 /mnt/boot
+
+mkswap /dev/vgbase/swap
+swapon /dev/vgbase/swap
+
+pacstrap /mnt base linux-zen linux-firmware networkmanager intel-ucode lvm2 grub efibootmgr
+
+genfstab -U /mnt >> /mnt/etc/fstab
+
+cat << CHROOTSCRIPT > /mnt/chroot-script.sh
+
+set -o xtrace
+set -o errexit
+set -o nounset
+
+ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+hwclock --systohc
+
+sed -i 's/^#de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen
+sed -i 's/^#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
+
+locale-gen
+
+printf 'LANG=en_US.UTF-8\n' > /etc/locale.conf
+
+printf 'KEYMAP=de-latin1\nFONT=lat2-16\n' > /etc/vconsole.conf
+
+printf 'dionysus\n' > /etc/hostname
+
+cat <<EOF > /etc/hosts
+127.0.0.1 localhost
+::1       localhost
+127.0.1.1 dionysus
+EOF
+
+sed -i 's/^HOOKS=.*$/HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block encrypt lvm2 filesystems resume fsck)/' /etc/mkinitcpio.conf
+
+mkinitcpio -P
+
+grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=GRUB
+
+sed -i "s/^GRUB_CMDLINE_LINUX=.*$/GRUB_CMDLINE_LINUX=\"cryptdevice=UUID=\$(blkid -s UUID -o value ${DEVICE}p3):cryptpart root=UUID=\$(blkid -s UUID -o value /dev/vgbase/root)\"/" /etc/default/grub
+sed -i "s/^GRUB_CMDLINE_LINUX_DEFAULT=.*$/GRUB_CMDLINE_LINUX_DEFAULT=\"resume=UUID=\$(blkid -s UUID -o value /dev/vgbase/swap)\"/" /etc/default/grub
+sed -i 's/^GRUB_DISABLE_RECOVERY=.*$/GRUB_DISABLE_RECOVERY=/' /etc/default/grub
+
+grub-mkconfig -o /boot/grub/grub.cfg
+
+systemctl enable NetworkManager
+
+passwd
+
+# enable root autologin on first boot
+
+mkdir /etc/systemd/system/getty@tty1.service.d/
+cat << EOF > /etc/systemd/system/getty@tty1.service.d/autologin.conf
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root %I $TERM
+EOF
+# ExecStartPost=/bin/rm /etc/systemd/system/getty@tty1.service.d/autologin.conf
+# ExecStartPost=/bin/rmdir /etc/systemd/system/getty@tty1.service.d/
+
+# Run
+cat << 'EOF' > /root/.bash_profile
+    if [[ "\$(tty)" == "/dev/tty1" ]] ; then
+        while ! ping -w 3 -c 3 8.8.8.8 ; do
+            nmtui
+            sleep 5
+        done
+        rm -rf /etc/systemd/system/getty@tty1.service.d/
+        if /var/lib/dotfiles/install.sh ; then
+            rm -f /root/.bash_profile
+            reboot
+        fi
+    fi
+EOF
+CHROOTSCRIPT
+
+chmod +x /mnt/chroot-script.sh
+arch-chroot /mnt /chroot-script.sh
+rm -f /mnt/chroot-script.sh