Install geeqie

alacritty/alacritty.toml.j2

@@ -12,19 +12,19 @@ WINIT_X11_SCALE_FACTOR = "1"
 size = {{ machine.font_size_2 }}
 
 [font.bold]
-family = "Inconsolata"
+family = "JetBrainsMono"
 style = "Bold"
 
 [font.bold_italic]
-family = "Inconsolata"
+family = "JetBrainsMono"
 style = "Bold Italic"
 
 [font.italic]
-family = "Inconsolata"
+family = "JetBrainsMono"
 style = "Italic"
 
 [font.normal]
-family = "Inconsolata"
+family = "JetBrainsMono"
 style = "Regular"
 
 [selection]

dotfiles.yml

@@ -15,12 +15,16 @@ empty_directories:
   - name: .config/i3
   - name: .config/zsh
   - name: .config/alacritty
+  - name: .local/state/gnupg/
+    mode: '0700'
 dotfiles:
   - from: git/gitconfig
     to: .config/git/config
     template: true
   - from: 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: .local/state/gnupg/gpg-agent.conf
     template: true

gnupg/scdaemon.conf

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

helix/languages.toml

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

@@ -288,7 +288,7 @@ assign [class="^Wine$"] $workspace10
     floating_minimum_size 0 x 0
     floating_maximum_size 0 x 0
 
-    font pango:Inconsolata {{ machine.font_size_1 }}
+    font pango:JetBrainsMono {{ machine.font_size_1 }}
 
 ################################################################################
 ### COLOR SETTINGS #############################################################
@@ -349,7 +349,7 @@ bar {
 
     id bar-0
 
-    font pango:Inconsolata, FontAwesome {{ machine.font_size_1 }}
+    font pango:JetBrainsMono, FontAwesome {{ machine.font_size_1 }}
 
     colors {
         background #272822

i3/i3status-rust/config.toml.j2

@@ -67,9 +67,9 @@ missing_format = ""
 [[block]]
 block = "toggle"
 format = "   $icon "
-command_on = "$HOME/.i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
+command_on = "$XDG_CONFIG_HOME/i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
-command_off = "$HOME/.i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
+command_off = "$XDG_CONFIG_HOME/i3/scripts/presentation-mode toggle ; pkill -SIGRTMIN+0 i3status-rs"
-command_state = "[[ $($HOME/.i3/scripts/presentation-mode status) == on ]] && echo active"
+command_state = "[[ $($XDG_CONFIG_HOME/i3/scripts/presentation-mode status) == on ]] && echo active"
 
 [[block]]
 block = "toggle"

packages.yml

@@ -55,11 +55,16 @@ xdotool:
 arandr:
   archlinux: ["arandr"]
 docker:
-  archlinux: ["docker", "docker-compose"]
+  archlinux: ["docker", "docker-compose", "docker-buildx"]
 font-awesome:
-  archlinux: ["ttf-font-awesome", "otf-font-awesome", "awesome-terminal-fonts"]
+  archlinux: 
+    - ttf-font-awesome
+    - otf-font-awesome
+    - awesome-terminal-fonts
 font-inconsolata:
   archlinux: ["ttf-inconsolata"]
+font-jetbrainsmono:
+  archlinux: ["ttf-jetbrains-mono"]
 font-dejavu:
   archlinux: ["ttf-dejavu"]
 font-libertine:
@@ -143,6 +148,8 @@ python:
     - bandit
     - python-pyflakes
     - python-pylint
+    - flake8
+    - mypy
 python-modules:
   archlinux:
     - python-ruamel-yaml
@@ -500,3 +507,9 @@ wine:
     - vkd3d
     - lib32-vkd3d
     - lib32-gnutls
+sqlx:
+  archlinux:
+    - sqlx-cli
+geeqie:
+  archlinux:
+    - geeqie

playbook.yml

@@ -655,7 +655,7 @@
               block:
                 - name: install nouveau packages
                   package:
-                    name: "{{ drivers.gpu.gpu }}"
+                    name: "{{ drivers.gpu.nvidia }}"
                     state: present
                   become: true
           when:
@@ -683,6 +683,17 @@
           state: absent
         become: true
 
+    - name: try to make gpg agent behave
+      block:
+      - name: configure pacman to skip installing gpg user units
+        blockinfile:
+          path: /etc/pacman.conf
+          insertafter: '^#NoExtract'
+          block: |
+            NoExtract = usr/lib/systemd/user/gpg-agent*
+          marker: "# {mark} ANSIBLE MANAGED noextract gpg-agent"
+        become: true
+
     - name: backlight configuration
       tags:
         - backlight

remove-unconfigured-packages.sh

@@ -21,6 +21,7 @@ proctected=(
 )
 
 for pkgbuild in pkgbuilds/*/PKGBUILD ; do
+  # shellcheck disable=SC1090
   source "${pkgbuild}"
   aurdeps+=("${depends[@]%%[<=>]*}" "${makedepends[@]%%[<=>]*}" "${pkgname}")
 done
@@ -31,7 +32,19 @@ readarray -d $'\0' -t packages_to_remove < <(comm --zero-terminated -13 \
   <(cat \
     <(<packages.yml yaml2json | jq --raw-output0 'map(.archlinux) | flatten[]') \
     <(for dep in "${aurdeps[@]}" "${cpu_packages[@]}" "${gpu_packages[@]}" ; do printf '%s\0' "${dep}" ; done) \
-  | sort -zu) \
+  | while IFS= read -r -d $'\0' package; do
+    set -o pipefail
+    if resolved_name=$(pacman -Qi "${package}" 2>/dev/null | grep ^Name | grep ^Name | cut -d ':' -f 2 | tr -d ' ') ; then
+      if [[ "${resolved_name}" != "${package}" ]] ; then
+        if pacman -Qq --explicit "${resolved_name}" >/dev/null ; then
+          printf '%s\0' "${resolved_name}"
+          continue
+        fi
+      fi
+    fi
+    printf '%s\0' "${package}"
+    done | sort -zu 
+) \
   <(pacman -Qq --explicit | xargs -I "{}" printf '%s\0' "{}" | sort -zu) \
 | while IFS= read -r -d $'\0' package; do
     skip=0
@@ -47,6 +60,10 @@ readarray -d $'\0' -t packages_to_remove < <(comm --zero-terminated -13 \
   done) 
 
 if (( "${#packages_to_remove[@]}" > 0 )) ; then
+    echo "found the following explicitly installed packages that are not configured:"
+    for pkg in "${packages_to_remove[@]}" ; do
+      echo "${pkg}"
+    done
     sudo pacman -Rcns "${packages_to_remove[@]}" "${@}" || exit $?
     exit 123
 fi

zsh/zprofile.j2

@@ -54,8 +54,6 @@ export ANSIBLE_GALAXY_CACHE_DIR="${XDG_CACHE_HOME}/ansible/galaxy_cache"
 export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
 
 export GNUPGHOME="$XDG_STATE_HOME"/gnupg
-mkdir -p "${GNUPGHOME}"
-chmod --quiet 700 "${GNUPGHOME}"
 
 export PYTHON_HISTORY=$XDG_STATE_HOME/python/history
 export PYTHONPYCACHEPREFIX=$XDG_CACHE_HOME/python

zsh/zshrc.j2

@@ -132,12 +132,12 @@ alias json2yaml="python3 -c 'import sys, yaml, json; yaml.safe_dump(json.loads(s
 
 alias currentbranch='git rev-parse --abbrev-ref HEAD'
 
-alias issh="ssh -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null"
 alias gfix='git commit --amend --no-edit'
 alias gfixa='git commit --amend --no-edit --all '
 alias gfixp='git commit --amend --no-edit --patch'
 
 alias issh="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+alias iscp="scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
 
 alias newpw="pwgen --secure 25 1"
 
@@ -327,20 +327,6 @@ gb() {
     fi
 }
 
-bm() {
-    case "$1" in
-        dev)
-            cd "$HOME/development/projects"
-            ;;
-        dot)
-            cd "$HOME/dotfiles"
-            ;;
-        *)
-            echo "unknown target"
-            ;;
-    esac
-}
-
 embiggen() {
     enscript --no-header --media=A4 --landscape --font="DejaVuSansMono30" -o - 2>/dev/null | ps2pdf - | zathura -
 }