[shared] Allow systems to run on unstable

This commit is contained in:
2025-10-18 13:44:14 +02:00
parent ddb8f8cfb5
commit c07940e86f
2 changed files with 18 additions and 1 deletions

View File

@@ -43,6 +43,7 @@
{ {
self, self,
nixpkgs, nixpkgs,
nixpkgs-unstable,
home-manager, home-manager,
... ...
}@inputs: }@inputs:
@@ -97,10 +98,14 @@
{ {
system, system,
username, username,
nixos,
... ...
}@systemConfig: }@systemConfig:
nixpkgs.lib.nixosSystem { let
pkgs = if nixos.channel == "stable" then nixpkgs else nixpkgs-unstable;
in
pkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit inherit

View File

@@ -1,4 +1,5 @@
{ common, ... }: { common, ... }:
# TODO add type, desktop, server, ...?
let let
defaultConfig = { defaultConfig = {
system = "x86_64-linux"; system = "x86_64-linux";
@@ -6,6 +7,7 @@ let
version = common.system.version; version = common.system.version;
wayland.enable = true; wayland.enable = true;
nvidia.enable = false; nvidia.enable = false;
nixos.channel = "stable"; # stable | unstable
}; };
in in
builtins.mapAttrs (_hostName: systemConfig: defaultConfig // systemConfig) { builtins.mapAttrs (_hostName: systemConfig: defaultConfig // systemConfig) {
@@ -17,6 +19,7 @@ builtins.mapAttrs (_hostName: systemConfig: defaultConfig // systemConfig) {
thinkpad = { thinkpad = {
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNlHKE/BD8kKfhJD7GBk1A3whZf3gTjk9VEgGAj3qsH"; ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNlHKE/BD8kKfhJD7GBk1A3whZf3gTjk9VEgGAj3qsH";
git.signing.key = "848D71DE0590C199"; git.signing.key = "848D71DE0590C199";
nixos.channel = "unstable";
}; };
pi4 = { pi4 = {
system = "aarch64-linux"; system = "aarch64-linux";
@@ -35,5 +38,14 @@ builtins.mapAttrs (_hostName: systemConfig: defaultConfig // systemConfig) {
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILw1iNuPnX9NGt+UAvBDzkk26d1e4nF+XX2FMm+IRWtt"; ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILw1iNuPnX9NGt+UAvBDzkk26d1e4nF+XX2FMm+IRWtt";
address.private = common.localIpAddr 228; address.private = common.localIpAddr 228;
git.signing.key = "4E323F914029E976"; git.signing.key = "4E323F914029E976";
nixos.channel = "unstable";
};
# Samsung S23 FE
localhost-y4maoyqm = {
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7SSjiqnjif1Kko60iXVTKJ7a1/lRlR8TFNtoclNcnQ";
};
# OnePlus 8
localhost-4izgka9k = {
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALtulVgLrUEpKnpfPFQTHjaEXTxs2Q818NC18eLx0bj";
}; };
} }