From 639ca38126485ec676938935e8e91736405742bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 11 Jan 2026 09:40:29 +0100
Subject: [PATCH] treewide: drop 25.05 compat code

---
 apple/t2/default.nix                   | 14 +++----------
 lenovo/thinkpad/z/gen2/z13/default.nix |  9 ++++----
 purism/librem/5r4/audio.nix            | 29 ++++++++------------------
 3 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/apple/t2/default.nix b/apple/t2/default.nix
index 825a181..6dc9254 100644
--- a/apple/t2/default.nix
+++ b/apple/t2/default.nix
@@ -7,7 +7,6 @@
 
 let
   inherit (lib) types;
-  nixosVersion = lib.versions.majorMinor lib.version;
 
   audioFiles = pkgs.fetchFromGitHub {
     owner = "kekrby";
@@ -106,16 +105,9 @@ in
       powerManagement.enable = true;
     }
 
-    (
-      if lib.versionAtLeast nixosVersion "25.05" then
-        {
-          services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
-        }
-      else
-        {
-          hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
-        }
-    )
+    {
+      services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
+    }
 
     (lib.mkIf t2Cfg.enableIGPU {
       # Enable the iGPU by default if present
diff --git a/lenovo/thinkpad/z/gen2/z13/default.nix b/lenovo/thinkpad/z/gen2/z13/default.nix
index 2f68821..9423256 100644
--- a/lenovo/thinkpad/z/gen2/z13/default.nix
+++ b/lenovo/thinkpad/z/gen2/z13/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
@@ -14,8 +14,7 @@
         path = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/${id}";
       };
     in
-    if lib.versionOlder lib.version "25.05pre" then
-      { networkmanager.fccUnlockScripts = [ fcc_unlock_script ]; }
-    else
-      { modemmanager.fccUnlockScripts = [ fcc_unlock_script ]; };
+    {
+      modemmanager.fccUnlockScripts = [ fcc_unlock_script ];
+    };
 }
diff --git a/purism/librem/5r4/audio.nix b/purism/librem/5r4/audio.nix
index 9c49fa7..2ca23d4 100644
--- a/purism/librem/5r4/audio.nix
+++ b/purism/librem/5r4/audio.nix
@@ -19,25 +19,14 @@
           '';
         };
       in
-      if lib.versionOlder (lib.versions.majorMinor lib.version) "25.05" then
-        {
-          assertions = [
-            {
-              assertion = config.hardware.pulseaudio.enable;
-              message = "Call audio on Librem5 requires pulse audio to be enabled through `hardware.pulseaudio.enable`.";
-            }
-          ];
-          hardware.pulseaudio = paConfig;
-        }
-      else
-        {
-          assertions = [
-            {
-              assertion = config.services.pulseaudio.enable;
-              message = "Call audio on Librem5 requires pulse audio to be enabled through `services.pulseaudio.enable`.";
-            }
-          ];
-          services.pulseaudio = paConfig;
-        }
+      {
+        assertions = [
+          {
+            assertion = config.services.pulseaudio.enable;
+            message = "Call audio on Librem5 requires pulse audio to be enabled through `services.pulseaudio.enable`.";
+          }
+        ];
+        services.pulseaudio = paConfig;
+      }
     );
 }