From b2101de0f894ef8bc09d980840f9a7ab2dfabd97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 11 Jan 2026 09:43:50 +0100 Subject: [PATCH] treewide: drop 23.11 compat code --- asus/zephyrus/ga402x/shared.nix | 9 --------- gpd/pocket-3/default.nix | 7 +------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/asus/zephyrus/ga402x/shared.nix b/asus/zephyrus/ga402x/shared.nix index bd0eda3..36b39dd 100644 --- a/asus/zephyrus/ga402x/shared.nix +++ b/asus/zephyrus/ga402x/shared.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: @@ -11,9 +10,7 @@ let mkEnableOption mkIf mkMerge - version versionAtLeast - versionOlder ; cfg = config.hardware.asus.zephyrus.ga402x; @@ -94,12 +91,6 @@ in ''; }) - (mkIf (versionOlder version "23.11") { - # See https://asus-linux.org/wiki/nixos/ for info about some problems - # detecting the dGPU: - systemd.services.supergfxd.path = [ pkgs.pciutils ]; - }) - (mkIf (config.networking.wireless.iwd.enable && config.networking.wireless.scanOnLowSignal) { # Meditek doesn't seem to be quite sensitive enough on the default roaming settings: # https://wiki.archlinux.org/title/Wpa_supplicant#Roaming diff --git a/gpd/pocket-3/default.nix b/gpd/pocket-3/default.nix index 2afbdcf..4fe2652 100644 --- a/gpd/pocket-3/default.nix +++ b/gpd/pocket-3/default.nix @@ -22,12 +22,7 @@ in boot.initrd.kernelModules = [ "i915" ]; # Early loading so the passphrase prompt appears on external displays hardware.graphics.extraPackages = with pkgs; [ intel-media-driver - ( - if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then - vaapiIntel - else - intel-vaapi-driver - ) + intel-vaapi-driver ]; boot.kernelParams = [