Do initial passwordstore checkout

The modules already support the click events natively.

Makefile

@@ -6,7 +6,7 @@ ansible = venv/bin/ansible-playbook
 ansible_run = $(activate) && ansible-playbook --inventory localhost, --diff --verbose ./playbook.yml ${ANSIBLE_EXTRA_ARGS}
 
 .PHONY: all
-all: $(ansible)
+all: | venv $(ansible)
 	$(ansible_run)
 
 .PHONY: dryrun

_machines/ares.yml

@@ -14,10 +14,14 @@ users:
   git_gpg_sign: false
   gpg_agent: true
   gpg_agent_for_ssh: true
-  gpg_keys:
-    master_key: "0xB5C002530C6A2053"
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  enable_passwordstore: true
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
+  has_yubikey: true
 
 screen:
   1: DisplayPort-0

_machines/neptune.yml

@@ -0,0 +1,75 @@
+font_size: 11
+letter_space: 0
+terminal_binary: alacritty
+
+users:
+- name: hannes-work
+  group: hannes-work
+  vt: 1
+  firefox_profiles:
+    - name: default
+      manage_css: true
+    - name: meet
+      manage_css: false
+  mail: hannes.koerber@tradebyte.com
+  git_gpg_sign: false
+  gpg_agent: false
+  gpg_agent_for_ssh: false
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "false"
+    MACHINE_HAS_RESTIC_BACKUP: "true"
+    MACHINE_HAS_ELEMENT: "false"
+    MACHINE_HAS_KEEPASSX: "true"
+  has_yubikey: false
+- name: hannes-private
+  group: hannes-private
+  vt: 2
+  firefox_profiles:
+    - name: default
+      manage_css: true
+  mail: hannes@hkoerber.de
+  git_gpg_sign: false
+  gpg_agent: true
+  gpg_agent_for_ssh: true
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  enable_passwordstore: true
+  environment:
+    MACHINE_HAS_NEXTCLOUD: "true"
+    MACHINE_HAS_RESTIC_BACKUP: "false"
+    MACHINE_HAS_ELEMENT: "true"
+    MACHINE_HAS_KEEPASSX: "false"
+  has_yubikey: true
+
+screen:
+  1: DP-1-1
+  2: DP-1-1
+  3: DP-1-2
+  4: DP-1-2
+  5: DP-1-2
+  6: DP-1-2
+  7: eDP-1
+  8: eDP-1
+  9: eDP-1
+  0: eDP-1
+
+workspace:
+  1: www
+  2: www
+  3: term-local
+  4: term-remote
+  7: comm
+  8: pass
+  9: music
+  10: pim
+
+screencfgs:
+  - name: three-screens
+    key: F3
+
+environment:
+  MACHINE_TYPE: "laptop"
+  MACHINE_RESOLUTION_X: "1920"
+  MACHINE_RESOLUTION_Y: "1080"

_machines/tb-hak.yml

@@ -17,6 +17,7 @@ users:
     MACHINE_HAS_NEXTCLOUD: "false"
     MACHINE_HAS_RESTIC_BACKUP: "true"
     MACHINE_HAS_ELEMENT: "false"
+  has_yubikey: false
 - name: hannes-private
   group: tpp
   vt: 2
@@ -24,12 +25,16 @@ users:
   git_gpg_sign: false
   gpg_agent: true
   gpg_agent_for_ssh: true
-  gpg_keys:
-    master_key: "0xB5C002530C6A2053"
+  gpg_key:
+    email: hannes@hkoerber.de
+    id: "0xB5C002530C6A2053"
+    fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053"
+  enable_passwordstore: true
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
     MACHINE_HAS_RESTIC_BACKUP: "false"
     MACHINE_HAS_ELEMENT: "true"
+  has_yubikey: true
 
 screen:
   1: DP-1-1

alacritty/alacritty.yml.j2

@@ -21,7 +21,7 @@
   # each instance of Alacritty. If it is not present, alacritty will
   # check the local terminfo database and use `alacritty` if it is
   # available, otherwise `xterm-256color` is used.
-  #TERM: alacritty
+  TERM: xterm-256color
 
 window:
   # Window dimensions (changes require restart)

autostart/autostart.target.j2

@@ -7,7 +7,9 @@ Wants=discord.service
 Wants=dpms.service
 Wants=dunst.service
 Wants=element.service
-Wants=firefox.service
+{% for profile in user.firefox_profiles|default([]) %}
+Wants=firefox@{{ profile.name }}.service
+{% endfor %}
 Wants=gpg-agent.service
 Wants=gnome-keyring.service
 Wants=keepassx.service

autostart/services/firefox@.service

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

autostart/services/gpg-agent.service

@@ -1,6 +1,7 @@
 [Unit]
 BindsTo=autostart.target
 After=windowmanager.target
+ConditionPathExists=%h/.var/run/features/gpg_agent
 
 [Service]
 Type=forking

git/gitconfig.j2

@@ -3,7 +3,7 @@
     email = {{ user.mail }}
     useConfigOnly = true
 {% if user.git_gpg_sign|bool %}
-    signingkey = {{ user.gpg_keys.master_key }}
+    signingkey = {{ user.gpg_key.id }}
 {% endif %}
 [github]
     user = hakoerber

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

i3/config.j2

@@ -93,7 +93,7 @@
 
     set $kill Shift+Q
 
-    set $screenshot p
+    set $screenshot o
 
 
 ################################################################################
@@ -227,9 +227,6 @@ assign [class="^Wine$"] $workspace10
 
     bindsym $mod+Shift+v exec --no-startup-id redshift-toggle
 
-    bindsym $mod+Shift+$scratchpad move scratchpad
-    bindsym $mod+$scratchpad scratchpad show
-
     bindsym $mod+$pim_toggle \
         unmark _destination; \
         mark _source; \

i3/i3status.conf.j2

@@ -20,7 +20,9 @@ general {
 
 
 order += spotify
+{% if user.has_yubikey %}
 order += "yubikey"
+{% endif %}
 order += "volume_status output"
 order += "volume_status input"
 order += "wifi"
@@ -57,7 +59,6 @@ systemd spotify {
     unit = "spotify.service"
     user = true
     format = "  "
-    on_click 1 = "exec $HOME/.i3/scripts/toggle-app spotify"
     color_bad = '#F4Bf75'
     color_degraded = '#F4Bf75'
 }
@@ -109,7 +110,6 @@ volume_status output {
     thresholds = []
     command = "pactl"
     color_muted = '#FFFFFF'
-    on_click 1 = "exec $HOME/.i3/scripts/pa-volume mute-toggle"
 }
 
 volume_status input {
@@ -120,5 +120,4 @@ volume_status input {
     command = "pactl"
     color_muted = '#FFFFFF'
     is_input = True
-    on_click 1 = "exec $HOME/.i3/scripts/pa-volume mute-toggle-mic"
 }

install.sh

@@ -11,6 +11,8 @@ set -o nounset
 DOTDIR="/var/lib/dotfiles"
 _SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+git submodule update --init
+
 if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] && [[ "${_SCRIPT_DIR}" != "${DOTDIR}" ]] ; then
     if [[ -e "${DOTDIR}" ]] ; then
         2>&1 printf "${DOTDIR} already exists. This seems unsafe.\n"
@@ -61,6 +63,7 @@ _install() {
 if ! command -v python3 >/dev/null ; then
     printf 'Python3 not installed, installing ...\n'
     _install "python3"
+    _install "python3-venv"
     printf 'Done\n'
 fi
 

packages.yml

@@ -4,6 +4,7 @@ packages:
       ubuntu:
         - build-essential
         - exuberant-ctags
+        - cmake
       archlinux:
         - gcc
         - ctags
@@ -55,7 +56,7 @@ packages:
       ubuntu: ["borgbackup"]
       archlinux: ["borgbackup"]
     docker:
-      ubuntu: ["docker.io"]
+      ubuntu: ["docker.io", "containerd", "docker-compose"]
       archlinux: ["docker", "docker-compose"]
     font-awesome:
       ubuntu: ["fonts-font-awesome"]
@@ -64,10 +65,10 @@ packages:
       ubuntu: ["fonts-inconsolata"]
       archlinux: ["ttf-inconsolata"]
     font-dejavu:
-      ubuntu: []
+      ubuntu: ["fonts-dejavu"]
       archlinux: ["ttf-dejavu"]
     font-libertine:
-      ubuntu: []
+      ubuntu: ["fonts-linuxlibertine"]
       archlinux: ["ttf-linux-libertine"]
     font-emoji:
       ubuntu: []
@@ -143,13 +144,13 @@ packages:
       ubuntu: ["zathura", "zathura-pdf-poppler"]
       archlinux: ["zathura", "zathura-pdf-poppler"]
     pdf:
-      ubuntu: []
+      ubuntu: ["ghostscript", "enscript"]
       archlinux: ["ghostscript", "enscript"]
     pandoc:
       ubuntu: ["pandoc"]
       archlinux: ["pandoc", "texlive-core", "texlive-fontsextra", "texlive-latexextra"]
     libvirt:
-      ubuntu: ["virt-manager", "libvirt-bin"]
+      ubuntu: ["virt-manager", "libvirt-daemon"]
       archlinux: ["virt-manager", "libvirt", "dnsmasq", "ebtables"]
     firefox:
       ubuntu: ["firefox"]
@@ -163,9 +164,6 @@ packages:
     unclutter:
       ubuntu: ["unclutter"]
       archlinux: ["unclutter"]
-    chromium:
-      ubuntu: ["chromium-browser"]
-      archlinux: ["chromium"]
     libreoffice:
       ubuntu: ["libreoffice"]
       archlinux: ["libreoffice-fresh", "libreoffice-fresh-de"]
@@ -196,9 +194,6 @@ packages:
     dia:
       ubuntu: ["dia"]
       archlinux: ["dia"]
-    shutter:
-      ubuntu: ["shutter"]
-      archlinux: []
     nmap:
       ubuntu: ["nmap"]
       archlinux: ["nmap"]
@@ -248,10 +243,10 @@ packages:
       ubuntu: ["pwgen"]
       archlinux: ["pwgen"]
     gpg:
-      ubuntu: ["gnupg2"]
+      ubuntu: ["gnupg2", "pcscd", "scdaemon"]
       archlinux: ["gnupg", "paperkey", "yubikey-manager", "yubikey-touch-detector"]
     networkmanager:
-      ubuntu: ["network-manager", "network-manager-openvpn", "network-manager-openconnect"]
+      ubuntu: ["network-manager", "network-manager-openvpn", "network-manager-openconnect", "network-manager-openconnect-gnome"]
       archlinux: ["networkmanager"]
     pulseaudio:
       ubuntu: ["pulseaudio", "pulseaudio-utils"]
@@ -300,9 +295,9 @@ packages:
       archlinux: ["bwm-ng"]
     virtualbox:
       ubuntu: ["virtualbox"]
-      archlinux: []
+      archlinux: ["virtualbox"]
     ssh:
-      ubuntu: []
+      ubuntu: ["ssh"]
       archlinux: ["openssh"]
     sshfs:
       ubuntu: ["sshfs"]
@@ -323,7 +318,7 @@ packages:
       ubuntu: ["rustc", "cargo"]
       archlinux: ["rust"]
     musescore:
-      ubuntu: ["musescore"]
+      ubuntu: ["musescore3"]
       archlinux: ["musescore"]
     sipcalc:
       ubuntu: ["sipcalc"]
@@ -335,7 +330,7 @@ packages:
       ubuntu: ["anki"]
       archlinux: ["anki"]
     imv:
-      ubuntu: []
+      ubuntu: ["imv"]
       archlinux: ["imv"]
     pacman:
       ubuntu: []
@@ -344,13 +339,13 @@ packages:
       ubuntu: []
       archlinux: ["steam"]
     man:
-      ubuntu: []
+      ubuntu: ["man"]
       archlinux: ["man-db", "man-pages"]
     discord:
       ubuntu: []
       archlinux: ["discord"]
     nextcloud:
-      ubuntu: []
+      ubuntu: ["nextcloud-desktop"]
       archlinux: ["nextcloud-client"]
     kwallet:
       ubuntu: []
@@ -365,10 +360,10 @@ packages:
       ubuntu: ["pv"]
       archlinux: ["pv"]
     stress:
-      ubuntu: []
+      ubuntu: ["stress"]
       archlinux: ["stress"]
     mpris:
-      ubuntu: ["stress"]
+      ubuntu: ["playerctl"]
       archlinux: ["playerctl"]
     imagemagick:
       ubuntu: ["imagemagick"]
@@ -383,16 +378,25 @@ packages:
       ubuntu: []
       archlinux: ["element-desktop"]
     maim:
-      ubuntu: []
+      ubuntu: ["maim"]
       archlinux: ["maim"]
     mkinitcpio:
       ubuntu: []
       archlinux: ["mkinitcpio"]
     terraform:
-      ubuntu: ["terraform"]
+      ubuntu: []
       archlinux: ["terraform"]
+    synclient:
+      ubuntu: ["xserver-xorg-input-synaptics"]
+      archlinux: ["xf86-input-synaptics"]
+    ncdu:
+      ubuntu: ["ncdu"]
+      archlinux: ["ncdu"]
 
   remove:
     mousepad:
       ubuntu: ["mousepad"]
       archlinux: ["mousepad"]
+    chrome:
+      ubuntu: ["google-chrome-stable"]
+      archlinux: []

playbook.yml

@@ -62,7 +62,7 @@
         - name: install pacman-contrib for paccache
           package:
             name: pacman-contrib
-            state: installed
+            state: present
           become: true
 
         - name: Clean cache
@@ -76,12 +76,12 @@
     - block:
       - name: install sudo
         package:
-          state: installed
+          state: present
           name: sudo
 
       - name: install dependencies for paru
         package:
-          state: installed
+          state: present
           name:
             - base-devel
             - git
@@ -179,7 +179,7 @@
       - name: install packages
         package:
           name: "{{ packages|json_query(query) }}"
-          state: installed
+          state: present
         become: true
         vars:
           query: "{{ 'list.*.%s[]'|format(distro) }}"
@@ -217,7 +217,7 @@
       - name: install lz4
         package:
           name: lz4
-          state: installed
+          state: present
         become: true
 
       - name: use lz4 for mkinitcpio compression
@@ -333,7 +333,7 @@
             - lib32-libva-mesa-driver
             - mesa-vdpau
             - lib32-mesa-vdpau
-          state: installed
+          state: present
         become: true
 
       - name: set AMDGPU options
@@ -355,6 +355,128 @@
         - distro == 'archlinux'
         - machine.gpu is defined and machine.gpu == 'amd'
 
+    - block:
+      - name: install alacritty build dependencies
+        package:
+          state: present
+          # https://github.com/alacritty/alacritty/blob/master/INSTALL.md#debianubuntu
+          name:
+            - cmake
+            - pkg-config
+            - libfreetype6-dev
+            - libfontconfig1-dev
+            - libxcb-xfixes0-dev
+            - libxkbcommon-dev
+            - python3
+        become: true
+
+      - name: stat alacritty binary
+        stat:
+          path: /usr/local/bin/alacritty
+        register: alacritty_binary
+
+      - name: create temporary directory for alacritty build
+        tempfile:
+          state: directory
+        register: alacritty_build_tempdir
+        when: not alacritty_binary.stat.exists
+
+      - name: build alacritty
+        command: cargo install alacritty --root ./out
+        args:
+          chdir: "{{ alacritty_build_tempdir.path }}"
+        when: not alacritty_binary.stat.exists
+
+      - name: install alacritty
+        command: mv "{{ alacritty_build_tempdir.path }}/out/bin/alacritty" /usr/local/bin/alacritty
+        become: true
+        when: not alacritty_binary.stat.exists
+
+      - name: clean up build directory
+        file:
+          path: "{{ alacritty_build_tempdir.path }}"
+          state: absent
+        when: not alacritty_binary.stat.exists
+
+      when: distro == 'ubuntu'
+      tags: [alacritty]
+
+    - block:
+      - name: stat yubikey-touch-detector binary
+        stat:
+          path: /usr/local/bin/yubikey-touch-detector
+        register: yubikey_touch_detector_binary
+
+      - name: create temporary directory for yubikey-touch-detector build
+        tempfile:
+          state: directory
+        register: yubikey_touch_detector_build_tempdir
+        when: not yubikey_touch_detector_binary.stat.exists
+
+      - name: build yubikey-touch-detector
+        shell: env GOPATH=$(pwd) go get -u github.com/maximbaz/yubikey-touch-detector
+        args:
+          chdir: "{{ yubikey_touch_detector_build_tempdir.path }}"
+        when: not yubikey_touch_detector_binary.stat.exists
+
+      - name: install yubikey-touch-detector
+        command: >
+          mv
+          "{{ yubikey_touch_detector_build_tempdir.path }}/bin/yubikey-touch-detector"
+          /usr/local/bin/yubikey-touch-detector
+        become: true
+        when: not yubikey_touch_detector_binary.stat.exists
+
+      - name: clean up build directory
+        file:
+          path: "{{ yubikey_touch_detector_build_tempdir.path }}"
+          state: absent
+        when: not yubikey_touch_detector_binary.stat.exists
+
+      when: distro == 'ubuntu'
+      tags: [yubikey-touch-detector]
+
+    - block:
+      - name: add spotify apt key
+        apt_key:
+          url: "https://download.spotify.com/debian/pubkey_0D811D58.gpg"
+          id: "D1742AD60D811D58"
+        become: true
+
+      - name: add spotify repository
+        apt_repository:
+          repo: "deb http://repository.spotify.com stable non-free"
+          filename: spotify
+        become: true
+
+      - name: install spotify
+        apt:
+          name: spotify-client
+          update_cache: true
+        become: true
+      when: distro == 'ubuntu'
+      tags: [spotify]
+
+    - block:
+      - name: add signal apt key
+        apt_key:
+          url: "https://updates.signal.org/desktop/apt/keys.asc"
+          id: "D980A17457F6FB06"
+        become: true
+
+      - name: add signal repository
+        apt_repository:
+          repo: "deb https://updates.signal.org/desktop/apt xenial main"
+          filename: spotify
+        become: true
+
+      - name: install signal
+        apt:
+          name: signal-desktop
+          update_cache: true
+        become: true
+      when: distro == 'ubuntu'
+      tags: [signal]
 
     - name: create dotfiles group
       group:
@@ -363,11 +485,21 @@
       become: true
       become_user: root
 
+    - name: create dotfiles user
+      user:
+        name: dotfiles
+        home: /var/lib/dotfiles
+        create_home: false
+        shell: /bin/bash
+        system: true
+      become: true
+      become_user: root
+
     - name: create dotfiles directory
       file:
         state: directory
         path: /var/lib/dotfiles
-        owner: nobody
+        owner: dotfiles
         group: dotfiles
         mode: '0775' # group needs write access!
       become: true

screencfg/neptune/default.yml

@@ -0,0 +1,14 @@
+reset: false
+outputs:
+  - name: eDP-1
+    primary: True
+    opts:
+      mode: 1920x1080
+      scale: 1x1
+      pos: "0x0" # beware of hex
+  - name: DP-1-1
+    disable: true
+  - name: DP-1-2
+    disable: true
+  - name: DP-1-3
+    disable: true

screencfg/neptune/three-screens.yml

@@ -0,0 +1,18 @@
+reset: true
+outputs:
+  - name: eDP-1
+    opts:
+      mode: 1920x1080
+      scale: 0.7x0.7
+      pos: "0x0" # beware of hex
+  - name: DP-3
+    primary: True
+    opts:
+      mode: 1920x1080
+      right-of: eDP-1
+    reset: true
+  - name: DP-4
+    opts:
+      mode: 1920x1080
+      right-of: DP-3
+    reset: true

user.yml

@@ -77,10 +77,10 @@
     dest: "/home/{{ user.name }}/.config/systemd/user/{{ item }}"
     src: "/dev/null"
   with_items:
-    - gpg-agent.service
     - gpg-agent.socket
     - gpg-agent-browser.socket
     - gpg-agent-ssh.socket
+    - gpg-agent-extra.socket
 
 - name: create directory for getty autologin
   file:
@@ -257,8 +257,6 @@
       owner: "{{ user.name }}"
       group: "{{ user_group_name }}"
     with_items:
-      - name: terraform
-        optpath: terraform
       - name: hugo
         optpath: hugo
       - name: drone
@@ -320,8 +318,7 @@
       cd ~/.local/share/nvim/plugged/YouCompleteMe/
       python3 ./install.py --force-sudo
     args:
-      creates: ~/.local/share/nvim/plugged/YouCompleteMe/third_party/ycmd/ycm_core.so
-    when: vim_plugins_stdout.stdout_lines|length != 0 or true
+      creates: "{{ lookup('fileglob', '~/.local/share/nvim/plugged/YouCompleteMe/third_party/ycmd/ycm_core.*so') }}"
 
 - block:
   - name: firefox - create chrome directory
@@ -391,6 +388,11 @@
         dest: "{{ tempdir.path }}/PortfolioPerformance"
         remote_src: true
 
+    - name: clean up temp directory
+      file:
+        path: "{{ tempdir.path }"
+        state: absent
+
     - name: install portfolio performance
       synchronize:
         src: "{{ tempdir.path }}/PortfolioPerformance"
@@ -418,7 +420,7 @@
 - block:
   - name: set kubectl version
     set_fact:
-      kubectl_version: v1.20.1
+      kubectl_version: v1.22.2
 
   - name: get current stable version
     uri:
@@ -434,10 +436,10 @@
       kubectl_outdated: "{{ kubectl_version != kubectl_stable_version }}"
 
   - name: warn if not on stable version
-    debug:
+    fail:
       msg: "installing kubectl {{ kubectl_version }}, stable version would be {{ kubectl_stable_version }}"
-    changed_when: kubectl_outdated is sameas true
     when: kubectl_outdated is sameas true
+    ignore_errors: True
 
   - name: get kubectl
     get_url:
@@ -456,6 +458,70 @@
   tags:
     - kubectl
 
+- block:
+  - name: set terraform version
+    set_fact:
+      terraform_version: 1.0.2
+
+  - name: stat current terraform binary
+    stat:
+      path: "/home/{{ user.name }}/.opt/terraform-v{{ terraform_version }}"
+    register: terraform_binary
+
+  - name: create temporary download directory for terraform
+    tempfile:
+      state: directory
+    register: terraform_download_dir
+    when: not terraform_binary.stat.exists
+
+  - name: get terraform
+    get_url:
+      url: "https://releases.hashicorp.com/terraform/{{ terraform_version }}/terraform_{{ terraform_version }}_linux_amd64.zip"
+      dest: "{{ terraform_download_dir.path }}/terraform.zip"
+    when: not terraform_binary.stat.exists
+
+  - name: unpack terraform zip
+    unarchive:
+      src: "{{ terraform_download_dir.path }}/terraform.zip"
+      dest: "{{ terraform_download_dir.path }}/"
+      remote_src: true
+    when: not terraform_binary.stat.exists
+
+  - name: install terraform
+    command: mv "{{ terraform_download_dir.path }}/terraform" /home/{{ user.name }}/.opt/terraform-v{{ terraform_version }}
+    when: not terraform_binary.stat.exists
+
+  - name: clean up download directory
+    file:
+      path: "{{ terraform_download_dir.path }}"
+      state: absent
+    when: not terraform_binary.stat.exists
+
+  - name: link terraform
+    file:
+      src: /home/{{ user.name }}/.opt/terraform-v{{ terraform_version }}
+      dest: /home/{{ user.name }}/.optbin/terraform
+      state: link
+
+  - name: get terraform version info
+    command: /home/{{ user.name }}/.optbin/terraform version -json
+    register: terraform_version_output
+    changed_when: false
+
+  - name: parse terraform version output
+    set_fact:
+      terraform_outdated: "{{ (terraform_version_output.stdout | from_json()).terraform_outdated }}"
+    changed_when: false
+
+  - name: warn if terraform is outdated
+    fail:
+      msg: "current terraform v{{ terraform_version }} is out of date"
+    when: terraform_outdated is sameas true
+    ignore_errors: True
+
+  tags:
+    - terraform
+
 - name: handle autostart units
   block:
   - name: create systemd user directory
@@ -478,5 +544,57 @@
       group: "{{ user_group_name }}"
     with_fileglob: /var/lib/dotfiles/autostart/services/*
 
+  - name: get state of autostart.target
+    stat:
+      path: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+    register: autostart_target_stat
+
+  - name: remove invalid autostart.target
+    file:
+      path: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+      state: absent
+    when:
+      - autostart_target_stat.stat.exists
+      - not autostart_target_stat.stat.isreg
+
+  - name: deploy autostart.target
+    template:
+      src: ./autostart/autostart.target.j2
+      dest: "/home/{{ user.name }}/.config/systemd/user/autostart.target"
+      owner: "{{ user.name }}"
+      group: "{{ user_group_name }}"
+      force: true
+      follow: false
+
   tags:
     - autostart
+
+- block:
+  - name: import gpg key
+    command: gpg --import ./gpgkeys/{{ user.gpg_key.email }}.gpg.asc
+    register: gpg_import_output
+    changed_when: not ("unchanged" in gpg_import_output.stderr)
+
+  - name: trust gpg key
+    shell: "gpg --import-ownertrust <<< {{ user.gpg_key.fingerprint }}:6"
+    args:
+      executable: /bin/bash # required for <<<
+    register: gpg_trust_output
+    changed_when: gpg_trust_output.stderr_lines|length > 0
+
+  when: user.gpg_key is defined
+  tags: [gpg]
+
+- block:
+  - name: stat passwordstore checkout
+    stat:
+      path: /home/{{ user.name }}/.password-store
+    register: passwordstore_checkout
+  - name: check out passwordstore repository
+    git:
+      dest: /home/{{ user.name }}/.password-store
+      repo: ssh://git@code.hkoerber.de:2222/hannes/passwordstore.git
+      accept_hostkey: true
+    when: not passwordstore_checkout.stat.exists
+  when: user.enable_passwordstore|default(false) is sameas true
+  tags: [passwordstore]

vim/vimrc

@@ -47,7 +47,7 @@ Plug 'rodjek/vim-puppet'
 Plug 'suan/vim-instant-markdown'
 "Plug 'marshallward/vim-restructuredtext'
 "Plug 'vim-syntastic/syntastic'
-Plug 'ElmCast/elm-vim'
+"Plug 'ElmCast/elm-vim'
 Plug 'avh4/elm-format'
 
 Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }

zsh/zprofile.j2

@@ -62,7 +62,11 @@ mkdir -p "${FEATURE_DIR}"
 [[ $MACHINE_HAS_RESTIC_BACKUP == "true" ]] && touch "${FEATURE_DIR}"/restic_backup
 [[ $MACHINE_HAS_ELEMENT       == "true" ]] && touch "${FEATURE_DIR}"/element
 
-[[ $MACHINE_TYPE == "laptop" ]] && touch "${FEATURE_DIR}"/matchine_is_laptop
+[[ $MACHINE_TYPE == "laptop" ]] && touch "${FEATURE_DIR}"/machine_is_laptop
+
+{% if user.gpg_agent %}
+touch "${FEATURE_DIR}"/gpg_agent
+{% endif %}
 
 # Make all environment variables also usable in the systemd user instancee
 systemctl --user import-environment

zsh/zshrc.d/20_aliases.sh

@@ -68,8 +68,8 @@ alias twa="task add"
 alias twd="task done"
 alias inbox="task add +inbox"
 
-alias yaml2json="python -c 'import sys, yaml, json; json.dump(yaml.safe_load(sys.stdin), sys.stdout, indent=4)'"
-alias json2yaml="python -c 'import sys, yaml, json; yaml.safe_dump(json.loads(sys.stdin.read()), stream=sys.stdout)'"
+alias yaml2json="python3 -c 'import sys, yaml, json; json.dump(yaml.safe_load(sys.stdin), sys.stdout, indent=4)'"
+alias json2yaml="python3 -c 'import sys, yaml, json; yaml.safe_dump(json.loads(sys.stdin.read()), stream=sys.stdout)'"
 
 alias currentbranch='git rev-parse --abbrev-ref HEAD'
 
@@ -89,6 +89,8 @@ alias sysu="systemctl --user"
 
 alias gpg=gpg2
 
+alias alacritty="alacritty --config-file $HOME/.config/alacritty.yml"
+
 gitmaster() {
     git stash push -m gitmaster-$(date -uIseconds) -u || return 1
     _branch=$(git rev-parse --abbrev-ref HEAD)