diff --git a/darwin/kuro/services/default.nix b/darwin/kuro/services/default.nix
index 848898e1..7d444c74 100644
--- a/darwin/kuro/services/default.nix
+++ b/darwin/kuro/services/default.nix
@@ -1,9 +1,9 @@
 {...}: {
   imports = [
-    # ./yabai.nix
-    # ./skhd.nix
+    ./yabai.nix
+    ./skhd.nix
     ./tailscale.nix
     ./ollama.nix
-    ./aerospace.nix
+    # ./aerospace.nix
   ];
 }
diff --git a/neovim/default.nix b/neovim/default.nix
index bfe86a99..9defa0ba 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -318,7 +318,7 @@ in {
           tree-sitter-norg-meta
           tree-sitter-just
           tree-sitter-nu
-          pkgs.tree-sitter-grammars.tree-sitter-d2
+          # pkgs.tree-sitter-grammars.tree-sitter-d2
         ])
         ++ pkgs.vimPlugins.nvim-treesitter.allGrammars;
     };