Merge 83a2defebd into a5a5aba34a

docs/release-notes/rl-0.8.md

@@ -57,5 +57,4 @@
 
 - Remove `vim.notes.obsidian.setupOpts.dir`, which was set by default. Fixes
   issue with setting the workspace directory.
-- Add `vim.snippets.luasnip.setupOpts`, which was previously missing.
 - Add `"prettierd"` as a formatter option in `vim.languages.markdown.format.type`.

modules/plugins/snippets/luasnip/config.nix

@@ -9,15 +9,12 @@
 in {
   config = mkIf cfg.enable {
     vim = {
-      lazy.plugins.luasnip = {
+      lazy.plugins = {
-        package = "luasnip";
+        luasnip = {
-
+          package = "luasnip";
-        lazy = true;
+          lazy = true;
-
+          after = cfg.loaders;
-        setupModule = "luasnip";
+        };
-        inherit (cfg) setupOpts;
-
-        after = cfg.loaders;
       };
       startPlugins = cfg.providers;
       autocomplete.nvim-cmp = mkIf config.vim.autocomplete.nvim-cmp.enable {

modules/plugins/snippets/luasnip/luasnip.nix

@@ -1,7 +1,7 @@
 {lib, ...}: let
   inherit (lib.options) mkEnableOption mkOption literalExpression literalMD;
   inherit (lib.types) listOf lines;
-  inherit (lib.nvim.types) pluginType mkPluginSetupOption;
+  inherit (lib.nvim.types) pluginType;
 in {
   options.vim.snippets.luasnip = {
     enable = mkEnableOption "luasnip";
@@ -32,9 +32,5 @@ in {
         ```
       '';
     };
-
-    setupOpts = mkPluginSetupOption "LuaSnip" {
-      enable_autosnippets = mkEnableOption "autosnippets";
-    };
   };
 }