This commit is contained in:
serenity-F 2024-09-11 12:06:05 +10:00
parent 0ac60d51d7
commit 043f5a0056
3 changed files with 68 additions and 54 deletions

View file

@ -8,15 +8,35 @@
# Enable swap on luks # Enable swap on luks
boot = { boot = {
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
initrd = {
availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ ];
systemd.enable = true;
secrets = {
"/boot/crypto_keyfile.bin" = null;
};
luks = {
devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96";
#devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".keyFile = "/boot/crypto_keyfile.bin";
# device = "/dev/disk/by-uuid/DISK_UUID";
# keyfile = "/crypto_keyfile.bin";
};
};
loader = { loader = {
efi = { efi = {
canTouchEfiVariables = true; canTouchEfiVariables = true;
efiSysMountPoint = "/boot/efi"; efiSysMountPoint = "/boot/efi";
}; };
#systemd-boot = { #systemd-boot = {
#enable = false; #enable = false;
#configurationLimit = 10; #configurationLimit = 10;
#}; #};
grub = { grub = {
enable = true; enable = true;
efiSupport = true; efiSupport = true;
@ -25,18 +45,9 @@
useOSProber = true; useOSProber = true;
enableCryptodisk = true; enableCryptodisk = true;
}; };
}; };
initrd = {
systemd.enable = true;
secrets = {
"/boot/crypto_keyfile.bin" = null;
};
luks = {
#devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".keyFile = "/boot/crypto_keyfile.bin";
# device = "/dev/disk/by-uuid/DISK_UUID";
# keyfile = "/crypto_keyfile.bin";
};
};
}; };
} }

View file

@ -11,29 +11,8 @@
]; ];
services.fstrim.enable = true;
# powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; # powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware = {
cpu.intel.updateMicrocode = true;
enableAllFirmware = true;
bluetooth.enable = false;
opengl = {
enable = true;
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};
};
nix = { nix = {
# settings = { # settings = {
# }; # };
@ -45,12 +24,4 @@
}; };
}; };
environment.systemPackages = with pkgs; [
umr
radeontop
radeontools
radeon-profile
amdgpu_top
];
} }

View file

@ -9,10 +9,10 @@
./boot-config.nix ./boot-config.nix
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; #boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; #boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; #boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; #boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea"; { device = "/dev/disk/by-uuid/5cbed60c-33e3-4d69-a39e-c1d6d19406ea";
@ -20,10 +20,42 @@
options = [ "subvol=@" ]; options = [ "subvol=@" ];
}; };
boot.initrd.luks.devices."luks-3de671ef-22a3-4f28-9251-a0687ab44f96".device = "/dev/disk/by-uuid/3de671ef-22a3-4f28-9251-a0687ab44f96"; #fileSystems."/boot" =
#{ 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 = [ ]; swapDevices = [ ];
services.fstrim.enable = true;
hardware = {
cpu.intel.updateMicrocode = true;
enableAllFirmware = true;
bluetooth.enable = false;
opengl = {
enable = true;
extraPackages = with pkgs; [
intel-compute-runtime
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};
};
environment.systemPackages = with pkgs; [
umr
radeontop
amdgpu_top
radeontools
radeon-profile
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (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 # still possible to use this option, but it's recommended to use it in conjunction