pkgs-small broke down into functions

This commit is contained in:
Danilo Reyes 2024-11-13 22:15:11 -06:00
parent f9727bb284
commit 5f639e4a6b
2 changed files with 19 additions and 17 deletions

View File

@ -37,30 +37,32 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs = makePkgs inputs.nixpkgs; makePkgsMain =
pkgs-small = makePkgs inputs.nixpkgs-small; name: makePkgs (if name == "workstation" then inputs.nixpkgs else inputs.nixpkgs-small);
pkgs-chrome = makePkgs inputs.nixpkgs-chrome; createConfig = name: {
overlays = [ (import ./overlay.nix { inherit pkgs pkgs-chrome; }) ];
createConfig = name: packageSet: {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
pkgs = packageSet;
}; };
modules = [ modules =
(_: { nixpkgs.overlays = overlays; }) let
./hosts/${name}/configuration.nix pkgs = makePkgsMain name;
inputs.sops-nix.nixosModules.sops pkgs-chrome = makePkgs inputs.nixpkgs-chrome;
inputs.nixos-cosmic.nixosModules.default in
]; [
(_: { nixpkgs.overlays = [ (import ./overlay.nix { inherit pkgs pkgs-chrome; }) ]; })
./hosts/${name}/configuration.nix
inputs.sops-nix.nixosModules.sops
inputs.nixos-cosmic.nixosModules.default
];
}; };
in in
{ {
inherit lib; inherit lib;
nixosConfigurations = { nixosConfigurations = {
workstation = lib.nixosSystem (createConfig "workstation" pkgs); workstation = lib.nixosSystem (createConfig "workstation");
miniserver = lib.nixosSystem (createConfig "miniserver" pkgs-small); miniserver = lib.nixosSystem (createConfig "miniserver");
server = lib.nixosSystem (createConfig "server" pkgs-small); server = lib.nixosSystem (createConfig "server");
}; };
}; };
} }

View File

@ -1,4 +1,4 @@
{ pkgs, pkgsC }: { pkgs, pkgs-chrome }:
_self: super: { _self: super: {
gnome = super.gnome.overrideScope ( gnome = super.gnome.overrideScope (
_gFinal: gPrev: { _gFinal: gPrev: {
@ -44,5 +44,5 @@ _self: super: {
ripgrep = super.ripgrep.override { withPCRE2 = true; }; ripgrep = super.ripgrep.override { withPCRE2 = true; };
papirus-icon-theme = super.papirus-icon-theme.override { color = "green"; }; papirus-icon-theme = super.papirus-icon-theme.override { color = "green"; };
blender = super.blender.override { cudaSupport = true; }; blender = super.blender.override { cudaSupport = true; };
inherit (pkgsC) chromium; inherit (pkgs-chrome) chromium;
} }