diff --git a/flake.lock b/flake.lock
index da56e25f..bd9b7e16 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2013,6 +2013,7 @@
         "sops-nix": "sops-nix",
         "tree-sitter-d2": "tree-sitter-d2",
         "tree-sitter-just": "tree-sitter-just",
+        "tree-sitter-nu": "tree-sitter-nu",
         "tree-sitter-slint": "tree-sitter-slint",
         "zjstatus": "zjstatus"
       }
@@ -2414,6 +2415,22 @@
         "type": "github"
       }
     },
+    "tree-sitter-nu": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1734405519,
+        "narHash": "sha256-mQ+fQ8F4yB+ApZ+R/DPy+NyDmkjzenwgFJknEu48jSQ=",
+        "owner": "nushell",
+        "repo": "tree-sitter-nu",
+        "rev": "e36dde8d98549da7c9ef9e8f8698a3e77d4015ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nushell",
+        "repo": "tree-sitter-nu",
+        "type": "github"
+      }
+    },
     "tree-sitter-slint": {
       "flake": false,
       "locked": {
diff --git a/flake.nix b/flake.nix
index bca6809c..c2b51f2d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -122,6 +122,10 @@
       url = "github:slint-ui/tree-sitter-slint";
       flake = false;
     };
+    tree-sitter-nu = {
+      url = "github:nushell/tree-sitter-nu";
+      flake = false;
+    };
     d2 = {
       url = "github:terrastruct/d2-vim";
       flake = false;
diff --git a/neovim/default.nix b/neovim/default.nix
index 28cdf4fa..98f83523 100644
--- a/neovim/default.nix
+++ b/neovim/default.nix
@@ -621,17 +621,6 @@
            default_merge_method = "squash";
          })
 
-         -- local rr_dap = require('nvim-dap-rr')
-         -- rr_dap.setup({
-         --     mappings = {
-         --         continue = "<F7>"
-         --     },
-         -- })
-
-         -- local dap = require'dap';
-         -- dap.configurations.rust = { rr_dap.get_rust_config() }
-         -- dap.configurations.cpp = { rr_dap.get_config() }
-
          if not vim.g.neovide then
              require('neoscroll').setup()
              require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true})
@@ -643,20 +632,6 @@
          require('lspconfig.ui.windows').default_options.border = 'single'
 
          catcher(require('nvim_context_vt').setup)
-         -- catcher(function()
-         --     require('nvim-devdocs').setup({
-         --         ensure_installed = {"nix", "rust"},
-         --         float_win = {
-         --             relative = "editor",
-         --             height = 80,
-         --             width = 100,
-         --             border = "rounded",
-         --         },
-         --         after_open = function()
-         --             vim.o.conceallevel = 3
-         --         end,
-         --     })
-         -- end)
 
          vim.api.nvim_create_user_command('Reso',
              function()
diff --git a/neovim/overlays.nix b/neovim/overlays.nix
index e749e6c4..37d371d1 100644
--- a/neovim/overlays.nix
+++ b/neovim/overlays.nix
@@ -8,49 +8,6 @@
           version = "1";
           src = inputs.d2;
         };
-        navigator = final.pkgs.vimUtils.buildVimPlugin {
-          pname = "navigator";
-          version = "1";
-          src = inputs.navigator;
-          dependencies = [final.pkgs.vimPlugins.nvim-lspconfig final.pkgs.vimPlugins.guihua];
-        };
-        guihua = final.pkgs.vimUtils.buildVimPlugin {
-          pname = "guihua";
-          version = "1";
-          src = inputs.guihua;
-        };
-        nvim-dap-rr = final.pkgs.vimUtils.buildVimPlugin {
-          name = "nvim-dap-rr";
-          src = final.pkgs.fetchFromGitHub {
-            owner = "jonboh";
-            repo = "nvim-dap-rr";
-            rev = "master";
-            sha256 = "sha256-QtOY6gg2grsxF6KTn75hZ+BZGWK2ahzVu9k2SIIFeJU=";
-          };
-        };
-        sqls-nvim = final.pkgs.vimUtils.buildVimPlugin {
-          name = "sqls-nvim";
-          src = final.pkgs.fetchFromGitHub {
-            owner = "nanotee";
-            repo = "sqls.nvim";
-            rev = "master";
-            sha256 = "sha256-jKFut6NZAf/eIeIkY7/2EsjsIhvZQKCKAJzeQ6XSr0s";
-          };
-        };
-        outline-nvim = final.pkgs.vimUtils.buildVimPlugin {
-          name = "outline-nvim";
-          src = final.pkgs.fetchFromGitHub {
-            owner = "hedyhli";
-            repo = "outline.nvim";
-            rev = "master";
-            sha256 = "sha256-HaxfnvgFy7fpa2CS7/dQhf6dK9+Js7wP5qGdIeXLGPY";
-          };
-        };
-        nvim-devdocs = final.pkgs.vimUtils.buildVimPlugin {
-          pname = "nvim-devdocs";
-          version = "0.4.1";
-          src = inputs.nvim-devdocs;
-        };
       };
   };
   tree-sitter-grammars = final: prev: {
@@ -74,13 +31,8 @@
         };
         tree-sitter-nu = final.pkgs.tree-sitter.buildGrammar {
           language = "nu";
-          version = "0.0.1";
-          src = final.pkgs.fetchFromGitHub {
-            owner = "nushell";
-            repo = "tree-sitter-nu";
-            rev = "e36dde8d98549da7c9ef9e8f8698a3e77d4015ac";
-            sha256 = "sha256-mQ+fQ8F4yB+ApZ+R/DPy+NyDmkjzenwgFJknEu48jSQ=";
-          };
+          version = "1";
+          src = inputs.tree-sitter-nu;
         };
       };
   };
diff --git a/overlays.nix b/overlays.nix
index 4c7ed020..447ccbf2 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -135,7 +135,6 @@
         tmux-super-fingers = final.pkgs.tmuxPlugins.mkTmuxPlugin {
           pluginName = "tmux-super-fingers";
           version = "v1-2024-02-14";
-          # TODO: Move to subflake
           src = final.pkgs.fetchFromGitHub {
             owner = "artemave";
             repo = "tmux_super_fingers";
@@ -156,30 +155,6 @@
       } $out/files
     '';
   };
-  # catppuccin = final: prev: {
-  #   pythonPackagesExtensions =
-  #     prev.pythonPackagesExtensions
-  #     ++ [
-  #       (
-  #         python-final: python-prev: {
-  #           catppuccin = python-prev.catppuccin.overridePythonAttrs (oldAttrs: rec {
-  #             version = "1.3.2";
-  #             # TODO: Move to subflake
-  #             src = prev.fetchFromGitHub {
-  #               owner = "catppuccin";
-  #               repo = "python";
-  #               rev = "refs/tags/v${version}";
-  #               hash = "sha256-spPZdQ+x3isyeBXZ/J2QE6zNhyHRfyRQGiHreuXzzik=";
-  #             };
-  #             # can be removed next version
-  #             disabledTestPaths = [
-  #               "tests/test_flavour.py" # would download a json to check correctness of flavours
-  #             ];
-  #           });
-  #         }
-  #       )
-  #     ];
-  # };
   zellij = final: prev: {
     zellijPlugins = {
       zjstatus = inputs.zjstatus.packages.${prev.system}.default;