diff --git a/inventory.yml b/inventory.yml
index d7b271d..4e4e305 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -28,6 +28,7 @@ desktops:
           name: Morten Olsen
           signing_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDbZITpz5QrVIxPn9gKVWMPK+3W3YZZGszFOQvO/h7M
   hosts:
+    xps:
     zn-macbook:
       # ansible_host: 192.168.3.3
       # ansible_connection: ssh
diff --git a/playbooks/Projects/zeronorth/.envrc b/playbooks/Projects/zeronorth/.envrc
deleted file mode 100644
index 959c236..0000000
--- a/playbooks/Projects/zeronorth/.envrc
+++ /dev/null
@@ -1,3 +0,0 @@
-export NODE_AUTH_TOKEN="op://jpksggxxmcuwnbwkooktr3iqcy/ut3yag6r7y4bsfrztahp7pcc6q/password"
-export AWS_PROFILE="zeronorth"
-
diff --git a/playbooks/roles/base_system/tasks/yay.yml b/playbooks/roles/base_system/tasks/yay.yml
index 2c60779..44cd293 100644
--- a/playbooks/roles/base_system/tasks/yay.yml
+++ b/playbooks/roles/base_system/tasks/yay.yml
@@ -12,7 +12,7 @@
     path: /etc/sudoers.d/11-install-aur_builder
     line: "aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman"
     create: yes
-    mode: 0644
+    mode: "0440"
     validate: "visudo -cf %s"
 
 - name: Yay
diff --git a/playbooks/roles/base_terminal/tasks/install.yml b/playbooks/roles/base_terminal/tasks/install.yml
index 8cd28b0..828ab74 100644
--- a/playbooks/roles/base_terminal/tasks/install.yml
+++ b/playbooks/roles/base_terminal/tasks/install.yml
@@ -36,3 +36,4 @@
   become_user: aur_builder
   aur:
     name: "{{ terminal_aur }}"
+    use: yay
diff --git a/playbooks/roles/desktop_hyprland/templates/keybind.conf.j2 b/playbooks/roles/desktop_hyprland/templates/keybind.conf.j2
index 1ed263a..836e3e0 100644
--- a/playbooks/roles/desktop_hyprland/templates/keybind.conf.j2
+++ b/playbooks/roles/desktop_hyprland/templates/keybind.conf.j2
@@ -4,7 +4,7 @@ $browser = firefox
 bind = SUPER, Return, exec, $term
 bind = SUPER SHIFT, Return, exec, $browser
 bind = SUPER, E, exec, $files
-bind = SUPER, D, exec, killall wofi || wofi -show drun
+bind = SUPER, D, exec, killall wofi || wofi --show drun
 bind = SUPER SHIFT, B, exec, killall -SIGUSR2 waybar # Reload waybar
 bind = SUPER, B, exec, killall -SIGUSR1 waybar # Hide waybar
 
diff --git a/playbooks/roles/env_desktop/vars/default/default.yml b/playbooks/roles/env_desktop/vars/default.yml
similarity index 100%
rename from playbooks/roles/env_desktop/vars/default/default.yml
rename to playbooks/roles/env_desktop/vars/default.yml
diff --git a/playbooks/roles/env_desktop/vars/empty.yml b/playbooks/roles/env_desktop/vars/empty.yml
deleted file mode 100644
index 0876352..0000000
--- a/playbooks/roles/env_desktop/vars/empty.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-desktop_pkgs: []
-desktop_casks: []
-desktop_flatpaks: []
diff --git a/playbooks/roles/env_desktop/vars/personal/Darwin.yml b/playbooks/roles/env_desktop/vars/personal/Darwin.yml
deleted file mode 100644
index 0fa8464..0000000
--- a/playbooks/roles/env_desktop/vars/personal/Darwin.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-desktop_casks:
-  - jellyfin-media-player
-  - signal
-  - firefox
-  - tea
diff --git a/playbooks/roles/env_desktop/vars/zeronorth/Darwin.yml b/playbooks/roles/env_desktop/vars/zeronorth/Darwin.yml
deleted file mode 100644
index e0b4cc9..0000000
--- a/playbooks/roles/env_desktop/vars/zeronorth/Darwin.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-desktop_casks:
-  - slack
-  - notion
-  - aws-vpn-client
diff --git a/playbooks/setup.yml b/playbooks/setup.yml
index 61df019..3f5da6f 100644
--- a/playbooks/setup.yml
+++ b/playbooks/setup.yml
@@ -5,7 +5,7 @@
     - role: env_terminal
     - role: env_develop
     - role: server_ssh
-    # - role: env_desktop
+    - role: env_desktop
 
 - name: Setup android
   hosts: android
diff --git a/scripts/setup-local.sh b/scripts/setup-local.sh
index f6a8397..87f2cea 100755
--- a/scripts/setup-local.sh
+++ b/scripts/setup-local.sh
@@ -2,7 +2,7 @@
 export ROOT="`dirname "$0"`/.."
 MACHINE_NAME="$1"; shift
 
-. $ROOT/scripts/with-env.sh
+# . $ROOT/scripts/with-env.sh
 
 if [ -z "$MACHINE_NAME" ]; then
 	echo "Usage: $0 <machine-name>"