From 8781e10a1cc143b55e7c63380afe2535de4be632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 11 Jan 2026 01:05:37 +0100
Subject: [PATCH] treewide: drop 24.05 compat

---
 apple/macbook-pro/10-1/default.nix    |  1 -
 apple/macmini/4/default.nix           |  1 -
 common/gpu/24.05-compat.nix           | 24 ------------------------
 common/gpu/amd/default.nix            |  1 -
 common/gpu/intel/default.nix          |  2 --
 common/gpu/nvidia/default.nix         |  1 -
 gpd/pocket-3/default.nix              |  3 +--
 lenovo/thinkpad/p1/3th-gen/nvidia.nix |  3 ---
 lenovo/thinkpad/p51/default.nix       |  1 -
 lenovo/thinkpad/p52/default.nix       |  1 -
 10 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 common/gpu/24.05-compat.nix

diff --git a/apple/macbook-pro/10-1/default.nix b/apple/macbook-pro/10-1/default.nix
index 8967b1c..660f648 100644
--- a/apple/macbook-pro/10-1/default.nix
+++ b/apple/macbook-pro/10-1/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ../.
     ../../../common/pc/ssd
-    ../../../common/gpu/24.05-compat.nix
     ../../../common/gpu/nvidia/kepler
   ];
 
diff --git a/apple/macmini/4/default.nix b/apple/macmini/4/default.nix
index fd6d9c9..86210c4 100644
--- a/apple/macmini/4/default.nix
+++ b/apple/macmini/4/default.nix
@@ -8,7 +8,6 @@ in
 {
   imports = [
     ../.
-    ../../../common/gpu/24.05-compat.nix
   ];
 
   services.xserver.videoDrivers = mkDefault [ "nvidiaLegacy340" ];
diff --git a/common/gpu/24.05-compat.nix b/common/gpu/24.05-compat.nix
deleted file mode 100644
index bcccd2c..0000000
--- a/common/gpu/24.05-compat.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  lib,
-  ...
-}:
-{
-  # Backward-compat for 24.05, can be removed after we drop 24.05 support
-  imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [
-    (lib.mkAliasOptionModule [ "hardware" "graphics" "enable" ] [ "hardware" "opengl" "enable" ])
-    (lib.mkAliasOptionModule
-      [ "hardware" "graphics" "extraPackages" ]
-      [ "hardware" "opengl" "extraPackages" ]
-    )
-    (lib.mkAliasOptionModule
-      [ "hardware" "graphics" "extraPackages32" ]
-      [ "hardware" "opengl" "extraPackages32" ]
-    )
-    (lib.mkAliasOptionModule
-      [ "hardware" "graphics" "enable32Bit" ]
-      [ "hardware" "opengl" "driSupport32Bit" ]
-    )
-    (lib.mkAliasOptionModule [ "hardware" "graphics" "package" ] [ "hardware" "opengl" "package" ])
-    (lib.mkAliasOptionModule [ "hardware" "graphics" "package32" ] [ "hardware" "opengl" "package32" ])
-  ];
-}
diff --git a/common/gpu/amd/default.nix b/common/gpu/amd/default.nix
index 5373004..f6903d9 100644
--- a/common/gpu/amd/default.nix
+++ b/common/gpu/amd/default.nix
@@ -1,7 +1,6 @@
 { lib, ... }:
 
 {
-  imports = [ ../24.05-compat.nix ];
   config = {
     services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];
 
diff --git a/common/gpu/intel/default.nix b/common/gpu/intel/default.nix
index 0c5e346..51a8cfc 100644
--- a/common/gpu/intel/default.nix
+++ b/common/gpu/intel/default.nix
@@ -5,8 +5,6 @@
   ...
 }:
 {
-  imports = [ ../24.05-compat.nix ];
-
   options.hardware.intelgpu = {
     driver = lib.mkOption {
       description = "Intel GPU driver to use";
diff --git a/common/gpu/nvidia/default.nix b/common/gpu/nvidia/default.nix
index 281e33f..2f58353 100644
--- a/common/gpu/nvidia/default.nix
+++ b/common/gpu/nvidia/default.nix
@@ -1,6 +1,5 @@
 { lib, ... }:
 
 {
-  imports = [ ../24.05-compat.nix ];
   services.xserver.videoDrivers = lib.mkDefault [ "nvidia" ];
 }
diff --git a/gpd/pocket-3/default.nix b/gpd/pocket-3/default.nix
index 4fe2652..6803c32 100644
--- a/gpd/pocket-3/default.nix
+++ b/gpd/pocket-3/default.nix
@@ -1,13 +1,12 @@
 { lib, pkgs, ... }:
 let
-  inherit (lib) mkDefault mkIf;
+  inherit (lib) mkDefault;
 in
 {
   imports = [
     ../../common/pc/laptop
     ../../common/pc/ssd
     ../../common/hidpi.nix
-    ../../common/gpu/24.05-compat.nix
   ];
 
   # Necessary kernel modules
diff --git a/lenovo/thinkpad/p1/3th-gen/nvidia.nix b/lenovo/thinkpad/p1/3th-gen/nvidia.nix
index ae19167..6f939e9 100644
--- a/lenovo/thinkpad/p1/3th-gen/nvidia.nix
+++ b/lenovo/thinkpad/p1/3th-gen/nvidia.nix
@@ -1,8 +1,5 @@
 { lib, ... }:
 {
-  imports = [
-    ../../../../common/gpu/24.05-compat.nix
-  ];
   hardware = {
     graphics = {
       enable = lib.mkDefault true;
diff --git a/lenovo/thinkpad/p51/default.nix b/lenovo/thinkpad/p51/default.nix
index da133e4..a286f48 100644
--- a/lenovo/thinkpad/p51/default.nix
+++ b/lenovo/thinkpad/p51/default.nix
@@ -1,7 +1,6 @@
 { config, lib, ... }:
 {
   imports = [
-    ../../../common/gpu/24.05-compat.nix
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/maxwell
     ../../../common/cpu/intel/kaby-lake
diff --git a/lenovo/thinkpad/p52/default.nix b/lenovo/thinkpad/p52/default.nix
index fc8811f..c8b2db4 100644
--- a/lenovo/thinkpad/p52/default.nix
+++ b/lenovo/thinkpad/p52/default.nix
@@ -1,7 +1,6 @@
 { lib, config, ... }:
 {
   imports = [
-    ../../../common/gpu/24.05-compat.nix
     ../../../common/gpu/nvidia/prime.nix
     ../../../common/gpu/nvidia/pascal
     ../../../common/cpu/intel