diff options
| -rw-r--r-- | flake.lock | 12 | ||||
| -rw-r--r-- | machines/x/hardware-configuration.nix | 8 | ||||
| -rw-r--r-- | modules/amdgpu.nix | 11 | ||||
| -rw-r--r-- | packages/dwl.nix | 2 | ||||
| -rw-r--r-- | packages/dwlb.nix | 2 |
5 files changed, 15 insertions, 20 deletions
@@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1718526747, - "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", + "lastModified": 1719180626, + "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", + "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718530797, - "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { diff --git a/machines/x/hardware-configuration.nix b/machines/x/hardware-configuration.nix index 6fbb4ed..964bbb2 100644 --- a/machines/x/hardware-configuration.nix +++ b/machines/x/hardware-configuration.nix @@ -8,20 +8,20 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/ec9f01a5-c551-4ffd-89c8-624056cef6cf"; + { device = "/dev/disk/by-uuid/fb695c14-0255-4deb-a816-e74fa8c42c4b"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/12CE-A600"; + { device = "/dev/disk/by-uuid/19BE-DB3C"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = [ ]; diff --git a/modules/amdgpu.nix b/modules/amdgpu.nix index fe7f898..430faf3 100644 --- a/modules/amdgpu.nix +++ b/modules/amdgpu.nix @@ -1,20 +1,15 @@ { pkgs, config, ... }: { - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; - - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.enable = true; + hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk vaapiVdpau libvdpau-va-gl ]; - hardware.opengl.extraPackages32 = with pkgs; [ + hardware.graphics.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; diff --git a/packages/dwl.nix b/packages/dwl.nix index 7d6b96b..45c69db 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwl"; rev = "master"; - hash = "sha256-62Y65REaDOqc5znN2kvD3HfGpEeAj9lRx667LaWaoMQ="; + hash = "sha256-eg0HuGC8h4F3LoB09rFErma9iciC1znAcoJnMBTX9o8="; }; nativeBuildInputs = [ diff --git a/packages/dwlb.nix b/packages/dwlb.nix index acdd840..9755203 100644 --- a/packages/dwlb.nix +++ b/packages/dwlb.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwlb"; rev = "systray"; - hash = "sha256-xgTJz9Q2PKl0mWaeznDGkUIlPRV0ICBa7q5oRqxCBDQ="; + hash = "sha256-x+GjFiPlWmW+eAul9+UkLW0BJsiqdF/R7ADS/hO8SFo="; }; nativeBuildInputs = [ |