refactor: pkgs

flake.nix

@@ -114,8 +114,8 @@
 
         imports = [
           ./flake/hosts.nix
+          ./flake/pkgs.nix
           ./treefmt.nix
-          ./pkgs
           ./overlays
         ];
 

flake/hosts.nix

@@ -10,9 +10,7 @@
 let
   vars = import ../vars.nix;
   pkgsModule = {
-    nixpkgs = pkgsParams // {
+    nixpkgs = pkgsParams;
-      inherit (config.nixpkgs.hostPlatform) system;
-    };
   };
   hmModule = {
     home-manager = {

flake/pkgs.nix

@@ -24,19 +24,16 @@
       flake.setNixPath = false;
     };
   };
+
   perSystem =
     {
       system,
       pkgs,
       ...
     }:
-    let
-    in
     {
       _module.args.pkgs = import inputs.nixpkgs (pkgsParams // { inherit system; });
-
       legacyPackages = pkgs;
-
       packages = lib.genAttrs (builtins.attrNames (config.flake.overlays.additions pkgs pkgs)) (
         pkg: pkgs.${pkg}
       );
@@ -44,21 +41,15 @@
 
   flake.overlays.additions =
     final: prev:
-    let
+    with lib.haumea;
-      paths = [
+    load {
-        # keep-sorted start
+      src = ../pkgs;
-        ./fcitx5-lightly
+      loader = [
-        ./jj-starship.nix
+        {
-        ./mono-gtk-theme.nix
+          matches = str: builtins.match ".*\\.nix" str != null;
-        ./ttf-wps-fonts.nix
+          loader = _: path: final.callPackage path { };
-        ./wps-office-fonts.nix
+        }
-        # keep-sorted end
+      ];
-      ];
+      transformer = transformers.liftDefault;
-    in
+    };
-    builtins.listToAttrs (
-      map (path: {
-        name = builtins.elemAt (lib.splitString "." (builtins.baseNameOf path)) 0;
-        value = final.callPackage path { };
-      }) paths
-    );
 }

lib/umport.nix

@@ -28,9 +28,7 @@ let
         || extraExcludePredicate path;
     in
     unique (
-      (filter
+      (filter (file: pathIsRegularFile file && hasSuffix ".nix" (toString file) && !isExcluded file) (
-        (file: pathIsRegularFile file && hasSuffix ".nix" (builtins.toString file) && !isExcluded file)
-        (
         concatMap (
           path:
           if recursive then
@@ -40,8 +38,7 @@ let
               name: type: path + (if type == "directory" then "/${name}/default.nix" else "/${name}")
             ) (builtins.readDir path)
         ) (unique (if path == null then paths else [ path ] ++ paths))
-        )
+      ))
-      )
       ++ (if recursive then concatMap (path: toList path) (unique include) else unique include)
     );
 in

modules/core/nix.nix

@@ -38,8 +38,7 @@ in
     }) config.nix.registry;
 
     nix.settings = {
-      # Enable flakes and new 'nix' command
+      experimental-features = "nix-command flakes pipe-operators";
-      experimental-features = "nix-command flakes";
       substituters = [
         "https://mirrors.sjtug.sjtu.edu.cn/nix-channels/store"
         "https://mirror.sjtu.edu.cn/nix-channels/store"