diff --git a/modules/hosts/hades/configuration.nix b/modules/hosts/hades/configuration.nix index 3f00128..f00ae42 100644 --- a/modules/hosts/hades/configuration.nix +++ b/modules/hosts/hades/configuration.nix @@ -38,19 +38,21 @@ input-remapper razergenie openrazer-daemon - openrgb-with-all-plugins + openrgb-with-all-pluginsi + ]; # amd radeon gpu drivers and software # https://nixos.wiki/wiki/AMD_GPU - boot = { # load amdgpu driver pre boot initrd.kernelModules = [ "amdgpu" ]; #exposes gpu driver - kernelModules = [ "amdgpu" ]; + kernelModules = [ + "amdgpu" + "kvm-amd" + ]; }; - hardware = { # discrete graphics support graphics.enable = true; diff --git a/modules/hosts/hades/hardware.nix b/modules/hosts/hades/hardware.nix index 9e58f5f..3462e97 100644 --- a/modules/hosts/hades/hardware.nix +++ b/modules/hosts/hades/hardware.nix @@ -14,13 +14,16 @@ { # important i think lol - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; # bootloader boot.loader.systemd-boot.enable = true; # shrug boot.initrd.availableKernelModules = [ + "ehci_pci" "xhci_pci" "ahci" "nvme" @@ -32,15 +35,19 @@ # enable amdgpu at boot boot.initrd.kernelModules = [ "amdgpu" ]; + # luks device mapping + boot.initrd.luks.devices."luks-35440a88-293e-455b-a018-ee1086b07321".device = + "/dev/disk/by-uuid/35440a88-293e-455b-a018-ee1086b07321" + # root partition fileSystems."/" = { - device = "/dev/disk/by-uuid/2f4a231c-04a1-4bb9-9370-c207573be881"; + device = "/dev/mapper/luks-35440a88-293e-455b-a018-ee1086b07321"; fsType = "ext4"; }; # boot partition fileSystems."/boot" = { - device = "/dev/disk/by-uuid/7D2E-5F33"; + device = "/dev/disk/by-uuid/2C83-7F40"; fsType = "vfat"; options = [ "fmask=0077" @@ -49,7 +56,11 @@ }; # swap - swapDevices = [ ]; + swapDevices = [ + { + device = "/dev/mapper/luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d" + } + ]; # specifies x64 uArch nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";