peperunas/nixos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flake: simplify passing of config, remove wrapUnstablePkgs

Browse Source
This commit is contained in:
Giulio De Pasquale 2024-03-12 18:41:03 +00:00
parent b7c465073e
commit d76b08a80d
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
flake.nix
View File

@ -16,33 +16,29 @@
sysLinuxAarch = "aarch64-linux"; sysLinuxAarch = "aarch64-linux";
wrapPkgsSystem = { system }: wrapPkgsSystem = { system }:
import nixpkgs rec { let
inherit system;
unstablePkgs = wrapUnstablePkgsSystem { inherit system; };
localPkgs = import local-unstable {
inherit system;
config.allowUnfree = true;
};
config = { config = {
allowUnfree = true; allowUnfree = true;
}; };
in
import nixpkgs rec {
inherit system config;
unstablePkgs = import nixos-unstable {
inherit system config;
};
localPkgs = import local-unstable {
inherit system config;
};
overlays = [ overlays = [
(final: prev: { inherit unstablePkgs; }) (final: prev: { inherit unstablePkgs; })
(final: prev: { inherit localPkgs; }) (final: prev: { inherit localPkgs; })
]; ];
}; };
wrapUnstablePkgsSystem = { system }: wrapUtils = { pkgs, system }:
import nixos-unstable {
inherit system;
config = {
allowUnfree = true;
};
};
wrapUtils = { pkgs, unstablePkgs, system }:
let let
inherit (pkgs.lib) makeScope; inherit (pkgs.lib) makeScope;
inherit (pkgs) newScope; inherit (pkgs) newScope;
@ -58,16 +54,13 @@
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; }; pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; }; utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; };
utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstablePkgs = unstableLinuxX64; };
pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; }; pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; }; utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; };
utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstablePkgs = unstableLinuxAarch; };
pkgsDarwin = wrapPkgsSystem { system = sysDarwin; }; pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; }; utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; };
utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstablePkgs = unstableDarwin; };
in in
{ {
nixosConfigurations = { nixosConfigurations = {