treewide: refactor bootloader config to common file

This commit is contained in:
Katherina Walshe-Grey 2024-10-01 19:20:34 +01:00
parent 1b18133585
commit cd84be16be
12 changed files with 30 additions and 53 deletions

View file

@ -1,14 +0,0 @@
{ config, lib, pkgs, ... }:
{
boot = {
loader.systemd-boot.enable = true;
loader.systemd-boot.editor = false;
loader.efi.canTouchEfiVariables = true;
initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
kernelModules = [ "kvm-intel" ];
supportedFilesystems = [ "ntfs" ]; # for USB drives
};
}

View file

@ -1,12 +0,0 @@
{ config, lib, pkgs, ... }:
{
environment.etc.crypttab.text = ''
albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
'';
randomcat.services.zfs.datasets = {
"rpool_albion/data" = { mountpoint = "none"; };
"rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
};
}

View file

@ -2,12 +2,9 @@
{
imports = [
./boot.nix
./filesystems.nix
./hardware.nix
./networking.nix
./datasets.nix
./ftp.nix
];
@ -15,6 +12,9 @@
networking.hostName = "kilgharrah";
networking.hostId = "72885bb5";
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" ];
qenya.base-graphical.enable = true;
qenya.base-graphical.desktop = "plasma6";
@ -47,6 +47,11 @@
programs.steam.enable = true;
randomcat.services.zfs.datasets = {
"rpool_albion/data" = { mountpoint = "none"; };
"rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
};
system.stateVersion = "24.05";
}

View file

@ -5,6 +5,12 @@
"cryptroot".device = "/dev/disk/by-uuid/b414aaba-0a36-4135-a7e1-dc9489286acd";
};
environment.etc.crypttab.text = ''
albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
'';
boot.supportedFilesystems = [ "ntfs" ]; # for USB drives
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/ad4cbc18-8849-40ed-b0bf-097f8f46346b";