plugins/none-ls: combine packaged+unpackaged lists

We can just make `packaged` nullable again.
iclanzan · Jul 13, 2024 · 4f3cd9f · 4f3cd9f
1 parent d8f3113
commit 4f3cd9f
Show file tree

Hide file tree

Showing 3 changed files with 223 additions and 226 deletions.
diff --git a/flake-modules/updates/none-ls.nix b/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" (

diff --git a/plugins/none-ls/_mk-source-plugin.nix b/plugins/none-ls/_mk-source-plugin.nix
@@ -8,7 +8,8 @@ sourceType: sourceName:
   ...
 }:
 let
-  inherit (import ./packages.nix pkgs) packaged unpackaged;
+  inherit (import ./packages.nix pkgs) packaged;
+  pkg = packaged.${sourceName};
 
   cfg = config.plugins.none-ls;
   cfg' = config.plugins.none-ls.sources.${sourceType}.${sourceName};
@@ -22,27 +23,23 @@ in
       '';
     }
     # Only declare a package option if a package is required
-    // lib.optionalAttrs (packaged ? ${sourceName} || lib.elem sourceName unpackaged) {
-      package =
-        let
-          pkg = packaged.${sourceName} or null;
-        in
-        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; }
-        );
+    // 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) {