From a12774728b56b71e4b00912a2bb71ba5cd69d8a6 Mon Sep 17 00:00:00 2001 From: ene Date: Mon, 3 Apr 2023 08:47:10 +0200 Subject: Fix(host/tiamat): Update to new install --- hosts/tiamat/configuration.nix | 8 ++++++-- hosts/tiamat/hardware/cpu.nix | 2 +- hosts/tiamat/hardware/default.nix | 14 +++++++++----- hosts/tiamat/hardware/gpu.nix | 12 ++++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) (limited to 'hosts/tiamat') diff --git a/hosts/tiamat/configuration.nix b/hosts/tiamat/configuration.nix index 44a89d70..137e9b68 100644 --- a/hosts/tiamat/configuration.nix +++ b/hosts/tiamat/configuration.nix @@ -10,10 +10,14 @@ ./hardware ./networking.nix - ../../secrets - ../../system ]; + soispha = { + users = { + hashedPassword = "$y$jFT$qi3wS9njrMl2y55b3NOBI0$j40Qt6AAkMSfZ82KPhqMaUaPztWtPps1wOqaXaF/L.6"; # TODO change this to a unique one + }; + }; + system.stateVersion = "23.05"; } diff --git a/hosts/tiamat/hardware/cpu.nix b/hosts/tiamat/hardware/cpu.nix index 6859f72a..2d7232cd 100644 --- a/hosts/tiamat/hardware/cpu.nix +++ b/hosts/tiamat/hardware/cpu.nix @@ -1,4 +1,4 @@ {config, ...}: { powerManagement.cpuFreqGovernor = "powersave"; - hardware.cpu.intel.updateMicrocode = true; # Why not? + hardware.cpu.amd.updateMicrocode = true; # Why not? } diff --git a/hosts/tiamat/hardware/default.nix b/hosts/tiamat/hardware/default.nix index bd7241b3..595c07c0 100644 --- a/hosts/tiamat/hardware/default.nix +++ b/hosts/tiamat/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/"; - efiDisk = "/dev/disk/by-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"]; - # TODO check this: - initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; + initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "nvme" "sr_mod" "virtio_blk"]; }; } diff --git a/hosts/tiamat/hardware/gpu.nix b/hosts/tiamat/hardware/gpu.nix index 9649c770..6a28eaa4 100644 --- a/hosts/tiamat/hardware/gpu.nix +++ b/hosts/tiamat/hardware/gpu.nix @@ -4,11 +4,23 @@ lib, ... }: { + # 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"; + hardware.opengl = { enable = true; extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl + + amdvlk # or directly through mesa + amd-media-driver # libva ]; }; } -- cgit 1.4.1