From c63fa48614a2ab6ecbc26dc07bcc81c39c354024 Mon Sep 17 00:00:00 2001 From: Felix Schulze Date: Sun, 22 Jun 2025 12:56:45 +0200 Subject: [PATCH] wildfire: 309 current 2025-06-22 12:56:39 25.05.20250617.36ab78d 6.15.2 * Graphics config --- hosts/hurricane/configuration.nix | 23 +++++++++++++++++---- hosts/wildfire/configuration.nix | 30 +++++++++++++++------------- hosts/wildfire/hyprland-monitors.nix | 2 +- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/hosts/hurricane/configuration.nix b/hosts/hurricane/configuration.nix index c1d3f49..caf4033 100644 --- a/hosts/hurricane/configuration.nix +++ b/hosts/hurricane/configuration.nix @@ -14,10 +14,6 @@ networking.hostName = "hurricane"; - hardware = { - graphics.enable = true; - }; - # Network security specific to host networking.firewall.allowedTCPPorts = []; networking.firewall.allowedUDPPorts = []; @@ -25,8 +21,27 @@ # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; + # Intel GPU support + hardware = { + graphics.extraPackages = with pkgs; [ + vaapiIntel + intel-media-driver + ]; + opengl = { + enable = true; + extraPackages = with pkgs; [ + vpl-gpu-rt # Intel GPU support + + intel-media-driver # LIBVA_DRIVER_NAME=iHD + intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + libvdpau-va-gl + ]; + }; + }; + # host-specific packages environment.systemPackages = with pkgs; [ + btop ]; # host-specific Systemd services diff --git a/hosts/wildfire/configuration.nix b/hosts/wildfire/configuration.nix index 7413cc0..0b484aa 100644 --- a/hosts/wildfire/configuration.nix +++ b/hosts/wildfire/configuration.nix @@ -17,13 +17,12 @@ networking.hostName = "wildfire"; - hardware = { - steam-hardware.enable = true; - graphics.enable = true; - }; - - # AMD GPU kernel module - boot.initrd.kernelModules = ["amdgpu"]; + # AMD GPU support + boot.initrd.kernelModules = ["amdgpu"]; # AMD GPU kernel module + hardware.graphics.extraPackages = with pkgs; [ + rocmPackages.clr.icd # OpenCL + amdvlk # AMDVLK drivers can be used in addition to the Mesa RADV drivers + ]; # Network security specific to host networking.firewall.allowedTCPPorts = []; @@ -41,14 +40,17 @@ ]; # host-specific Systemd services - systemd.services.lact = { - description = "AMDGPU Control Daemon"; - after = ["multi-user.target"]; - wantedBy = ["multi-user.target"]; - serviceConfig = { - ExecStart = "${pkgs.lact}/bin/lact daemon"; + systemd = { + packages = with pkgs; [lact]; + services.lact = { + description = "AMDGPU Control Daemon"; + after = ["multi-user.target"]; + wantedBy = ["multi-user.target"]; + serviceConfig = { + ExecStart = "${pkgs.lact}/bin/lact daemon"; + }; + enable = true; }; - enable = true; }; # This value determines the NixOS release from which the default diff --git a/hosts/wildfire/hyprland-monitors.nix b/hosts/wildfire/hyprland-monitors.nix index c5e07bb..af197ae 100644 --- a/hosts/wildfire/hyprland-monitors.nix +++ b/hosts/wildfire/hyprland-monitors.nix @@ -2,6 +2,6 @@ # Home Manager Hyprland monitors wayland.windowManager.hyprland.settings.monitor = [ "DP-3, 2560x1440@143.97, 1920x-360, 1" - "HDMI-A-1, 1920x1080@50.00, 0x0, 1" + "HDMI-A-1, 1920x1080@60.00, 0x0, 1" ]; }