move boot.loader into hardware config for all hosts

This commit is contained in:
TheWanderingCrow 2025-01-29 13:47:26 -05:00
parent 62ccd0a91e
commit c3b513ea0a
8 changed files with 43 additions and 35 deletions

View file

@ -16,6 +16,12 @@
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
boot.loader = {
systemd-boot.enable = true;
efi = {
canTouchEfiVariables = true;
};
};
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";

View file

@ -16,6 +16,12 @@
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
boot.loader = {
systemd-boot.enable = true;
efi = {
canTouchEfiVariables = true;
};
};
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";

View file

@ -16,6 +16,12 @@
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-amd"];
boot.extraModulePackages = [];
boot.loader = {
systemd-boot.enable = true;
efi = {
canTouchEfiVariables = true;
};
};
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";

View file

@ -17,6 +17,12 @@
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
boot.loader = {
systemd-boot.enable = true;
efi = {
canTouchEfiVariables = true;
};
};
fileSystems."/" = {
device = "zroot";

View file

@ -1,12 +0,0 @@
{
config = {
boot = {
loader = {
systemd-boot.enable = true;
efi = {
canTouchEfiVariables = true;
};
};
};
};
}

View file

@ -6,7 +6,6 @@
imports = [
./network.nix
./audio.nix
./boot.nix
./graphics.nix
];
}

View file

@ -97,7 +97,7 @@
};
lighthouse = {
enable = lib.mkDefault false;
};
};
};
# Desktop options are declared in their relevant modules in module/desktops

View file

@ -6,28 +6,25 @@
...
}:
lib.mkIf config.user.lighthouse.enable {
sops = {
age.keyFile = "/var/lib/sops-nix/key.txt";
age.generateKey = true;
};
sops = {
age.keyFile = "/var/lib/sops-nix/key.txt";
age.generateKey = true;
sops.secrets.cert = {};
sops.secrets.key = {};
services.nebula.networks.test = {
enable = true;
isLighthouse = true;
ca = inputs.nix-secrets.nebula.ca;
cert = config.sops.secrets.cert.path;
key = config.sops.secrets.key.path;
settings = {
listen = {
host = "0.0.0.0";
port = 4242;
};
sops.secrets.cert = {};
sops.secrets.key = {};
services.nebula.networks.test = {
enable = true;
isLighthouse = true;
ca = inputs.nix-secrets.nebula.ca;
cert = config.sops.secrets.cert.path;
key = config.sops.secrets.key.path;
settings = {
listen = {
host = "0.0.0.0";
port = 4242;
};
};
};
};
}