plugins/julia-cell: switch to mkVimPlugin

plugins/languages/julia/julia-cell.nix

@@ -1,12 +1,10 @@
 {
   lib,
   helpers,
-  pkgs,
   config,
+  pkgs,
   ...
 }: let
-  cfg = config.plugins.julia-cell;
-
   # The keys are the option name in nixvim (under plugins.julia-cell.keymaps)
   # cmd: Such that the mapping action is ':JuliaCell${cmd}<CR>'
   # desc: The description of the option.
@@ -37,78 +35,66 @@
     };
   };
 in
-  with lib; {
+  with lib;
-    options.plugins.julia-cell = {
+    helpers.vim-plugin.mkVimPlugin config {
-      enable = mkEnableOption "julia-cell";
+      name = "julia-cell";
+      originalName = "vim-julia-cell";
+      defaultPackage = pkgs.vimPlugins.vim-julia-cell;
+      globalPrefix = "julia_cell_";
 
-      package = helpers.mkPackageOption "julia-cell" pkgs.vimPlugins.vim-julia-cell;
+      maintainers = [maintainers.GaetanLepage];
 
-      delimitCellsBy = helpers.defaultNullOpts.mkEnumFirstDefault ["marks" "tags"] ''
+      # TODO introduced 2024-02-19: remove 2024-04-19
-        Specifies if cells are delimited by 'marks' or 'tags'.
+      deprecateExtraConfig = true;
-      '';
+      optionsRenamedToSettings = [
+        "delimitCellsBy"
+        "tag"
+      ];
 
-      tag = helpers.defaultNullOpts.mkStr "##" "Specifies the tag format.";
+      settingsOptions = {
-
+        delimit_cells_by = helpers.defaultNullOpts.mkEnumFirstDefault ["marks" "tags"] ''
-      extraConfig = mkOption {
+          Specifies if cells are delimited by 'marks' or 'tags'.
-        type = types.attrs;
-        default = {};
-        description = ''
-          The configuration options for julia-cell without the 'julia_cell_' prefix.
-          Example: To set 'julia_cell_foobar' to 1, write
-          extraConfig = {
-            foobar = true;
-          };
         '';
+
+        tag = helpers.defaultNullOpts.mkStr "##" "Specifies the tag format.";
       };
 
-      keymaps =
+      extraOptions = {
-        {
+        keymaps =
-          silent = mkOption {
+          {
-            type = types.bool;
+            silent = mkOption {
-            description = "Whether julia-cell keymaps should be silent";
+              type = types.bool;
-            default = false;
+              description = "Whether julia-cell keymaps should be silent";
-          };
+              default = false;
-        }
+            };
-        // (
+          }
-          mapAttrs
+          // (
+            mapAttrs
+            (
+              name: value:
+                helpers.mkNullOrOption types.str "Keymap for ${value.desc}."
+            )
+            mappings
+          );
+      };
+
+      extraConfig = cfg: {
+        keymaps = flatten (
+          mapAttrsToList
           (
-            name: value:
+            name: value: let
-              helpers.mkNullOrOption types.str "Keymap for ${value.desc}."
+              key = cfg.keymaps.${name};
+            in
+              optional
+              (key != null)
+              {
+                mode = "n";
+                inherit key;
+                action = ":JuliaCell${value.cmd}<CR>";
+                options.silent = cfg.keymaps.silent;
+              }
           )
           mappings
         );
-    };
+      };
-
+    }
-    config = mkIf cfg.enable {
-      extraPlugins = [cfg.package];
-
-      globals =
-        mapAttrs'
-        (name: nameValuePair ("julia_cell_" + name))
-        (
-          {
-            delimit_cells_by = cfg.delimitCellsBy;
-            inherit (cfg) tag;
-          }
-          // cfg.extraConfig
-        );
-
-      keymaps = flatten (
-        mapAttrsToList
-        (
-          name: value: let
-            key = cfg.keymaps.${name};
-          in
-            optional
-            (key != null)
-            {
-              mode = "n";
-              inherit key;
-              action = ":JuliaCell${value.cmd}<CR>";
-              options.silent = cfg.keymaps.silent;
-            }
-        )
-        mappings
-      );
-    };
-  }

tests/test-sources/plugins/languages/julia/julia-cell.nix

@@ -7,8 +7,10 @@
     plugins.julia-cell = {
       enable = true;
 
-      delimitCellsBy = "marks";
+      settings = {
-      tag = "##";
+        delimit_cells_by = "marks";
+        tag = "##";
+      };
 
       keymaps = {
         silent = true;