diff --git a/home/editor/neovim/default.nix b/home/editor/neovim/default.nix
index 9ec3c16..da2f966 100644
--- a/home/editor/neovim/default.nix
+++ b/home/editor/neovim/default.nix
@@ -8,7 +8,8 @@
         vim-fugitive
         undotree
         telescope-nvim
-        lsp-zero-nvim
+        nvim-cmp
+        nvim-lspconfig
         (nvim-treesitter.withPlugins (p: [
           p.tree-sitter-nix
           p.tree-sitter-go
@@ -20,14 +21,22 @@
       ];
       extraLuaConfig = ''
         ${builtins.readFile ./options.lua}
+        ${builtins.readFile ./plugins.lua}
+        ${builtins.readFile ./keybinds.lua}
       '';
     };
   };
   home.packages = with pkgs; [
     # nix stuff
     nixpkgs-fmt
-    nil
     statix
+
+    # LSPs
+    gopls
+    nodePackages.pyright
+    nodePackages.typescript-language-server
+    nil
+    yaml-language-server
   ];
   home.sessionVariables.EDITOR = "nvim";
 }
diff --git a/home/editor/neovim/keybinds.lua b/home/editor/neovim/keybinds.lua
new file mode 100644
index 0000000..131e566
--- /dev/null
+++ b/home/editor/neovim/keybinds.lua
@@ -0,0 +1 @@
+-- Keybinds
diff --git a/home/editor/neovim/options.lua b/home/editor/neovim/options.lua
index 87afdab..9141099 100644
--- a/home/editor/neovim/options.lua
+++ b/home/editor/neovim/options.lua
@@ -1,3 +1,4 @@
+-- Options
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
diff --git a/home/editor/neovim/plugins.lua b/home/editor/neovim/plugins.lua
new file mode 100644
index 0000000..771174d
--- /dev/null
+++ b/home/editor/neovim/plugins.lua
@@ -0,0 +1 @@
+-- Plugins