From 2f71bd92332e44c4e212033b1c05095636bf708a Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 30 Apr 2024 20:29:05 -0400 Subject: [PATCH] tsuki: switch to amd --- hosts/tsuki/default.nix | 15 +++------------ hosts/tsuki/hardware.nix | 24 ++---------------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index 543a490..b26fca6 100755 --- a/hosts/tsuki/default.nix +++ b/hosts/tsuki/default.nix @@ -35,7 +35,7 @@ }; xserver = { enable = true; - videoDrivers = ["nvidia"]; + videoDrivers = ["amdgpu"]; xkb = { layout = "us"; variant = ""; @@ -63,19 +63,10 @@ hardware = { pulseaudio.enable = false; - nvidia = { - powerManagement.enable = true; - modesetting.enable = true; - package = config.boot.kernelPackages.nvidiaPackages.stable.overrideAttrs { - src = pkgs.fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86_64/535.171.04/NVIDIA-Linux-x86_64-535.171.04.run"; - sha256 = "0yj38aljmnr0c533d4hl5xjf9b3xm620fix4cp6qlpf99cxn9wg8"; - }; - }; - }; opengl = { enable = true; - extraPackages = [pkgs.nvidia-vaapi-driver]; + driSupport = true; + driSupport32Bit = true; }; opentabletdriver = { enable = true; diff --git a/hosts/tsuki/hardware.nix b/hosts/tsuki/hardware.nix index e4c4598..022e024 100755 --- a/hosts/tsuki/hardware.nix +++ b/hosts/tsuki/hardware.nix @@ -10,7 +10,7 @@ ]; boot = { - kernelModules = ["v4l2loopback" "kvm-intel"]; + kernelModules = ["v4l2loopback" "kvm-amd"]; extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out]; loader = { systemd-boot = { @@ -29,22 +29,6 @@ }; fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/7d098aab-1968-4605-a9a7-b1627941c1ff"; - fsType = "ext4"; - }; - "/boot/efi" = { - device = "/dev/disk/by-uuid/C356-B67C"; - fsType = "vfat"; - }; - "/hdd" = { - device = "/dev/disk/by-uuid/e2e4c4f3-51df-4020-b557-a7cf684de85b"; - fsType = "ext4"; - }; - "/ssd" = { - device = "/dev/disk/by-uuid/9e5a189d-7435-45d7-aef6-cdee4de2428d"; - fsType = "ext4"; - }; "/nas/restic" = { device = "192.168.1.199:/mnt/Sutoreji/nix-restic-data/tsuki"; fsType = "nfs"; @@ -59,13 +43,9 @@ }; }; - swapDevices = [ - {device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc";} - ]; - networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }