diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index b0f5c80..fb7b180 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -39,6 +39,9 @@ in
             plugins = true;
           };
           combinePlugins.enable = true;
+          combinePlugins.standalonePlugins = [
+            "plenary.nvim"
+          ];
         };
       };
     };
diff --git a/modules/programs/nvim/new_plugins/blink-cmp.nix b/modules/programs/nvim/new_plugins/blink-cmp.nix
index 4abcac0..434c3e3 100644
--- a/modules/programs/nvim/new_plugins/blink-cmp.nix
+++ b/modules/programs/nvim/new_plugins/blink-cmp.nix
@@ -24,7 +24,7 @@
           default = [
             "lsp"
             "path"
-            "luasnip"
+            "snippets"
             "buffer"
             "vimtex"
           ];
@@ -36,18 +36,7 @@
         signature.enabled = true;
         completion.documentation.auto_show = true;
         completion.accept.auto_brackets.enabled = true;
-        snippets = {
-          expand.__raw = ''require("luasnip").lsp_expand'';
-          active.__raw = ''
-            function(filter)
-              if filter and filter.direction then
-                return require('luasnip').jumpable(filter.direction)
-              end
-              return require('luasnip').in_snippet()
-            end
-          '';
-          jump.__raw = ''require("luasnip").jump'';
-        };
+        snippets.preset = "luasnip";
       };
     };
   };
diff --git a/modules/programs/nvim/new_plugins/crates-nvim.nix b/modules/programs/nvim/new_plugins/crates.nix
similarity index 79%
rename from modules/programs/nvim/new_plugins/crates-nvim.nix
rename to modules/programs/nvim/new_plugins/crates.nix
index dd50bfd..c27fb3f 100644
--- a/modules/programs/nvim/new_plugins/crates-nvim.nix
+++ b/modules/programs/nvim/new_plugins/crates.nix
@@ -5,6 +5,6 @@ let
 in
 {
   home-manager.users.moritz.programs.nixvim = {
-    plugins.crates-nvim.enable = true;
+    plugins.crates.enable = true;
   };
 }