diff --git a/hosts/pinwheel/modules/git/default.nix b/hosts/pinwheel/modules/git/default.nix
index 983541f..aa0243b 100644
--- a/hosts/pinwheel/modules/git/default.nix
+++ b/hosts/pinwheel/modules/git/default.nix
@@ -23,8 +23,16 @@ in
           { path = ./gitconfig; }
         ];
 
+        signing = {
+          key = config.age.secrets."alex.pinwheel-github.com-signing.pub".path;
+          signByDefault = true;
+        };
+
         settings = {
           rerere.enable = true;
+
+          # Tells Git to use SSH instead of the default GPG
+          gpg.format = "ssh";
         };
       };
 
@@ -35,5 +43,20 @@ in
         set main-view-line-number-interval = 1
       '';
     };
+
+    age.secrets = {
+      "alex.pinwheel-github.com-signing" = {
+        file = ../../../../secrets/pinwheel/alex.pinwheel-github.com-signing.age;
+        path = "/home/alex/.ssh/alex.pinwheel-github.com-signing";
+        owner = "alex";
+        group = "users";
+      };
+      "alex.pinwheel-github.com-signing.pub" = {
+        file = ../../../../secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age;
+        path = "/home/alex/.ssh/alex.pinwheel-github.com-signing.pub";
+        owner = "alex";
+        group = "users";
+      };
+    };
   };
 }
diff --git a/hosts/pinwheel/modules/hyprland/default.nix b/hosts/pinwheel/modules/hyprland/default.nix
index 98aaed7..4bbc025 100644
--- a/hosts/pinwheel/modules/hyprland/default.nix
+++ b/hosts/pinwheel/modules/hyprland/default.nix
@@ -29,19 +29,16 @@ let
       local external batch=""
 
       if external=$(get_active_external); then
-        # External monitor connected: 1-5 on external, 6-10 on internal
+        # External monitor connected: move workspaces 1-5 to external, 6-10 to internal
         for ws in 1 2 3 4 5; do
-          batch="$batch keyword workspace $ws,monitor:$external,default:true;"
           batch="$batch dispatch moveworkspacetomonitor $ws $external;"
         done
         for ws in 6 7 8 9 10; do
-          batch="$batch keyword workspace $ws,monitor:$INTERNAL,default:true;"
           batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;"
         done
       else
-        # No external monitor: all workspaces on internal
+        # No external monitor: move all workspaces to internal
         for ws in 1 2 3 4 5 6 7 8 9 10; do
-          batch="$batch keyword workspace $ws,monitor:$INTERNAL,default:true;"
           batch="$batch dispatch moveworkspacetomonitor $ws $INTERNAL;"
         done
       fi
@@ -103,6 +100,25 @@ in
           monitor=HDMI-A-1, 2560x1440@100, auto-center-up, 1
           monitor=DP-3, 2560x1440@60, auto-center-up, 1
 
+          # Workspaces 1-5 on external monitors (HDMI-A-1 or DP-3)
+          workspace = 1, monitor:HDMI-A-1, default:true
+          workspace = 2, monitor:HDMI-A-1
+          workspace = 3, monitor:HDMI-A-1
+          workspace = 4, monitor:HDMI-A-1
+          workspace = 5, monitor:HDMI-A-1
+          workspace = 1, monitor:DP-3, default:true
+          workspace = 2, monitor:DP-3
+          workspace = 3, monitor:DP-3
+          workspace = 4, monitor:DP-3
+          workspace = 5, monitor:DP-3
+
+          # Workspaces 6-10 on internal monitor
+          workspace = 6, monitor:eDP-1, default:true
+          workspace = 7, monitor:eDP-1
+          workspace = 8, monitor:eDP-1
+          workspace = 9, monitor:eDP-1
+          workspace = 10, monitor:eDP-1
+
           workspace = w[tv1], gapsout:0, gapsin:0
           workspace = f[1], gapsout:0, gapsin:0
           windowrule = border_size 0, match:float 0, match:workspace w[tv1]
diff --git a/secrets/pinwheel/alex.pinwheel-github.com-signing.age b/secrets/pinwheel/alex.pinwheel-github.com-signing.age
new file mode 100644
index 0000000..41fdd19
Binary files /dev/null and b/secrets/pinwheel/alex.pinwheel-github.com-signing.age differ
diff --git a/secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age b/secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age
new file mode 100644
index 0000000..fe24dd5
Binary files /dev/null and b/secrets/pinwheel/alex.pinwheel-github.com-signing.pub.age differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 302574a..0169e94 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -17,6 +17,8 @@ in {
   "pinwheel/alex.pinwheel-tadpole.pub.age".publicKeys = [ pinwheel tadpole alex ];
   "pinwheel/alex.pinwheel-github.com.age".publicKeys = [ pinwheel alex ];
   "pinwheel/alex.pinwheel-github.com.pub.age".publicKeys = [ pinwheel alex ];
+  "pinwheel/alex.pinwheel-github.com-signing.age".publicKeys = [ pinwheel alex ];
+  "pinwheel/alex.pinwheel-github.com-signing.pub.age".publicKeys = [ pinwheel alex ];
   "pinwheel/alex.pinwheel-git.ppp.pm.age".publicKeys = [ pinwheel alex ];
   "pinwheel/alex.pinwheel-git.ppp.pm.pub.age".publicKeys = [ pinwheel alex ];