code review

2024-10-04 16:00:19 +01:00
parent 630c588558
commit cbf66e1699
1 changed files with 53 additions and 50 deletions
@@ -32,58 +32,61 @@
    utils.url = "github:numtide/flake-utils";
  };

-  outputs = { self, nixpkgs, home-manager, catppuccin, foundry, ... }@inputs:
-    let
-      inherit (self) outputs;
-      x86 = nixpkgs.legacyPackages.x86_64-linux;
-      forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" ];
-      forEachPkg = f: forEachSystem (sys: f nixpkgs.legacyPackages.${sys});
-      pkgs = import nixpkgs {
-        inherit x86;
-        overlays = [ foundry.overlay ];
-      };
-      mkNixOS = extraModules:
-        nixpkgs.lib.nixosSystem {
-          inherit extraModules;
-          specialArgs = { inherit inputs outputs; };
-          modules = extraModules ++ [
-            catppuccin.nixosModules.catppuccin
-            {
-              nixpkgs = {
-                overlays = [
-                  foundry.overlay
-                  (final: prev: {
-                    nvchad = inputs.nvchad4nix.packages."${pkgs.system}".nvchad;
-                  })
-                ];
-              };
-            }
-          ];
+  outputs =
+    { self, nixpkgs, home-manager, utils, catppuccin, foundry, ... }@inputs:
+    utils.lib.eachDefaultSystem (system:
+      let
+        inherit (self) outputs;
+        x86 = nixpkgs.legacyPackages.x86_64-linux;
+        forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" ];
+        forEachPkg = f: forEachSystem (sys: f nixpkgs.legacyPackages.${sys});
+        pkgs = import nixpkgs {
+          inherit x86;
+          overlays = [ foundry.overlay ];
+        };
+        mkNixOS = extraModules:
+          nixpkgs.lib.nixosSystem {
+            inherit extraModules;
+            specialArgs = { inherit inputs outputs; };
+            modules = extraModules ++ [
+              catppuccin.nixosModules.catppuccin
+              {
+                nixpkgs = {
+                  overlays = [
+                    foundry.overlay
+                    (final: prev: {
+                      nvchad =
+                        inputs.nvchad4nix.packages."${pkgs.system}".nvchad;
+                    })
+                  ];
+                };
+              }
+            ];
+          };
+
+        mkHome = modules: pkgs:
+          home-manager.lib.homeManagerConfiguration {
+            inherit modules pkgs;
+            extraSpecialArgs = { inherit inputs outputs catppuccin; };
+          };
+      in {
+        nixosConfigurations = {
+          laptop = mkNixOS [ ./hosts/laptop ];
+          arrakis = mkNixOS [ ./hosts/arrakis ];
+          desktop = mkNixOS [ ./hosts/desktop ];
+          test = mkNixOS [ ./hosts/test ];
+          pi = mkNixOS [ ./hosts/pi ];
+          live = mkNixOS [ ./hosts/live ];
        };

-      mkHome = modules: pkgs:
-        home-manager.lib.homeManagerConfiguration {
-          inherit modules pkgs;
-          extraSpecialArgs = { inherit inputs outputs catppuccin; };
+        homeConfigurations = {
+          "naps62@laptop" = mkHome [ ./home-manager/laptop ] x86;
+          "naps62@arrakis" = mkHome [ ./home-manager/arrakis ] x86;
+          "naps62@desktop" = mkHome [ ./home-manager/desktop ] x86;
+          "naps62@pi" = mkHome [ ./home-manager/pi ] x86;
+          "naps62@test" = mkHome [ ./home-manager/test ] x86;
        };
-    in {
-      nixosConfigurations = {
-        laptop = mkNixOS [ ./hosts/laptop ];
-        arrakis = mkNixOS [ ./hosts/arrakis ];
-        desktop = mkNixOS [ ./hosts/desktop ];
-        test = mkNixOS [ ./hosts/test ];
-        pi = mkNixOS [ ./hosts/pi ];
-        live = mkNixOS [ ./hosts/live ];
-      };

-      homeConfigurations = {
-        "naps62@laptop" = mkHome [ ./home-manager/laptop ] x86;
-        "naps62@arrakis" = mkHome [ ./home-manager/arrakis ] x86;
-        "naps62@desktop" = mkHome [ ./home-manager/desktop ] x86;
-        "naps62@pi" = mkHome [ ./home-manager/pi ] x86;
-        "naps62@test" = mkHome [ ./home-manager/test ] x86;
-      };
-
-      devShells = forEachPkg (pkgs: import ./shell.nix { inherit pkgs; });
-    };
+        devShells = forEachPkg (pkgs: import ./shell.nix { inherit pkgs; });
+      });
 }