Skip to content

Commit 40f677c

Browse files
author
Pacman99
committed
set nixpkgs.pkgs based on system to allow users to set architecture within hosts
1 parent 5a77ed5 commit 40f677c

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

hosts/NixOS-a64.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{ suites, ... }:
2+
{
3+
### root password is empty by default ###
4+
imports = suites.base;
5+
6+
nixpkgs.system = "aarch64-linux";
7+
8+
boot.loader.systemd-boot.enable = true;
9+
boot.loader.efi.canTouchEfiVariables = true;
10+
11+
networking.networkmanager.enable = true;
12+
13+
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
14+
}

hosts/default.nix

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
, lib
44
, nixos
55
, override
6-
, pkgs
6+
, multiPkgs
77
, self
8-
, system
8+
, defaultSystem
99
, ...
1010
}:
1111
let
@@ -28,7 +28,7 @@ let
2828
modules;
2929
};
3030

31-
global = {
31+
global = { config, ... }: {
3232
home-manager.useGlobalPkgs = true;
3333
home-manager.useUserPackages = true;
3434

@@ -40,7 +40,8 @@ let
4040
"home-manager=${home}"
4141
];
4242

43-
nixpkgs = { inherit pkgs; };
43+
44+
nixpkgs.pkgs = lib.mkDefault multiPkgs.${config.nixpkgs.system};
4445

4546
nix.registry = {
4647
devos.flake = self;
@@ -62,7 +63,9 @@ let
6263
modOverrides
6364
] ++ extern.modules;
6465

65-
specialArgs = extern.specialArgs // { inherit suites; };
66+
specialArgs = extern.specialArgs // {
67+
inherit suites multiPkgs;
68+
};
6669

6770
mkHostConfig = hostName:
6871
let
@@ -75,7 +78,8 @@ let
7578
};
7679
in
7780
dev.os.devosSystem {
78-
inherit system specialArgs;
81+
inherit specialArgs;
82+
system = defaultSystem;
7983

8084
modules = modules ++ [
8185
local

0 commit comments

Comments
 (0)