diff --git a/home/modules/devtools/nixvim/plugins/lsp.nix b/home/modules/devtools/nixvim/plugins/lsp.nix
index 07d58470..57423f7f 100644
--- a/home/modules/devtools/nixvim/plugins/lsp.nix
+++ b/home/modules/devtools/nixvim/plugins/lsp.nix
@@ -9,26 +9,6 @@ in {
   options = {
     modules.devtools.nixvim.plugins.lsp = {
       enable = mkEnableOption "Enables LSP support for nixvim";
-      servers = {
-        cssls.enable = mkEnableOption "Enable CSS LSP";
-        tailwindcss.enable = mkEnableOption "Enable TailwindCSS LSP";
-        html.enable = mkEnableOption "Enable HTML LSP";
-        astro.enable = mkEnableOption "Enable AstroJS LSP";
-        phpactor.enable = mkEnableOption "Enable PHP LSP";
-        svelte.enable = mkEnableOption "Enable Svelte LSP";
-        vuels.enable = mkEnableOption "Enable Vue LSP";
-        pyright.enable = mkEnableOption "Enable Python LSP";
-        marksman.enable = mkEnableOption "Enable Markdown LSP";
-        nixd.enable = mkEnableOption "Enable Nix LSP";
-        dockerls.enable = mkEnableOption "Enable Docker LSP";
-        bashls.enable = mkEnableOption "Enable Bash LSP";
-        clangd.enable = mkEnableOption "Enable C/C++ LSP";
-        csharp-ls.enable = mkEnableOption "Enable C# LSP";
-        yamlls.enable = mkEnableOption "Enable YAML LSP";
-        lua-ls.enable = mkEnableOption "Enable Lua LSP";
-        tsserver.enable = mkEnableOption "Enable TypeScript/JavaScript LSP";
-        rust-analyzer.enable = mkEnableOption "Enable Rust LSP";
-      };
     };
   };
 
@@ -54,34 +34,32 @@ in {
       };
 
       servers = {
-        cssls = mkIf cfg.servers.cssls.enable {};
-        tailwindcss = mkIf cfg.servers.tailwindcss.enable {};
-        html = mkIf cfg.servers.html.enable {};
-        astro = mkIf cfg.servers.astro.enable {};
-        phpactor = mkIf cfg.servers.phpactor.enable {};
-        svelte = mkIf cfg.servers.svelte.enable {};
-        vuels = mkIf cfg.servers.vuels.enable {};
-        pyright = mkIf cfg.servers.pyright.enable {};
-        marksman = mkIf cfg.servers.marksman.enable {};
-        nixd = mkIf cfg.servers.nixd.enable {};
-        dockerls = mkIf cfg.servers.dockerls.enable {};
-        bashls = mkIf cfg.servers.bashls.enable {};
-        clangd = mkIf cfg.servers.clangd.enable {};
-        csharp-ls = mkIf cfg.servers.csharp-ls.enable {};
-        yamlls = mkIf cfg.servers.yamlls.enable {};
-        lua-ls = mkIf cfg.servers.lua-ls.enable {
+        # Average webdev LSPs
+        cssls.enable = true; # CSS
+        tailwindcss.enable = true; # TailwindCSS
+        html.enable = true; # HTML
+        astro.enable = true; # AstroJS
+        phpactor.enable = true; # PHP
+        svelte.enable = false; # Svelte
+        vuels.enable = false; # Vue
+        pyright.enable = true;
+        marksman.enable = true;
+        nixd.enable = true;
+        dockerls.enable = true;
+        bashls.enable = true;
+        clangd.enable = true;
+        csharp-ls.enable = true;
+        yamlls.enable = true;
+        lua-ls = {
+          enable = true;
           settings.telemetry.enable = false;
-          settings.diagnostics.globals = ["vim"];
-        };
-        tsserver = mkIf cfg.servers.tsserver.enable {};
-        rust-analyzer = mkIf cfg.servers.rust-analyzer.enable {
-          installRustc = true;
-          installCargo = true;
-          settings = {
-            checkOnSave = true;
-            check.command = "clippy";
+          settings.diagnostics = {
+            globals = ["vim"];
           };
         };
+        tsserver = {
+          enable = false; # TS/JS
+        };
       };
     };
   };
diff --git a/home/modules/devtools/nixvim/plugins/neo-tree.nix b/home/modules/devtools/nixvim/plugins/neo-tree.nix
index c7b5c59d..4f3678b2 100644
--- a/home/modules/devtools/nixvim/plugins/neo-tree.nix
+++ b/home/modules/devtools/nixvim/plugins/neo-tree.nix
@@ -26,7 +26,7 @@ in {
         {
           mode = "n";
           key = "<leader>n";
-          action = ":nixtree action=focus reveal toggle<CR>";
+          action = ":neotree action=focus reveal toggle<CR>";
           options.silent = true;
         }
       ];
diff --git a/home/users/cnst/modules.nix b/home/users/cnst/modules.nix
index c9e45390..a70b5f87 100644
--- a/home/users/cnst/modules.nix
+++ b/home/users/cnst/modules.nix
@@ -16,41 +16,20 @@
           comment.enable = true;
           conform-nvim.enable = true;
           efm.enable = true;
+          floaterm.enable = false;
+          harpoon.enable = false;
+          lsp.enable = true;
           lualine.enable = true;
           markdown-preview.enable = true;
           neo-tree.enable = true;
           none-ls.enable = true;
+          rustaceanvim.enable = true;
           startify.enable = true;
+          tagbar.enable = false;
           telescope.enable = true;
           treesitter.enable = true;
-          floaterm.enable = false;
-          harpoon.enable = false;
-          tagbar.enable = false;
           vimtex.enable = false;
           yanky.enable = false;
-          rustaceanvim.enable = true;
-          lsp = {
-            enable = true;
-            servers = {
-              cssls.enable = true;
-              tailwindcss.enable = true;
-              html.enable = true;
-              astro.enable = false;
-              phpactor.enable = true;
-              svelte.enable = false;
-              vuels.enable = false;
-              pyright.enable = true;
-              marksman.enable = true;
-              nixd.enable = true;
-              dockerls.enable = true;
-              bashls.enable = true;
-              clangd.enable = true;
-              csharp-ls.enable = true;
-              yamlls.enable = true;
-              lua-ls.enable = true;
-              tsserver.enable = false;
-            };
-          };
         };
       };
       vscode.enable = false;
diff --git a/system/dev/default.nix b/system/dev/default.nix
index df0bdd86..ea3c38d7 100644
--- a/system/dev/default.nix
+++ b/system/dev/default.nix
@@ -24,5 +24,10 @@
 
     # Other utilities and tools
     openssl # Required for some crates that involve networking or encryption
+    alejandra
+    nixd
+    pyright
+    yaml-language-server
+    lua-language-server
   ];
 }