modules/plugins/snippet/luasnip.nix

@@ -4,13 +4,24 @@ let
   inherit (lib.nix2lua) LuaNil scope lset pipe1 call call1;
   cfg = config.plugins.snippet.luasnip;
 
+
+  jump = lib.mkOption {
+    type = with lib.types; nullOr number;
+    default = null;
+    description = ''
+      This determines when this node will be jumped to.
+
+      `:help luasnip-insertnode`
+      `:help luasnip-basics-jump-index`
+    '';
+  };
+  unwrapJump = index: if index == null then LuaNil else index;
+
   nodes = lib.mkOption {
     type = with lib.types; listOf (submodule snippetNodeOpts);
-    default = [ ];
   };
   unwrapNodes = map (n: n.genConfig);
 
-
   genConfig = lib.mkOption {
     type = lib.types.attrs;
     internal = true;
@@ -18,63 +29,72 @@ let
 
   snippetNodeOpts = { config, ... }: {
     options = with lib; with types; {
-      kind = mkOption {
-        type = enum [ "text" "insert" "choice" "snippet" ];
-      };
-
       text = mkOption {
         type = nullOr (either str (listOf str));
         default = null;
       };
 
-      jump = lib.mkOption {
-        type = with lib.types; nullOr number;
-        default = null;
-        description = ''
-          This determines when this node will be jumped to.
+      insert = mkOption {
+        type = nullOr (either number (submodule ({ ... }: {
+          options = {
+            inherit jump;
+            text = mkOption {
+              type = nullOr (either str (listOf str));
+              default = null;
+              description = ''
+                A single string for just one line, a list with entries for multiple lines.
+                This text will be SELECTed when the `insertNode` is jumped into.
 
-          `:help luasnip-insertnode`
-          `:help luasnip-basics-jump-index`
-        '';
+                `:help luasnip-insertnode`
+              '';
+            };
+          };
+        })));
+        default = null;
       };
 
-      inherit nodes;
+      choice = mkOption {
+        type = nullOr (submodule ({ ... }: {
+          options = { inherit jump nodes; };
+        }));
+        default = null;
+      };
 
-      # only for kind=snippet
-      indentString = mkOption {
-        type = types.str;
-        default = "";
+      snippet = mkOption {
+        type = nullOr (submodule ({ ... }: {
+          options = {
+            inherit jump nodes;
+            indent = mkOption {
+              type = types.str;
+              default = "";
+            };
+          };
+        }));
+        default = null;
       };
 
       inherit genConfig;
     };
 
-    config =
-      let
-        inherit (config) kind text jump nodes;
-
-        unwrapJump = index: if index == null then LuaNil else index;
-      in
-      {
-        kind = lib.mkDefault (
-          if nodes != [ ] then "snippet"
-          else if jump != null then "insert"
-          else "text"
-        );
-
-        genConfig =
-          if kind == "text" then
-            if text != null then call1 "t" text
-            else throw "luasnip textnode require a 'text' config"
-          else if kind == "insert" then call "i" [ (unwrapJump jump) text ]
-          else if kind == "choice" then call "c" [ (unwrapJump jump) (unwrapNodes nodes) ]
-          else if kind == "snippet" then
-            if config.indentString != "" then
-              call "isn" [ (unwrapJump jump) (unwrapNodes nodes) config.indentString ]
-            else
-              call "sn" [ (unwrapJump jump) (unwrapNodes nodes) ]
-          else null;
-      };
+    config = {
+      genConfig =
+        let
+          ins = config.insert;
+          ch = config.choice;
+          sn = config.snippet;
+        in
+        if config.text != null then call1 "t" config.text
+        else if ins != null then
+          if builtins.isInt ins then call "i" [ ins ]
+          else call "i" [ (unwrapJump ins.jump) ins.text ]
+        else if ch != null then
+          call "c" [ (unwrapJump ch.jump) (unwrapNodes ch.nodes) ]
+        else if sn != null then
+          if sn.indent != "" then
+            call "isn" [ (unwrapJump sn.jump) (unwrapNodes sn.nodes) sn.indent ]
+          else call "sn" [ (unwrapJump sn.jump) (unwrapNodes sn.nodes) ]
+        else null;
+    };
   };
 
   snippetOpts = { name, ... } @ sub: {
@@ -86,7 +106,7 @@ let
         '';
       };
 
-      inherit nodes;
+      nodes = nodes // { default = [ ]; };
 
       inherit genConfig;
     };
@@ -175,9 +195,6 @@ in
       inherit (cfg) package;
       varName = "luasnip";
       setupSettings = cfg.settings;
-      extraImports = lib.mkIf (cfg.snippetGroups != [ ]) {
-        luasnip_types = "luasnip.util.types";
-      };
       afterSetup = lib.mkIf (cfg.snippetGroups != [ ]) [
         (scope (lib.flatten [
           (lib.mapAttrsToList (k: v: lset k (pipe1 varName v)) {