Unify the "update" target

Makefile

@@ -9,13 +9,9 @@ ansible_run = $(activate) && ansible-playbook -e ansible_python_interpreter=/usr
 all: | venv $(ansible)
 	$(ansible_run)
 
-.PHONY: dryrun
-dryrun: $(ansible)
-	$(ansible_run) --check
-
 .PHONY: update
 update: $(ansible)
-	$(ansible_run) --tags update_system
+	$(ansible_run) --tags update
 
 .PHONY: reboot
 reboot:

_machines/ares.yml

@@ -1,6 +1,5 @@
 font_size: 12
 letter_space: 0
-terminal_binary: alacritty
 
 gpu: amd
 

_machines/mars.yml

@@ -1,6 +1,5 @@
 font_size: 11
 letter_space: 0
-terminal_binary: alacritty
 
 users:
 - name: hannes-work

_machines/neptune.yml

@@ -1,6 +1,5 @@
 font_size: 11
 letter_space: 0
-terminal_binary: alacritty
 
 users:
 - name: hannes-work

alacritty/alacritty.yml.j2

@@ -75,7 +75,7 @@ window:
   #startup_mode: Windowed
 
   # Window title
-  #title: Alacritty
+  title: "[terminal]"
 
   # Allow terminal applications to change Alacritty's window title.
   dynamic_title: true

i3/config.j2

@@ -17,8 +17,8 @@
     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.yml"
+    set $calc "alacritty --config-file ~/.config/alacritty.yml -e $SHELL -i -c calc"
 
     set $scriptdir ~/.i3/scripts
 

playbook.yml

@@ -81,7 +81,7 @@
           changed_when: false
 
         when: distro == 'archlinux'
-      tags: [update_system]
+      tags: [update]
 
     - block:
       - name: install sudo
@@ -591,6 +591,7 @@
     - name: create dotfiles user
       user:
         name: dotfiles
+        group: dotfiles
         home: /var/lib/dotfiles
         create_home: false
         shell: /bin/bash

user.yml

@@ -314,6 +314,7 @@
     register: ycm_before_update
     changed_when: false
     failed_when: ycm_before_update.rc not in (0, 200)
+    tags: [update]
 
   - name: install vim plugins
     command: sh -c 'PATH=/usr/local/go/bin:$PATH GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +PlugInstall +qall'
@@ -329,10 +330,12 @@
     changed_when: false
     register: vim_plugin_update
     changed_when: vim_plugin_update.stderr != ""
+    tags: [update]
 
   - name: update go binaries for vim
     command: sh -c 'PATH=/usr/local/go/bin:$PATH GOPATH=/home/{{ user.name }}/.go /usr/bin/nvim --headless +GoUpdateBinaries +qall'
     changed_when: false
+    tags: [update]
 
   - name: get ycm version after update
     shell: |
@@ -342,6 +345,7 @@
       executable: /bin/bash
     register: ycm_after_update
     changed_when: false
+    tags: [update]
 
   - name: compile youcompleteme
     # --force-sudo is required, as the script refuses to run in a sudo
@@ -358,6 +362,7 @@
       (ycm_before_update.rc == 200)
       or
       (ycm_before_update.stdout != ycm_after_update.stdout)
+    tags: [update]
   tags: [vim-plugins]
 
 - block:

zsh/zshrc.d/20_aliases.sh

@@ -89,6 +89,9 @@ alias gpg=gpg2
 
 alias alacritty="alacritty --config-file $HOME/.config/alacritty.yml"
 
+alias d=docker
+alias dc=docker-compose
+
 gitmaster() {
     git stash push -m gitmaster-$(date -uIseconds) -u || return 1
     _branch=$(git rev-parse --abbrev-ref HEAD)