fix: aerospace more strict, system fix

flake.lock

@@ -9,11 +9,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1763308703,
+        "lastModified": 1767386128,
-        "narHash": "sha256-O9Y+Wer8wOh+N+4kcCK5p/VLrXyX+ktk0/s3HdZvJzk=",
+        "narHash": "sha256-BJDu7dIMauO2nYRSL4aI8wDNtEm2KOb7lDKP3hxdrpo=",
         "owner": "numtide",
         "repo": "blueprint",
-        "rev": "5a9bba070f801d63e2af3c9ef00b86b212429f4f",
+        "rev": "0ed984d51a3031065925ab08812a5434f40b93d4",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766784396,
+        "lastModified": 1767028240,
-        "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=",
+        "narHash": "sha256-0/fLUqwJ4Z774muguUyn5t8AQ6wyxlNbHexpje+5hRo=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55",
+        "rev": "c31afa6e76da9bbc7c9295e39c7de9fca1071ea1",
         "type": "github"
       },
       "original": {
@@ -165,11 +165,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1766784567,
+        "lastModified": 1767313275,
-        "narHash": "sha256-fpRgcNFEGRidNTDk3CVsvKxWIgB9Ph5EM+q5DGe6CI8=",
+        "narHash": "sha256-yp3n4aKlG1lZDkQl3sDD7smjNjGFeEErVaiQlorzxrk=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "c00d7fc5c4dc28bfa14935a84c70591d7103c284",
+        "rev": "1c2db85aa41c7d929cb23b408229e297dce2758a",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766850854,
+        "lastModified": 1767556355,
-        "narHash": "sha256-asWZx7X5FRrna8ntfE0+vTBUIPLth8R8bckbOpfT3Us=",
+        "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2d36a6de2fee5cd232b0a28137d95541c21eb7f0",
+        "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7",
         "type": "github"
       },
       "original": {
@@ -270,11 +270,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1766844914,
+        "lastModified": 1767583128,
-        "narHash": "sha256-SLTnaGUs8vvz82tWmlHECoH2diDdLin5AEv59XarZ1c=",
+        "narHash": "sha256-TO3P1CiH0TSjRD2hZLfXrbZCWMJ30Bxz5N2ZC7C+XHI=",
         "owner": "numtide",
         "repo": "llm-agents.nix",
-        "rev": "44846df99623b7be6118c3e12f1447d1c9e0490f",
+        "rev": "19e6096ae0de49c4bcb26384dad80506d6ec9399",
         "type": "github"
       },
       "original": {
@@ -376,11 +376,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1766747458,
+        "lastModified": 1767364772,
-        "narHash": "sha256-m63jjuo/ygo8ztkCziYh5OOIbTSXUDkKbqw3Vuqu4a4=",
+        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c633f572eded8c4f3c75b8010129854ed404a6ce",
+        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
         "type": "github"
       },
       "original": {
@@ -408,11 +408,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1766651565,
+        "lastModified": 1767379071,
-        "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=",
+        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539",
+        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
         "type": "github"
       },
       "original": {
@@ -464,11 +464,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766289575,
+        "lastModified": 1767499857,
-        "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=",
+        "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "9836912e37aef546029e48c8749834735a6b9dad",
+        "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
         "type": "github"
       },
       "original": {
@@ -530,11 +530,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766000401,
+        "lastModified": 1767468822,
-        "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
+        "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
+        "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc",
         "type": "github"
       },
       "original": {

flake.nix

@@ -42,29 +42,11 @@
 
       forEachSystem = f: genAttrs systems (system: f system);
 
-      # Overlay to pin git to stable version (avoids 2.51.x FamilyDisplayName warning on macOS)
+      # No overlays needed for Darwin builds
-      gitOverlay = final: prev: {
+      # - ghostty: installed via homebrew cask
-        git = (import inputs.nixpkgs-stable {
+      # - gitOverlay: removed - was causing mypy to rebuild from source
-          system = prev.stdenv.hostPlatform.system;
+      # - chaotic: removed - only needed for NixOS, was causing nix to rebuild with failing tests
-        }).git;
+      overlaysList = [ ];
-      };
-
-      # Overlay to skip syrupy tests (broken in nixpkgs unstable)
-      # Uses pythonPackagesExtensions to apply to all Python versions
-      syrupyOverlay = final: prev: {
-        pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-          (pyFinal: pyPrev: {
-            syrupy = pyPrev.syrupy.overrideAttrs (old: { doCheck = false; });
-          })
-        ];
-      };
-
-      overlaysList =
-        [ ghostty.overlays.default
-          chaotic.overlays.default
-          gitOverlay
-          syrupyOverlay
-        ];
 
       mkPkgs = system:
         import nixpkgs {

modules/darwin/home/programs/aerospace/user-settings.nix

@@ -21,11 +21,21 @@
   on-focused-monitor-changed = [ "move-mouse monitor-lazy-center" ];
   on-focus-changed = [ "move-mouse window-lazy-center" ];
 
-  on-window-detected = [{
+  # Flatten workspace tree on switch to prevent nested container issues
+  exec-on-workspace-change = [ "flatten-workspace-tree" ];
+
+  on-window-detected = [
+    # Default: force all windows to tile
+    {
+      run = "layout tiling";
+    }
+    # Exception: Ghostty on workspace 5 floats
+    {
       "if".app-id = "com.mitchellh.ghostty";
       "if".workspace = "5";
-    run = [ "layout floating" ];
+      run = "layout floating";
-  }];
+    }
+  ];
 
   mode = modes;
 }

modules/darwin/system.nix

@@ -2,6 +2,7 @@
   imports = [ ./homebrew.nix ./devtools.nix ];
 
   nix = {
+    # Use default nix version from nixpkgs (don't pin to avoid rebuild issues)
     extraOptions = ''
       keep-derivations = true
       keep-outputs = true

modules/home/base.nix

@@ -48,7 +48,6 @@
         jq
         jujutsu
         lazygit
-        nil
         nixd
         pandoc
         ripgrep

modules/home/programs/neovim.nix

@@ -18,7 +18,6 @@
     extraPackages = with pkgs; [
       # LSP Servers
       lua-language-server
-      nil # Nix LSP
       pyright
       nodePackages.typescript-language-server
       mdx-language-server

modules/home/programs/nvim/lua/plugins/lsp.lua

@@ -53,11 +53,11 @@ return {
         },
       })
 
-      -- Nix
+      -- Nix (using nixd instead of nil to avoid nix 2.31.x test failures)
-      lspconfig.nil_ls.setup({
+      lspconfig.nixd.setup({
         capabilities = capabilities,
         settings = {
-          ["nil"] = {
+          nixd = {
             formatting = { command = { "nixfmt" } },
           },
         },