diff --git a/nixos-configurations/pc/default.nix b/nixos-configurations/pc/default.nix index 5746e19..4e36585 100644 --- a/nixos-configurations/pc/default.nix +++ b/nixos-configurations/pc/default.nix @@ -26,7 +26,7 @@ boot.initrd = { luks.devices = { cryptroot = { - device = "/dev/disk/by-uuid/c5c34e4a-ae75-42a2-a13e-3b411300b25e"; + device = "/dev/disk/by-uuid/1202158c-cf4a-49f5-83f6-d54af16bca65"; }; }; }; diff --git a/nixos-configurations/pc/hardware-configuration.nix b/nixos-configurations/pc/hardware-configuration.nix index 7e00ac8..3e2706d 100644 --- a/nixos-configurations/pc/hardware-configuration.nix +++ b/nixos-configurations/pc/hardware-configuration.nix @@ -1,48 +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.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/56addf54-606f-43ad-b74f-45e9966c9342"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/69528c2b-4fe1-4ff8-a77b-2fc000669629"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/CED3-28AE"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/139D-6775"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/aafdb506-7d0b-40ef-b87a-c14c39688b76"; } ]; - }; - - swapDevices = [ - { device = "/dev/disk/by-uuid/b60e6293-f5b2-4f7f-a6e7-82d429452c52"; } - ]; # 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