From 5cd9d98ac528186f0caad2f3eeef22ccba35ea58 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Tue, 30 Jul 2024 18:20:48 +0200
Subject: [PATCH] =?UTF-8?q?Enable=20compatibility=20with=20NixOS=20<?=
 =?UTF-8?q?=E2=80=AF24.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firefox.nix |  7 ++++++-
 home.nix    |  2 +-
 module.nix  | 12 ++++++++----
 wayland.nix |  7 ++++++-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/firefox.nix b/firefox.nix
index ff1033f..086c185 100644
--- a/firefox.nix
+++ b/firefox.nix
@@ -7,7 +7,12 @@ let
     sparseCheckout = [ "!/*" "/chrome" "/content" ];
     hash = lib.fakeHash;
   };
-in lib.mkIf osConfig.hardware.graphics.enable {
+
+  graphical =
+    if lib.versionAtLeast osConfig.system.stateVersion "24.11"
+    then osConfig.hardware.graphics.enable
+    else osConfig.hardware.opengl.enable;
+in lib.mkIf graphical {
   programs.firefox = {
     enable = true;
     package = pkgs.firefox;
diff --git a/home.nix b/home.nix
index 6a4be63..e5ced31 100644
--- a/home.nix
+++ b/home.nix
@@ -306,7 +306,7 @@ inputs: { config, lib, pkgs, osConfig, ... }: {
     enable = osConfig.hardware.gpgSmartcards.enable;
     enableSshSupport = true;
     pinentryPackage =
-      if osConfig.hardware.graphics.enable
+      if osConfig.hardware.graphics.enable or osConfig.hardware.opengl.enable
       then pkgs.pinentry-gtk2
       else pkgs.pinentry-curses;
   };
diff --git a/module.nix b/module.nix
index 6ca2d34..84395db 100644
--- a/module.nix
+++ b/module.nix
@@ -1,10 +1,14 @@
-inputs: user: { config, lib, pkgs, ... }: {
+inputs: user: { config, lib, pkgs, ... }:
+let
+  graphical =
+    if lib.versionAtLeast config.system.stateVersion "24.11"
+    then config.hardware.graphics.enable
+    else config.hardware.opengl.enable;
+in {
   imports = [ inputs.home-manager.nixosModules.home-manager ];
 
   environment.etc."xkb/symbols/greedy" =
-    lib.mkIf config.hardware.graphics.enable {
-      source = ./greedy.xkb;
-    };
+    lib.mkIf graphical { source = ./greedy.xkb; };
 
   home-manager = {
     useUserPackages = lib.mkDefault true;
diff --git a/wayland.nix b/wayland.nix
index d16096f..f677fbc 100644
--- a/wayland.nix
+++ b/wayland.nix
@@ -19,7 +19,12 @@ let
     wpctl = "${osConfig.services.pipewire.wireplumber.package}/bin/wpctl";
     xdg-open = "${pkgs.xdg-utils}/bin/xdg-open";
   };
-in lib.mkIf osConfig.hardware.graphics.enable {
+
+  graphical =
+    if lib.versionAtLeast osConfig.system.stateVersion "24.11"
+    then osConfig.hardware.graphics.enable
+    else osConfig.hardware.opengl.enable;
+in lib.mkIf graphical {
   home.packages = with pkgs; [
     # Image processing
     oxipng