systemPackages: refactor/simplify pkgset import and resolution

flake.nix

@@ -19,6 +19,7 @@
     };
     nvim-lazy = {
       url = "git+https://git.ophanim.de/derped/lazy.nvim.nix.git";
+      # url = "git+file:///home/derped/Projects/nvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -51,6 +52,10 @@
           path = toString ./pkgs;
           fullPath = true;
         };
+        pkgsetFiles = fn.lst {
+          path = toString ./pkgsets;
+          fullPath = true;
+        };
         serviceFiles = fn.lst {
           path = toString ./services;
           fullPath = true;
@@ -85,6 +90,7 @@
                 ++ machineFiles
                 ++ configFiles
                 ++ pkgsFiles
+                ++ pkgsetFiles
                 ++ serviceFiles;
             };
         };

pkgs/systemPackages.nix

@@ -1,23 +1,14 @@
 {
   config,
   lib,
-  fn,
   ...
 }:
 with lib;
 let
   cfg = config.machine;
-  pkgsets = fn.lst {
-    path = toString ../pkgsets;
-    fullPath = true;
-  };
 in
 {
-  imports = pkgsets;
-
   environment.systemPackages = flatten (
-    lists.forEach (attrVals (filter (v: !(strings.hasInfix "::" v)) cfg.pkgs) cfg.pkgsets) (
+    map (setName: lib.optionals (cfg.pkgsets ? "${setName}") cfg.pkgsets."${setName}".pkgwrap) cfg.pkgs
-      v: v.pkgwrap
-    )
   );
 }