diff --git a/hosts/flubber-machine/hardware.nix b/hosts/flubber-machine/hardware.nix index 929b5ec..85398df 100755 --- a/hosts/flubber-machine/hardware.nix +++ b/hosts/flubber-machine/hardware.nix @@ -9,8 +9,6 @@ inputs.hardware.nixosModules.common-pc (modulesPath + "/installer/scan/not-detected.nix") - - ./omen-30l-gt13-1xxx.nix ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; @@ -21,6 +19,11 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + # radv > amdvlk + environment.variables.AMD_VULKAN_ICD = "RADV"; + + environment.systemPackages = with pkgs; [ amdgpu_top ]; + fileSystems."/" = { device = "/dev/disk/by-uuid/5da6bab0-856a-4e65-8ff6-5b70fe3764b8"; fsType = "btrfs"; diff --git a/hosts/flubber-machine/omen-30l-gt13-1xxx.nix b/hosts/flubber-machine/omen-30l-gt13-1xxx.nix deleted file mode 100644 index e324819..0000000 --- a/hosts/flubber-machine/omen-30l-gt13-1xxx.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, lib, ... }: -{ - # support power features such as suspend to ram - powerManagement.enable = true; - - environment.variables = { - AMD_VULKAN_ICD = "RADV"; - LIBVA_DRIVER_NAME= "radeonsi"; - VDPAU_DRIVER = "radeonsi"; - }; - - environment.systemPackages = with pkgs; [ amdgpu_top ]; - - # fix audio issues: https://forums.linuxmint.com/viewtopic.php?t=445461 - boot.extraModprobeConfig = '' - options snd_hda_intel model=generic - ''; -}