From daf14a2aed79a4d7d0e52019746b6b5e48f61abb Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Wed, 1 Jan 2025 22:17:08 +0000 Subject: [PATCH] Update PC configuration for LUKS --- nixos-configurations/pc/default.nix | 8 ++++ .../pc/hardware-configuration.nix | 48 +++++++------------ 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/nixos-configurations/pc/default.nix b/nixos-configurations/pc/default.nix index 8225327..91c173b 100644 --- a/nixos-configurations/pc/default.nix +++ b/nixos-configurations/pc/default.nix @@ -23,6 +23,14 @@ }; }; + boot.initrd = { + luks.devices = { + cryptroot = { + device = "/dev/disk/by-uuid/c5c34e4a-ae75-42a2-a13e-3b411300b25e"; + }; + }; + }; + environment.sessionVariables = { MUTTER_DEBUG_DISABLE_HW_CURSORS = "1"; }; diff --git a/nixos-configurations/pc/hardware-configuration.nix b/nixos-configurations/pc/hardware-configuration.nix index b6f7c60..8b16270 100644 --- a/nixos-configurations/pc/hardware-configuration.nix +++ b/nixos-configurations/pc/hardware-configuration.nix @@ -1,44 +1,32 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usb_storage" - "usbhid" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/9e4f1090-bb46-4fd8-9a2d-e053c08af7d0"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/56addf54-606f-43ad-b74f-45e9966c9342"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/D4D5-F5A5"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/CED3-28AE"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/b60e6293-f5b2-4f7f-a6e7-82d429452c52"; } ]; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/54590048-bdf2-4faa-8176-f6e1d582c357"; } ]; # 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