flake: Refactored architectures names. Added wrapUtil function to reduce code dup
This commit is contained in:
parent
99cf228d80
commit
1913b60db3
36
flake.nix
36
flake.nix
@ -11,8 +11,8 @@
|
||||
outputs =
|
||||
inputs@{ self, nixpkgs, nixos-unstable, home-manager }:
|
||||
let
|
||||
sysLinuxX86 = "x86_64-linux";
|
||||
sysDarwinAarch = "aarch64-darwin";
|
||||
sysLinuxX64 = "x86_64-linux";
|
||||
sysDarwin = "aarch64-darwin";
|
||||
sysLinuxAarch = "aarch64-linux";
|
||||
|
||||
wrapPkgsSystem = { system }:
|
||||
@ -31,32 +31,20 @@
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX86; };
|
||||
unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX86; };
|
||||
utilsLinuxX64 = import ./lib {
|
||||
inherit nixpkgs nixos-unstable home-manager;
|
||||
pkgs = pkgsLinuxX64;
|
||||
unstable = unstableLinuxX64;
|
||||
system = sysLinuxX86;
|
||||
};
|
||||
wrapUtils = { pkgs, unstable, system }:
|
||||
import ./lib { inherit nixpkgs nixos-unstable home-manager system pkgs unstable; };
|
||||
|
||||
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
|
||||
unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; };
|
||||
utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstable = unstableLinuxX64; };
|
||||
|
||||
pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
|
||||
unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; };
|
||||
utilsLinuxAarch = import ./lib {
|
||||
inherit nixpkgs nixos-unstable home-manager;
|
||||
pkgs = pkgsLinuxAarch;
|
||||
unstable = unstableLinuxAarch;
|
||||
system = sysLinuxAarch;
|
||||
};
|
||||
utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstable = unstableLinuxAarch; };
|
||||
|
||||
pkgsDarwin = wrapPkgsSystem { system = sysDarwinAarch; };
|
||||
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwinAarch; };
|
||||
utilsDarwin = import ./lib {
|
||||
inherit nixpkgs nixos-unstable home-manager;
|
||||
pkgs = pkgsDarwin;
|
||||
unstable = unstableDarwin;
|
||||
system = sysDarwinAarch;
|
||||
};
|
||||
pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
|
||||
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; };
|
||||
utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstable = unstableDarwin; };
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
|
Loading…
Reference in New Issue
Block a user