From a3b49b8960d16afabfc04b36aaa00e5d877c736c Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Mon, 24 Aug 2026 10:39:58 +0100 Subject: [PATCH] things --- config/hosts/aspects/doloro-desktop/host.nix | 16 +++--- config/hosts/aspects/doloro-laptop/host.nix | 14 ++++-- config/modules/helium.nix | 19 ++++--- config/modules/power-management/lavd.nix | 4 +- config/modules/surface_patches.nix | 2 +- flake.lock | 52 ++++++++++---------- 6 files changed, 56 insertions(+), 51 deletions(-) diff --git a/config/hosts/aspects/doloro-desktop/host.nix b/config/hosts/aspects/doloro-desktop/host.nix index d3c48cd..4a3f941 100644 --- a/config/hosts/aspects/doloro-desktop/host.nix +++ b/config/hosts/aspects/doloro-desktop/host.nix @@ -126,14 +126,14 @@ boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - services.scx = { - enable = true; - package = pkgs.scx.rustscheds; - }; - systemd.services.scx.environment = { - SCX_SCHEDULER_OVERRIDE = "scx_lavd"; - SCX_FLAGS_OVERRIDE = "--performance --no-core-compaction"; - }; + # services.scx = { + # enable = true; + # package = pkgs.scx.rustscheds; + # }; + # systemd.services.scx.environment = { + # SCX_SCHEDULER_OVERRIDE = "scx_lavd"; + # SCX_FLAGS_OVERRIDE = "--performance --no-core-compaction"; + # }; systemd.oomd = { enable = true; enableUserSlices = true; diff --git a/config/hosts/aspects/doloro-laptop/host.nix b/config/hosts/aspects/doloro-laptop/host.nix index 9649592..6b30e14 100644 --- a/config/hosts/aspects/doloro-laptop/host.nix +++ b/config/hosts/aspects/doloro-laptop/host.nix @@ -93,16 +93,22 @@ intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; }; hardware = { - # firmware = [ pkgs.intel-npu-driver ]; + # Qualcomm Adreno X1-85 (freedreno/turnip) + IRIS need the qcom + # firmware blobs (gen70500_sqe.fw / gmu.bin / zap.mbn). On most + # Snapdragon X laptops these must be extracted from Windows unless + # shipped by linux-firmware (e.g. ThinkPad T14s Gen 6). + firmware = [ pkgs.linux-firmware ]; graphics = { enable = true; + # Adreno has no userspace driver package to add here: GL/Vulkan + # (freedreno/turnip) come from mesa (auto-included), and IRIS video + # has no usable VA-API backend yet, so extraPackages stays empty. extraPackages = with pkgs; [ ]; }; }; - environment.sessionVariables = { - LIBVA_DRIVER_NAME = "iHD"; - }; # Force intel-media-driver + # NOTE: removed LIBVA_DRIVER_NAME="iHD" — that forces the Intel media + # driver and is wrong on Qualcomm Adreno (aarch64). # services.fwupd = { # enable = true; diff --git a/config/modules/helium.nix b/config/modules/helium.nix index 275f668..edfaa9a 100644 --- a/config/modules/helium.nix +++ b/config/modules/helium.nix @@ -43,7 +43,6 @@ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.vulkan-loader ]}" \ --add-flags "--enable-features=AcceleratedVideoDecodeLinuxGL,AcceleratedVideoDecodeLinuxZeroCopyGL,VaapiOnNvidiaGPUs,VaapiIgnoreDriverChecks" \ --add-flags "--ignore-gpu-blocklist" \ - --add-flags "--disable-gpu-sandbox" ''; }; in @@ -54,15 +53,15 @@ xdg.configFile."net.imput.helium/WidevineCdm/latest-component-updated-widevine-cdm" = { text = ''{"Path":"${pkgs.widevine-cdm}/share/google/chrome/WidevineCdm"}''; }; - wayland.windowManager.hyprland.extraLuaFiles = lib.mkIf settings.default { - "helium-bind.lua" = { - autoLoad = true; - content = '' - -- Helium launcher bind (lua config: settings.bind cannot express dispatchers) - hl.bind("SUPER + E", hl.dsp.exec_cmd("helium")) - ''; - }; - }; + wayland.windowManager.hyprland.extraLuaFiles = lib.mkIf settings.default { + "helium-bind.lua" = { + autoLoad = true; + content = '' + -- Helium launcher bind (lua config: settings.bind cannot express dispatchers) + hl.bind("SUPER + E", hl.dsp.exec_cmd("helium")) + ''; + }; + }; }; }; } diff --git a/config/modules/power-management/lavd.nix b/config/modules/power-management/lavd.nix index d92d90e..4476a8b 100644 --- a/config/modules/power-management/lavd.nix +++ b/config/modules/power-management/lavd.nix @@ -17,8 +17,8 @@ }; # Most energy efficent scheduler setup.. systemd.services.scx.environment = { - SCX_SCHEDULER_OVERRIDE = "scx_lavd"; - SCX_FLAGS_OVERRIDE = "--powersave --no-core-compaction"; + # SCX_SCHEDULER_OVERRIDE = "scx_lavd"; + # SCX_FLAGS_OVERRIDE = "--powersave --no-core-compaction"; }; }; }; diff --git a/config/modules/surface_patches.nix b/config/modules/surface_patches.nix index 1d15fc5..faad9ce 100644 --- a/config/modules/surface_patches.nix +++ b/config/modules/surface_patches.nix @@ -63,7 +63,7 @@ enable = false; }; video = { - enable = false; + enable = true; }; }; diff --git a/flake.lock b/flake.lock index a331b72..617dd65 100644 --- a/flake.lock +++ b/flake.lock @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1787379775, - "narHash": "sha256-XL2qfqmocfsvuEGyomZg4nOZfkuSe8vZtrOX99I+b6I=", + "lastModified": 1787487906, + "narHash": "sha256-zIdM+8teujHm5hc5MIPDnV7k2UeOOT/pFyFtWjOCwsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "ec1a8fdf74ed3f276148ee106299a2ba0e65d51f", + "rev": "cfba7ad5886b342b8dd63ba74354b3853ea4cfc9", "type": "github" }, "original": { @@ -590,11 +590,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1787414731, - "narHash": "sha256-2pNVmrgGHj32NCqgrPqhJAyRxavFYoNtklC5QAHkoT0=", + "lastModified": 1787505664, + "narHash": "sha256-ds9J1/RBDzgSFtb20+MbXS/v8xA7TLRh7YSnD6cWSgY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "6ffae9c5aa0381bf4b65f898fdfae6ac332ab057", + "rev": "951ab550e7ea050e4b871f99faf87d99c601c44a", "type": "github" }, "original": { @@ -988,11 +988,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1787421204, - "narHash": "sha256-8Tlb8D07EvNJ37S7wPYn/+lZ/eBRIvfLvrne3pvjd2A=", + "lastModified": 1787507561, + "narHash": "sha256-7Hydh9RTatdMOVKgHno3ELWgsda1zeklSMGVWJqMiWs=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "8b175fd266e94395ee7b1edc4578f7c8ecc74626", + "rev": "dbae8dc454556968710401643aa2c6867d166440", "type": "github" }, "original": { @@ -1153,11 +1153,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1787432083, - "narHash": "sha256-pPuywoFd2J2R1QByPIu1bwgCkWBkHp00qSEskUeifCY=", + "lastModified": 1787508648, + "narHash": "sha256-LQHsJp6rY6gIxEugrxup7mEF1AFBnFkVL9LN1YW/ajc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "14ccbf3f573231e80f55420ec4ab98cfe912a862", + "rev": "3016297dcfbe46f73f8b0add912d630ed274ffd2", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1786599213, - "narHash": "sha256-yjGG65gA1jORt0hWxjzrnw3AYkIn8EWolp8vezwXZ3I=", - "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", + "lastModified": 1787360063, + "narHash": "sha256-95aJfHyQTLWslCXFVNB0odgmVkpdmDezQwTg9mhqV1E=", + "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1053317.0e251e24a4f2/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1059570.2c423e03bbaf/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1355,11 +1355,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1787374233, - "narHash": "sha256-VZY8AkhbcDhxBSXsdUlHK7oS8ez5nJ2vzYzkkNI35ok=", + "lastModified": 1787441254, + "narHash": "sha256-/7oA/UPfrk0ubngvJjDleROuiNdA7y4d+5qNcDeQuCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "731960f9bf65e7df135092590b2aa2f1407dcf0f", + "rev": "ae9396d21aa0dcfe9419f6bdc3bf415eba30a8b7", "type": "github" }, "original": { @@ -1448,11 +1448,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1787396669, - "narHash": "sha256-jV+wLME1duPt7TLVwxOlb90pPAS/8C3Qw7tHO5eLNfs=", + "lastModified": 1787479506, + "narHash": "sha256-wuWHiNQAs4tc1jjc54qW0IinI6yFusn9KPSXFXWSON0=", "ref": "main", - "rev": "04f5476f40ebcda5aa03a4c12a1f5eb9f65f9c4d", - "revCount": 409, + "rev": "8e0ad9a407dbbb3942919a50834afa7c430cd78a", + "revCount": 415, "type": "git", "url": "https://git.molez.org/mandlm/omp-nix" }, @@ -1653,11 +1653,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1786855359, - "narHash": "sha256-yeKMWFCPeoIKmPBLLvP1/15ulOJO8i9ZIlSSXGuW6aw=", + "lastModified": 1787460061, + "narHash": "sha256-r2FJY01jRVhrZIKPdhQ3QFYsAz3wjilWTMSSH7VMOeo=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "0f478ff79b82abb785160cd4531293f61d21be86", + "rev": "a8adfd6f9f341dd586d5c06dda3bbfa21c6014e7", "type": "github" }, "original": {