plugins/none-ls: refactor using mkSourcePlugin

flake-modules/updates/none-ls.nix

@@ -5,7 +5,7 @@
   pkgs,
 }:
 let
-  inherit (import ../../plugins/none-ls/packages.nix pkgs) packaged noPackage unpackaged;
+  inherit (import ../../plugins/none-ls/packages.nix pkgs) packaged noPackage;
 
   builtinSources = lib.trivial.importJSON "${vimPlugins.none-ls-nvim.src}/doc/builtins.json";
 
@@ -14,11 +14,11 @@ let
   toolNames = lib.unique (lib.flatten (lib.attrValues builtinSourceNames));
 
   undeclaredTool = lib.filter (
-    name: !(lib.hasAttr name packaged || lib.elem name noPackage || lib.elem name unpackaged)
+    name: !(lib.hasAttr name packaged || lib.elem name noPackage)
   ) toolNames;
 
   uselesslyDeclaredTool = lib.filter (name: !(lib.elem name toolNames)) (
-    unpackaged ++ noPackage ++ (lib.attrNames packaged)
+    noPackage ++ (lib.attrNames packaged)
   );
 in
 writeText "efmls-configs-sources.nix" (

plugins/none-ls/_mk-source-plugin.nix

@@ -0,0 +1,55 @@
+# mkSourcePlugin, returns a module
+sourceType: sourceName:
+{
+  config,
+  pkgs,
+  lib,
+  helpers,
+  ...
+}:
+let
+  inherit (import ./packages.nix pkgs) packaged;
+  pkg = packaged.${sourceName};
+
+  cfg = config.plugins.none-ls;
+  cfg' = config.plugins.none-ls.sources.${sourceType}.${sourceName};
+in
+{
+  options.plugins.none-ls.sources.${sourceType}.${sourceName} =
+    {
+      enable = lib.mkEnableOption "the ${sourceName} ${sourceType} source for none-ls";
+      withArgs = helpers.mkNullOrOption helpers.nixvimTypes.strLua ''
+        Raw Lua code passed as an argument to the source's `with` method.
+      '';
+    }
+    # Only declare a package option if a package is required
+    // lib.optionalAttrs (packaged ? ${sourceName}) {
+      package = lib.mkOption (
+        {
+          type = lib.types.nullOr lib.types.package;
+          description =
+            "Package to use for ${sourceName}."
+            + (lib.optionalString (pkg == null) (
+              "\n\n"
+              + ''
+                Currently not packaged in nixpkgs.
+                Either set this to `null` and install ${sourceName} outside of nix,
+                or set this to a custom nix package.
+              ''
+            ));
+        }
+        // lib.optionalAttrs (pkg != null) { default = pkg; }
+      );
+    };
+
+  config = lib.mkIf (cfg.enable && cfg'.enable) {
+    plugins.none-ls.settings.sources = lib.mkDefault [
+      (
+        "require('null-ls').builtins.${sourceType}.${sourceName}"
+        + lib.optionalString (cfg'.withArgs != null) ".with(${cfg'.withArgs})"
+      )
+    ];
+
+    extraPackages = [ (cfg'.package or null) ];
+  };
+}

plugins/none-ls/default.nix

@@ -51,7 +51,7 @@ helpers.neovim-plugin.mkNeovimPlugin config {
       settingsPath = basePluginPath ++ [ "settings" ];
     in
     [
-      ./servers.nix
+      ./sources.nix
       (mkRenamedOptionModule oldPluginPath basePluginPath)
       (mkRenamedOptionModule (basePluginPath ++ [ "sourcesItems" ]) (settingsPath ++ [ "sources" ]))
     ];