Merge branch 'main' into main

docs/release-notes/rl-0.8.md

@@ -51,6 +51,7 @@
 
 - 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`.
 
 [kaktu5](https://github.com/kaktu5):

modules/plugins/snippets/luasnip/config.nix

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

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;
+  inherit (lib.nvim.types) pluginType mkPluginSetupOption;
 in {
   options.vim.snippets.luasnip = {
     enable = mkEnableOption "luasnip";
@@ -32,5 +32,9 @@ in {
         ```
       '';
     };
+
+    setupOpts = mkPluginSetupOption "LuaSnip" {
+      enable_autosnippets = mkEnableOption "autosnippets";
+    };
   };
 }