diff --git a/darwin/shiro/services/aerospace.nix b/darwin/shiro/services/aerospace.nix
new file mode 100644
index 00000000..bd362e53
--- /dev/null
+++ b/darwin/shiro/services/aerospace.nix
@@ -0,0 +1,84 @@
+{pkgs, ...}: {
+  services = {
+    aerospace = {
+      enable = true;
+      settings = {
+        key-mapping = {
+          preset = "qwerty";
+        };
+        gaps = {
+          inner.horizontal = 5;
+          inner.vertical = 5;
+          outer.left = 5;
+          outer.bottom = 5;
+          outer.top = 5;
+          outer.right = 5;
+        };
+
+        mode = {
+          main = {
+            binding = {
+              # alt-enter = "exec-and-forget open -n /System/Applications/Utilities/Terminal.app";
+              alt-enter = "exec-and-forget ${pkgs.lib.getExe pkgs.kitty} --single-instance --directory ~";
+              # See: https://nikitabobko.github.io/AeroSpace/commands#layout
+              alt-slash = "layout tiles horizontal vertical";
+              alt-comma = "layout accordion horizontal vertical";
+
+              # See: https://nikitabobko.github.io/AeroSpace/commands#focus
+              alt-h = "focus left";
+              alt-j = "focus down";
+              alt-k = "focus up";
+              alt-l = "focus right";
+
+              # See: https://nikitabobko.github.io/AeroSpace/commands#move
+              alt-shift-h = "move left";
+              alt-shift-j = "move down";
+              alt-shift-k = "move up";
+              alt-shift-l = "move right";
+
+              # See: https://nikitabobko.github.io/AeroSpace/commands#resize
+              alt-minus = "resize smart -50";
+              alt-equal = "resize smart +50";
+
+              # See: https://nikitabobko.github.io/AeroSpace/commands#workspace
+              alt-1 = "workspace 1";
+              alt-2 = "workspace 2";
+              alt-3 = "workspace 3";
+              alt-4 = "workspace 4";
+              alt-5 = "workspace 5";
+              alt-6 = "workspace 6";
+              alt-7 = "workspace 7";
+              alt-8 = "workspace 8";
+              alt-9 = "workspace 9";
+              alt-0 = "workspace 10";
+
+              # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
+              alt-shift-1 = "move-node-to-workspace 1";
+              alt-shift-2 = "move-node-to-workspace 2";
+              alt-shift-3 = "move-node-to-workspace 3";
+              alt-shift-4 = "move-node-to-workspace 4";
+              alt-shift-5 = "move-node-to-workspace 5";
+              alt-shift-6 = "move-node-to-workspace 6";
+              alt-shift-7 = "move-node-to-workspace 7";
+              alt-shift-8 = "move-node-to-workspace 8";
+              alt-shift-9 = "move-node-to-workspace 9";
+              alt-shift-0 = "move-node-to-workspace 10";
+            };
+          };
+        };
+        workspace-to-monitor-force-assignment = {
+          "1" = "main";
+          "2" = "main";
+          "3" = "main";
+          "4" = "main";
+          "5" = "main";
+          "6" = "main";
+          "7" = ["secondary" "main"];
+          "8" = ["secondary" "main"];
+          "9" = ["secondary" "main"];
+          "10" = ["secondary" "main"];
+        };
+      };
+    };
+  };
+}
diff --git a/darwin/shiro/services/default.nix b/darwin/shiro/services/default.nix
index 67de3470..c14a8e69 100644
--- a/darwin/shiro/services/default.nix
+++ b/darwin/shiro/services/default.nix
@@ -1,8 +1,9 @@
 {...}: {
   imports = [
-    ./yabai.nix
-    ./skhd.nix
+    # ./yabai.nix
+    # ./skhd.nix
     ./tailscale.nix
     ./jellyfin.nix
+    ./aerospace.nix
   ];
 }