1 files changed, 32 insertions, 28 deletions

diff --git a/hosts/RyanMac/configuration.nix b/hosts/RyanMac/configuration.nix
index 1327c91..ceff2df 100644
--- a/hosts/RyanMac/configuration.nix
+++ b/hosts/RyanMac/configuration.nix
@@ -27,8 +27,8 @@ let
       enabled = true;
       value = {
         type = "standard";
-        #parameters = [ (48 + i) (builtins.elemAt [ 18 19 20 21 22 23 25 26 28 ] (i - 1)) 524288 ]; # opt + num
-        parameters = [ (48 + i) (builtins.elemAt [ 18 19 20 21 22 23 25 26 28 ] (i - 1)) 1048576 ]; # cmd + num
+        parameters = [ (48 + i) (builtins.elemAt [ 18 19 20 21 22 23 25 26 28 ] (i - 1)) 524288 ]; # opt + num
+        #parameters = [ (48 + i) (builtins.elemAt [ 18 19 20 21 22 23 25 26 28 ] (i - 1)) 1048576 ]; # cmd + num
       };
     };
   };
@@ -78,7 +78,7 @@ in {
       left_padding = "10";
       right_padding = "10";
       window_gap = "5";
-      mouse_modifier = "cmd";
+      mouse_modifier = "alt";
       mouse_drop_action = "swap";
       mouse_action1 = "move";
       mouse_action2 = "resize";
@@ -180,37 +180,37 @@ in {
   services.skhd = {
     enable = true;
     skhdConfig = ''
-      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'
+      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'
 
-      shift + cmd - q : ${pkgs.yabai}/bin/yabai -m window --close
+      shift + alt - q : ${pkgs.yabai}/bin/yabai -m window --close
 
-      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
+      alt - up : ${pkgs.yabai}/bin/yabai -m window --focus north || ${pkgs.yabai}/bin/yabai -m display --focus north
+      shift + alt - up : ${pkgs.yabai}/bin/yabai -m window --swap north || ${pkgs.yabai}/bin/yabai -m window --display north
+      alt - down : ${pkgs.yabai}/bin/yabai -m window --focus south || ${pkgs.yabai}/bin/yabai -m display --focus south
+      shift + alt - down : ${pkgs.yabai}/bin/yabai -m window --swap south || ${pkgs.yabai}/bin/yabai -m window --display south
+      alt - right : ${pkgs.yabai}/bin/yabai -m window --focus east || ${pkgs.yabai}/bin/yabai -m display --focus east
+      shift + alt - right : ${pkgs.yabai}/bin/yabai -m window --swap east || ${pkgs.yabai}/bin/yabai -m window --display east
+      alt - left : ${pkgs.yabai}/bin/yabai -m window --focus west || ${pkgs.yabai}/bin/yabai -m display --focus west
+      shift + alt - 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 + alt - space: ${pkgs.yabai}/bin/yabai -m window --toggle float
 
-      shift + cmd - return: ${pkgs.yabai}/bin/yabai -m window --toggle sticky
+      shift + alt - return: ${pkgs.yabai}/bin/yabai -m window --toggle sticky
 
-      cmd - f : ${pkgs.yabai}/bin/yabai -m window --toggle zoom-fullscreen
+      alt - f : ${pkgs.yabai}/bin/yabai -m window --toggle zoom-fullscreen
 
-      shift + cmd - f: ${pkgs.yabai}/bin/yabai -m window --toggle native-fullscreen
+      shift + alt - 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
+      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
     '';
     };
 
@@ -223,6 +223,9 @@ in {
   };
 
   system.defaults = {
+    WindowManager = {
+      EnableTilingOptionAccelerator = false;
+    };
     NSGlobalDomain = {
       # 24 hour time
       AppleICUForce24HourTime = true;
@@ -314,6 +317,7 @@ in {
         { app = "/System/Applications/Calendar.app"; }
         { app = "/System/Applications/App Store.app"; }
         { app = "/System/Applications/System Settings.app"; }
+        { app = "/Applications/Ghostty.app"; }
         { app = "/Applications/UTM.app"; }
       ];
       persistent-others = [
@@ -401,7 +405,7 @@ in {
       echo "The following actions must be taken since they are not configurable by Nix. This must be done only ONCE."
       echo ""
       echo "1. Create 9 spaces."
-      echo "2. Set a wallpaper as visible in all spaces."
+      echo "2. Set keyboard autofill settings"
       echo "--------------------------------------------------"
     fi
     touch "$MARK"