diff --git a/hosts/RyanMac/configuration.nix b/hosts/RyanMac/configuration.nix
index 16e1006..2f125dd 100644
--- a/hosts/RyanMac/configuration.nix
+++ b/hosts/RyanMac/configuration.nix
@@ -151,29 +151,35 @@ in {
services.skhd = {
enable = true;
skhdConfig = ''
- alt - d : osascript -e 'tell application "System Events" to key code 49 using {command down}'
- alt - return : osascript -e 'tell application "Ghostty"' -e 'new window' -e 'activate' -e 'end tell'
-
- alt - up : ${pkgs.yabai}/bin/yabai -m window --focus north
- shift + alt - up : ${pkgs.yabai}/bin/yabai -m window --swap north
- alt - down : ${pkgs.yabai}/bin/yabai -m window --focus south
- shift + alt - down : ${pkgs.yabai}/bin/yabai -m window --swap south
- alt - right : ${pkgs.yabai}/bin/yabai -m window --focus east
- shift + alt - right : ${pkgs.yabai}/bin/yabai -m window --swap east
- alt - left : ${pkgs.yabai}/bin/yabai -m window --focus west
- shift + alt - left: ${pkgs.yabai}/bin/yabai -m window --swap west
-
- shift + alt - 1 : ${pkgs.yabai}/bin/yabai -m window --space 1
- shift + alt - 2 : ${pkgs.yabai}/bin/yabai -m window --space 2
- shift + alt - 3 : ${pkgs.yabai}/bin/yabai -m window --space 3
- shift + alt - 4 : ${pkgs.yabai}/bin/yabai -m window --space 4
- shift + alt - 5 : ${pkgs.yabai}/bin/yabai -m window --space 5
- shift + alt - 6 : ${pkgs.yabai}/bin/yabai -m window --space 6
- shift + alt - 7 : ${pkgs.yabai}/bin/yabai -m window --space 7
- shift + alt - 8 : ${pkgs.yabai}/bin/yabai -m window --space 8
- shift + alt - 9 : ${pkgs.yabai}/bin/yabai -m window --space 9
-
- alt - f : ${pkgs.yabai}/bin/yabai -m window --toggle zoom-fullscreen
+ cmd - d : osascript -e 'tell application "System Events" to key code 49 using {command down}'
+ cmd - return : osascript -e 'tell application "Ghostty"' -e 'new window' -e 'activate' -e 'end tell'
+
+ cmd - up : ${pkgs.yabai}/bin/yabai -m window --focus north || ${pkgs.yabai}/bin/yabai -m display --focus north
+ shift + cmd - up : ${pkgs.yabai}/bin/yabai -m window --swap north || ${pkgs.yabai}/bin/yabai -m window --display north
+ cmd - down : ${pkgs.yabai}/bin/yabai -m window --focus south || ${pkgs.yabai}/bin/yabai -m display --focus south
+ shift + cmd - down : ${pkgs.yabai}/bin/yabai -m window --swap south || ${pkgs.yabai}/bin/yabai -m window --display south
+ cmd - right : ${pkgs.yabai}/bin/yabai -m window --focus east || ${pkgs.yabai}/bin/yabai -m display --focus east
+ shift + cmd - right : ${pkgs.yabai}/bin/yabai -m window --swap east || ${pkgs.yabai}/bin/yabai -m window --display east
+ cmd - left : ${pkgs.yabai}/bin/yabai -m window --focus west || ${pkgs.yabai}/bin/yabai -m display --focus west
+ shift + cmd - left: ${pkgs.yabai}/bin/yabai -m window --swap west || ${pkgs.yabai}/bin/yabai -m window --display west
+
+ shift + cmd - space: ${pkgs.yabai}/bin/yabai -m window --toggle float
+
+ shift + cmd - return: ${pkgs.yabai}/bin/yabai -m window --toggle sticky
+
+ cmd - f : ${pkgs.yabai}/bin/yabai -m window --toggle zoom-fullscreen
+
+ shift + cmd - f: ${pkgs.yabai}/bin/yabai -m window --toggle native-fullscreen
+
+ shift + cmd - 1 : ${pkgs.yabai}/bin/yabai -m window --space 1
+ shift + cmd - 2 : ${pkgs.yabai}/bin/yabai -m window --space 2
+ shift + cmd - 3 : ${pkgs.yabai}/bin/yabai -m window --space 3
+ shift + cmd - 4 : ${pkgs.yabai}/bin/yabai -m window --space 4
+ shift + cmd - 5 : ${pkgs.yabai}/bin/yabai -m window --space 5
+ shift + cmd - 6 : ${pkgs.yabai}/bin/yabai -m window --space 6
+ shift + cmd - 7 : ${pkgs.yabai}/bin/yabai -m window --space 7
+ shift + cmd - 8 : ${pkgs.yabai}/bin/yabai -m window --space 8
+ shift + cmd - 9 : ${pkgs.yabai}/bin/yabai -m window --space 9
'';
};