diff options
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 9 | ||||
| -rw-r--r-- | hosts/apzu/configuration.nix | 10 | ||||
| -rw-r--r-- | hosts/apzu/hardware/default.nix | 16 | ||||
| -rw-r--r-- | hosts/apzu/hardware/gpu.nix | 24 |
4 files changed, 46 insertions, 13 deletions
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 270f13a2..173882b7 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -102,6 +102,15 @@ in { ] ++ defaultModules; }; + apzu = nixpkgs.lib.nixosSystem { + inherit system pkgs; + specialArgs = defaultSpecialArgs; + modules = + [ + ../../hosts/apzu/configuration.nix + ] + ++ defaultModules; + }; spawn = nixpkgs.lib.nixosSystem { specialArgs = defaultSpecialArgs; modules = [../../hosts/spawn/configuration.nix]; diff --git a/hosts/apzu/configuration.nix b/hosts/apzu/configuration.nix index 0e71a7ba..2a21ffb9 100644 --- a/hosts/apzu/configuration.nix +++ b/hosts/apzu/configuration.nix @@ -13,5 +13,15 @@ ../../system ]; + soispha = { + fs.backup = { + enable = true; + backupDiskUuid = "d1c6e0f6-1837-40fd-bb29-251d5ea0ddb0"; + }; + users = { + hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6"; # TODO change this to a unique one + }; + }; + system.stateVersion = "23.05"; } diff --git a/hosts/apzu/hardware/default.nix b/hosts/apzu/hardware/default.nix index bd7241b3..b11cf522 100644 --- a/hosts/apzu/hardware/default.nix +++ b/hosts/apzu/hardware/default.nix @@ -11,18 +11,22 @@ ./gpu.nix ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + nixpkgs.hostPlatform = "x86_64-linux"; system.fileSystemLayouts = { enable = true; - mainDisk = "/dev/disk/by-uuid/<uuid>"; - efiDisk = "/dev/disk/by-uuid/<uuid>"; + mainDisk = "/dev/disk/by-uuid/4211a4ff-f2e9-41ed-83ca-712830fd0254"; + efiDisk = "/dev/disk/by-uuid/2BFA-8F0F"; + ssd = true; + swap = { + uuid = "4211a4ff-f2e9-41ed-83ca-712830fd0254"; + resumeOffset = "533760"; + }; }; boot = { - kernelModules = ["kvm-amd"]; + kernelModules = ["kvm-amd" "rtw89"]; - # TODO check this: - initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; + initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; }; } diff --git a/hosts/apzu/hardware/gpu.nix b/hosts/apzu/hardware/gpu.nix index c3df51ae..180695e8 100644 --- a/hosts/apzu/hardware/gpu.nix +++ b/hosts/apzu/hardware/gpu.nix @@ -4,12 +4,22 @@ lib, ... }: { - hardware.opengl.extraPackages = with pkgs; [ - rocm-opencl-icd # open-cl - amdvlk # or directly through mesa - amd-media-driver # libva - ]; + # hardware.opengl.extraPackages = with pkgs; [ + # rocm-opencl-icd # open-cl + # amdvlk # or directly through mesa + # amd-media-driver # libva + # ]; + # + # # Force radv, TODO is this logical? + # environment.variables.AMD_VULKAN_ICD = "RADV"; - # Force radv, TODO is this logical? - environment.variables.AMD_VULKAN_ICD = "RADV"; + hardware.opengl = { + enable = true; + extraPackages = with pkgs; [ + vaapiVdpau + libvdpau-va-gl + + #amdvlk # or directly through mesa + ]; + }; } |