diff options
| author | Devin Finlinson <devin.finlinson@pm.me> | 2023-12-17 19:08:21 -0700 |
|---|---|---|
| committer | Devin Finlinson <devin.finlinson@pm.me> | 2023-12-17 19:08:21 -0700 |
| commit | d176b315f9e074d9eabe8c4b87e56281000ece84 (patch) | |
| tree | b3bd76f7402e43c90d83802bec865d71f7f9c6e7 /machines/khad/hardware-configuration.nix | |
| parent | 153235b4cfc8a4aaea41959c76c5dc9aa98fd547 (diff) | |
| parent | 371b3653826488565e238ad253734cb01196372e (diff) | |
Merge branch 'master' of ssh://git.wormcar.gay:2200/devinf/nix-config
Diffstat (limited to 'machines/khad/hardware-configuration.nix')
| -rw-r--r-- | machines/khad/hardware-configuration.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/machines/khad/hardware-configuration.nix b/machines/khad/hardware-configuration.nix index dc32bab..9807d16 100644 --- a/machines/khad/hardware-configuration.nix +++ b/machines/khad/hardware-configuration.nix @@ -8,33 +8,33 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/d7025289-0e65-4ff8-a774-1a8a7b104858"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/360dd54b-c347-4ca9-adfd-3891414eeef6"; + fsType = "btrfs"; + options = [ "subvol=@" ]; }; + boot.initrd.luks.devices."luks-f6d45986-2c3d-4c6a-bc73-6753d182fef9".device = "/dev/disk/by-uuid/f6d45986-2c3d-4c6a-bc73-6753d182fef9"; + fileSystems."/boot" = - { device = "/dev/disk/by-uuid/B741-9318"; + { device = "/dev/disk/by-uuid/CE2A-4E2F"; fsType = "vfat"; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/9aa90dd0-4123-4caf-ac6e-8a299dda3ad4"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/ce569948-e98c-47e0-9a1b-1e33fc1f0664"; + fsType = "btrfs"; }; - fileSystems."/home/defin/Drives" = - { device = "/dev/disk/by-uuid/ba4e233d-d31a-4e5a-9054-0241bd58ba8e"; - fsType = "ext4"; - }; + boot.initrd.luks.devices."luks-02516df1-d33b-4c83-90f8-4be7b918132e".device = "/dev/disk/by-uuid/02516df1-d33b-4c83-90f8-4be7b918132e"; swapDevices = - [ { device = "/dev/disk/by-uuid/e75daaf1-d6c6-43c3-8a61-ff26b4304f71"; } + [ { device = "/dev/disk/by-uuid/8f615eac-c1a1-48c6-8d34-8059732527c0"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -46,5 +46,5 @@ # networking.interfaces.enp0s20u4.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } |