From 29b799da7c13bfb9a858b65142830dbf9e4b9c05 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Thu, 11 May 2023 19:12:32 +0200
Subject: [PATCH] [Desktop/Browser+Gnome+Plasma] use config overrides for
 firefox instead of overriding package directly

---
 desktop/gnome.nix  | 6 ++++--
 desktop/plasma.nix | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/desktop/gnome.nix b/desktop/gnome.nix
index a46805a..509a38e 100644
--- a/desktop/gnome.nix
+++ b/desktop/gnome.nix
@@ -38,13 +38,15 @@ in {
           "gphhapmejobijbbhgpjhcjognlahblep" # Gnome Shell integration
         ];
 
+        aviallon.desktop.browser.firefox.overrides.enableGnomeExtensions = true;
+
         environment.systemPackages = with pkgs; []
           ++ [
             guake
 
             libreoffice-fresh
-
-            (myFirefox.override { enableGnomeExtensions = true; })
+            
+            myFirefox
           ]
           ++ (with gnome; [
             gnome-software
diff --git a/desktop/plasma.nix b/desktop/plasma.nix
index fad6c57..6a3bcb8 100644
--- a/desktop/plasma.nix
+++ b/desktop/plasma.nix
@@ -74,9 +74,11 @@ in {
 
       libreoffice-qt
 
-      (myFirefox.override { enablePlasmaBrowserIntegration = true; })
+      myFirefox
     ];
 
+    aviallon.desktop.browser.firefox.overrides.enablePlasmaBrowserIntegration = true;
+
     environment.profileRelativeSessionVariables = {
       QT_PLUGIN_PATH = mkForce []; # Remove as it causes many issues when pulling one package from nixos-unstable
     };