fix: aerospace more strict, system fix

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 = [{
-    "if".app-id = "com.mitchellh.ghostty";
-    "if".workspace = "5";
-    run = [ "layout floating" ];
-  }];
+  # 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";
+    }
+  ];
 
   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
-      lspconfig.nil_ls.setup({
+      -- Nix (using nixd instead of nil to avoid nix 2.31.x test failures)
+      lspconfig.nixd.setup({
         capabilities = capabilities,
         settings = {
-          ["nil"] = {
+          nixd = {
             formatting = { command = { "nixfmt" } },
           },
         },