refactor(nix): remove per-system functions

simply handled by setup.py

Author: WilliamHsieh

flake.nix

@@ -60,61 +60,65 @@
   };
 
   outputs = inputs @ { self, ... }:
-    with self.lib;
+    let
+      inherit (self.lib) dotfiles;
+      inherit (self.lib) pkgs;
+      inherit (dotfiles) system;
+    in
     {
       lib = inputs.nixpkgs.lib // import ./lib { inherit inputs; };
 
-      packages = foreachSystem (system:
-        {
+      packages = {
+        ${system} = {
           default =
             if dotfiles.profile == "home" then
               inputs.home-manager.packages.${system}.home-manager
             else if dotfiles.profile == "darwin" then
               inputs.darwin.packages.${system}.darwin-rebuild
             else if dotfiles.profile == "nixos" then
-              pkgsBySystem.${system}.nixos-rebuild
+              pkgs.nixos-rebuild
             else if dotfiles.profile == "" then
               builtins.abort "Empty profile type, please run setup.py with `--bootstrap`"
             else
               builtins.abort "Unknown profile type: '${dotfiles.profile}'"
           ;
-        }
-      );
+        };
+      };
 
-      homeConfigurations = mkHome;
+      homeConfigurations = self.lib.mkHome { };
 
-      nixosConfigurations = mkSystem {
+      nixosConfigurations = self.lib.mkSystem {
         isDarwin = false;
       };
 
-      darwinConfigurations = mkSystem {
+      darwinConfigurations = self.lib.mkSystem {
         # NOTE: home manager activation is showing following error
         # error: profile '/Users/william/.local/state/nix/profiles/profile' is incompatible with 'nix-env'; please use 'nix profile' instead
         # temporary workaround is to synlink ~/.local/state/nix/profile to ~/.nix-profile
         # ref: https://discourse.nixos.org/t/home-manager-insists-on-using-nix-profile/57708
         isDarwin = true;
       };
 
-      checks = foreachSystem (system: {
+      checks = {
         pre-commit-check = inputs.git-hooks.lib.${system}.run {
-          src = cleanSource ./.;
+          src = self.lib.cleanSource ./.;
           hooks = {
             # TODO: treefmt, selene, shellcheck
             editorconfig-checker.enable = true;
             nixpkgs-fmt.enable = true;
             stylua = {
               enable = true;
-              entry = "${pkgsBySystem.${system}.stylua}/bin/stylua --config-path ./config/nvim/stylua.toml";
+              entry = "${pkgs.stylua}/bin/stylua --config-path ${dotfiles.directory}/config/nvim/stylua.toml";
             };
           };
         };
-      });
+      };
 
-      devShells = foreachSystem (system: {
-        default = pkgsBySystem.${system}.mkShell {
+      devShells = {
+        default = pkgs.mkShell {
           inherit (self.checks.${system}.pre-commit-check) shellHook;
           buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;
         };
-      });
+      };
     };
 }

lib/default.nix

@@ -6,13 +6,10 @@ let
 
   inherit (inputs.nixpkgs) lib;
 
-  systems = [ "x86_64-linux" "aarch64-darwin" ];
-  foreachSystem = lib.genAttrs systems;
-
-  pkgsBySystem = foreachSystem (system:
+  pkgs =
     # https://github.com/nix-community/home-manager/issues/2942#issuecomment-1378627909
     import inputs.nixpkgs {
-      inherit system;
+      inherit (dotfiles) system;
       overlays = [
         # TODO: this should be local to system specific home-manager module, and loaded conditionally
         inputs.niri.overlays.niri
@@ -26,10 +23,9 @@ let
           };
         };
       };
-    }
-  );
+    };
 
-  fonts = pkgs: with pkgs; [
+  fontPkgs = with pkgs; [
     maple-mono.Normal-NF-CN-unhinted
     maple-mono.NF-CN-unhinted
   ] ++ (with nerd-fonts; [
@@ -40,11 +36,11 @@ let
   ]);
 in
 {
-  inherit foreachSystem pkgsBySystem dotfiles systems;
+  inherit dotfiles pkgs;
 
   stateVersion = "${builtins.elemAt (lib.splitString "-" lockfile.nodes.${input_name}.original.ref) 1}";
 
-  mkHome = let pkgs = pkgsBySystem.${dotfiles.system}; in {
+  mkHome = {}: {
     ${dotfiles.username} = inputs.home-manager.lib.homeManagerConfiguration {
       inherit pkgs;
       extraSpecialArgs = {
@@ -56,16 +52,14 @@ in
         ./nix.nix
         {
           fonts.fontconfig.enable = true;
-          home.packages = fonts pkgs;
+          home.packages = fontPkgs;
         }
       ];
     };
   };
 
   mkSystem = { isDarwin }:
     let
-      pkgs = pkgsBySystem.${dotfiles.system};
-
       # NixOS vs nix-darwin functionst
       systemFunc = if isDarwin then inputs.darwin.lib.darwinSystem else inputs.nixpkgs.lib.nixosSystem;
       hmModules = if isDarwin then inputs.home-manager.darwinModules else inputs.home-manager.nixosModules;
@@ -80,7 +74,7 @@ in
             ../system/${dotfiles.profile}
             hmModules.home-manager
             {
-              fonts.packages = fonts pkgs;
+              fonts.packages = fontPkgs;
             }
           ] ++ (pkgs.lib.optionals pkgs.stdenv.isDarwin [
             inputs.homebrew.darwinModules.nix-homebrew