From e446394b832b6534667850d54ed2bef812f05ce6 Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Sun, 24 Aug 2025 16:24:56 +0200
Subject: [PATCH] chore(firefox): use regular nixgl wrapper

And remove `enableNixGL` configuration in related home configurations
---
 hosts/rick/home-config.nix                   |  1 -
 hosts/work/home-config.nix                   |  1 -
 modules/home-manager/web/firefox/default.nix | 27 ++------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/hosts/rick/home-config.nix b/hosts/rick/home-config.nix
index 5a6295c..1be34e0 100644
--- a/hosts/rick/home-config.nix
+++ b/hosts/rick/home-config.nix
@@ -26,7 +26,6 @@
     };
     web.firefox = {
       enable = true;
-      enableNixGL = true;
     };
     web.qutebrowser = {
       enable = true;
diff --git a/hosts/work/home-config.nix b/hosts/work/home-config.nix
index 0712e15..d089233 100644
--- a/hosts/work/home-config.nix
+++ b/hosts/work/home-config.nix
@@ -35,7 +35,6 @@
     };
     web.firefox = {
       enable = true;
-      enableNixGL = true;
       optionalExtensions = with pkgs.nur.repos.rycee.firefox-addons; [
         okta-browser-plugin
       ];
diff --git a/modules/home-manager/web/firefox/default.nix b/modules/home-manager/web/firefox/default.nix
index 191bdae..d52f8a9 100644
--- a/modules/home-manager/web/firefox/default.nix
+++ b/modules/home-manager/web/firefox/default.nix
@@ -29,11 +29,6 @@ in
       description = "Optional Firefox Plugins to install";
     };
 
-    enableNixGL = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Use NixGL to start Firefox";
-    };
   };
   config = mkIf cfg.enable {
     programs.browserpass = {
@@ -47,24 +42,6 @@ in
       "x-scheme-handler/about" = "firefox.desktop";
       "x-scheme-handler/unknown" = "firefox.desktop";
     };
-    xdg.desktopEntries."firefox" = mkIf cfg.enableNixGL {
-      name = "Firefox NixGL Powered";
-      exec = "${pkgs.nixgl.nixGLMesa}/bin/nixGLMesa firefox %U";
-      icon = "firefox";
-      terminal = false;
-      type = "Application";
-      startupNotify = true;
-      actions = {
-        "new-private-window" = {
-          exec = "${pkgs.nixgl.nixGLMesa}/bin/nixGLMesa firefox --private-window %U";
-          name = "New Private Window";
-        };
-        "new-window" = {
-          exec = "${pkgs.nixgl.nixGLMesa}/bin/nixGLMesa firefox --new-window %U";
-          name = "New Window";
-        };
-      };
-    };
 
     xdg.configFile."tridactyl/tridactylrc".text = ''
       sanitize tridactyllocal tridactylsync
@@ -93,13 +70,13 @@ in
         allExtensions = cfg.baseExtensions ++ cfg.optionalExtensions;
     in {
       enable = true;
-      package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
+      package = config.lib.nixGL.wrap ( pkgs.wrapFirefox pkgs.firefox-unwrapped {
         nativeMessagingHosts = [
           # Tridactyl native connector
           pkgs.tridactyl-native
           pkgs.browserpass
         ];
-      };
+      });
       profiles.ephase = {
         id = 0;
         name = "ephase";