code review

This commit is contained in:
Miguel Palhas
2024-10-04 16:00:19 +01:00
parent 630c588558
commit cbf66e1699
+53 -50
View File
@@ -32,58 +32,61 @@
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
}; };
outputs = { self, nixpkgs, home-manager, catppuccin, foundry, ... }@inputs: outputs =
let { self, nixpkgs, home-manager, utils, catppuccin, foundry, ... }@inputs:
inherit (self) outputs; utils.lib.eachDefaultSystem (system:
x86 = nixpkgs.legacyPackages.x86_64-linux; let
forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" ]; inherit (self) outputs;
forEachPkg = f: forEachSystem (sys: f nixpkgs.legacyPackages.${sys}); x86 = nixpkgs.legacyPackages.x86_64-linux;
pkgs = import nixpkgs { forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" ];
inherit x86; forEachPkg = f: forEachSystem (sys: f nixpkgs.legacyPackages.${sys});
overlays = [ foundry.overlay ]; pkgs = import nixpkgs {
}; inherit x86;
mkNixOS = extraModules: overlays = [ foundry.overlay ];
nixpkgs.lib.nixosSystem { };
inherit extraModules; mkNixOS = extraModules:
specialArgs = { inherit inputs outputs; }; nixpkgs.lib.nixosSystem {
modules = extraModules ++ [ inherit extraModules;
catppuccin.nixosModules.catppuccin specialArgs = { inherit inputs outputs; };
{ modules = extraModules ++ [
nixpkgs = { catppuccin.nixosModules.catppuccin
overlays = [ {
foundry.overlay nixpkgs = {
(final: prev: { overlays = [
nvchad = inputs.nvchad4nix.packages."${pkgs.system}".nvchad; 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: homeConfigurations = {
home-manager.lib.homeManagerConfiguration { "naps62@laptop" = mkHome [ ./home-manager/laptop ] x86;
inherit modules pkgs; "naps62@arrakis" = mkHome [ ./home-manager/arrakis ] x86;
extraSpecialArgs = { inherit inputs outputs catppuccin; }; "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 = { devShells = forEachPkg (pkgs: import ./shell.nix { inherit pkgs; });
"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; });
};
} }