diff --git a/config/automatrop/host_vars/curacao.geoffrey.frogeye.fr b/config/automatrop/host_vars/curacao.geoffrey.frogeye.fr
index 8fa5d1b..2b55a1b 100644
--- a/config/automatrop/host_vars/curacao.geoffrey.frogeye.fr
+++ b/config/automatrop/host_vars/curacao.geoffrey.frogeye.fr
@@ -14,3 +14,6 @@ has_forge_access: yes
 extensions:
   - g
   - gh
+x11_screens:
+  - HDMI-0
+  - eDP-1-1
diff --git a/config/automatrop/host_vars/pindakaas.geoffrey.frogeye.fr b/config/automatrop/host_vars/pindakaas.geoffrey.frogeye.fr
index e2c5bb5..06b923d 100644
--- a/config/automatrop/host_vars/pindakaas.geoffrey.frogeye.fr
+++ b/config/automatrop/host_vars/pindakaas.geoffrey.frogeye.fr
@@ -9,3 +9,6 @@ encrypt_home_stacked_fs: yes
 extensions:
   - g
   - gh
+x11_screens:
+  - DP-1
+  - eDP-1
diff --git a/config/automatrop/roles/dotfiles/tasks/main.yml b/config/automatrop/roles/dotfiles/tasks/main.yml
index 8d55342..0498403 100644
--- a/config/automatrop/roles/dotfiles/tasks/main.yml
+++ b/config/automatrop/roles/dotfiles/tasks/main.yml
@@ -14,8 +14,9 @@
   git:
     repo: "{% if has_forge_access %}git@git.frogeye.fr:{% else %}https://git.frogeye.fr/{% endif %}geoffrey/dotfiles.git"
     dest: "{{ ansible_user_dir }}/.dotfiles"
-    update: "{{ not has_forge_access }}"
+    update: yes
   notify: install dotfiles
+  tags: dotfiles_repo
 # TODO Put actual dotfiles in a subdirectory of the repo, so we don't have to put everything in config
 
 - name: Register as Ansible collection
diff --git a/config/automatrop/roles/ecryptfs_automount/meta/main.yml b/config/automatrop/roles/ecryptfs_automount/meta/main.yml
deleted file mode 100644
index a3df829..0000000
--- a/config/automatrop/roles/ecryptfs_automount/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
-  - role: system
diff --git a/config/automatrop/roles/software/tasks/main.yml b/config/automatrop/roles/software/tasks/main.yml
index 09143f5..9a9907c 100644
--- a/config/automatrop/roles/software/tasks/main.yml
+++ b/config/automatrop/roles/software/tasks/main.yml
@@ -179,9 +179,6 @@
   notify: "software changed"
   tags: softwarelist
 
-- debug:
-    msg: "{{ packages }}"
-
 - name: Install packages (Arch-based)
   aur:
     name: "{{ packages }}"
diff --git a/config/i3/config.j2 b/config/i3/config.j2
index 26fd963..6eee325 100644
--- a/config/i3/config.j2
+++ b/config/i3/config.j2
@@ -149,7 +149,7 @@ set $WS9 9
 set $WS10 10
 
 # Workspace output
-{% set screens = ["HDMI-0", "eDP-1-1"] %}
+{% set screens = x11_screens | default(['DEFAULT']) %}
 {% for i in range(1, 11) %}
 workspace "$WS{{ i }}"  output {{ screens[(i - 1) % (screens | length)] }}
 {% endfor %}
diff --git a/config/shell/.gitignore b/config/shell/.gitignore
index d3e4561..3cb575e 100644
--- a/config/shell/.gitignore
+++ b/config/shell/.gitignore
@@ -1,2 +1,3 @@
+extrc
 *.zwc
 .zcompdump