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 =
|
outputs =
|
||||||
inputs@{ self, nixpkgs, nixos-unstable, home-manager }:
|
inputs@{ self, nixpkgs, nixos-unstable, home-manager }:
|
||||||
let
|
let
|
||||||
sysLinuxX86 = "x86_64-linux";
|
sysLinuxX64 = "x86_64-linux";
|
||||||
sysDarwinAarch = "aarch64-darwin";
|
sysDarwin = "aarch64-darwin";
|
||||||
sysLinuxAarch = "aarch64-linux";
|
sysLinuxAarch = "aarch64-linux";
|
||||||
|
|
||||||
wrapPkgsSystem = { system }:
|
wrapPkgsSystem = { system }:
|
||||||
@ -31,32 +31,20 @@
|
|||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX86; };
|
wrapUtils = { pkgs, unstable, system }:
|
||||||
unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX86; };
|
import ./lib { inherit nixpkgs nixos-unstable home-manager system pkgs unstable; };
|
||||||
utilsLinuxX64 = import ./lib {
|
|
||||||
inherit nixpkgs nixos-unstable home-manager;
|
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
|
||||||
pkgs = pkgsLinuxX64;
|
unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; };
|
||||||
unstable = unstableLinuxX64;
|
utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstable = unstableLinuxX64; };
|
||||||
system = sysLinuxX86;
|
|
||||||
};
|
|
||||||
|
|
||||||
pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
|
pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
|
||||||
unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; };
|
unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; };
|
||||||
utilsLinuxAarch = import ./lib {
|
utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstable = unstableLinuxAarch; };
|
||||||
inherit nixpkgs nixos-unstable home-manager;
|
|
||||||
pkgs = pkgsLinuxAarch;
|
|
||||||
unstable = unstableLinuxAarch;
|
|
||||||
system = sysLinuxAarch;
|
|
||||||
};
|
|
||||||
|
|
||||||
pkgsDarwin = wrapPkgsSystem { system = sysDarwinAarch; };
|
pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
|
||||||
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwinAarch; };
|
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; };
|
||||||
utilsDarwin = import ./lib {
|
utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstable = unstableDarwin; };
|
||||||
inherit nixpkgs nixos-unstable home-manager;
|
|
||||||
pkgs = pkgsDarwin;
|
|
||||||
unstable = unstableDarwin;
|
|
||||||
system = sysDarwinAarch;
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
|
Loading…
Reference in New Issue
Block a user