uhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh

This commit is contained in:
serenity-F 2024-09-11 11:16:49 +10:00
parent 860254fde3
commit 57f28539b9
6 changed files with 83 additions and 55 deletions

View file

@ -4,8 +4,8 @@
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
"${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
./disko-config.nix
# "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix"
# ./disko-config.nix
# ./network-configuration.nix
../../core/configuration.nix
@ -18,30 +18,31 @@
canTouchEfiVariables = true;
efiSysMountPoint = "/boot/efi";
};
systemd-boot = {
enable = false;
configurationLimit = 10;
};
#systemd-boot = {
#enable = false;
#configurationLimit = 10;
#};
grub = {
enable = true;
efiSupport = true;
#efiInstallAsRemovable = true;
device = "/dev/sda1";
device = "/dev/sdd";
useOSProber = true;
enableCryptodisk = true;
};
};
initrd = {
systemd.enable = true;
secrets = {
"crypto_keyfile.bin" = null;
"/boot/crypto_keyfile.bin" = null;
};
luks = {
# devices."luks-DISK_UUID" = {
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".keyFile = "/boot/crypto_keyfile.bin";
# device = "/dev/disk/by-uuid/DISK_UUID";
# keyfile = "/crypto_keyfile.bin";
# };
};
};
};
};
services.fstrim.enable = true;

View file

@ -9,11 +9,21 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea";
fsType = "btrfs";
options = [ "subvol=@" ];
};
boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction