From 8261a99f2a3839f4b4b4b0e9aaa911374f056e7e Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Sun, 16 Apr 2023 16:10:27 +0200
Subject: [PATCH] Fix belgian-eid integration with Firefox

---
 modules/desktop/default.nix      |  1 -
 modules/services/belgian-eid.nix | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 5441b58..f4002e9 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -121,7 +121,6 @@ in {
           xclip
           odt2txt
 
-          firefox
           brave
           keepassxc
           krita
diff --git a/modules/services/belgian-eid.nix b/modules/services/belgian-eid.nix
index 7c71851..23956ce 100644
--- a/modules/services/belgian-eid.nix
+++ b/modules/services/belgian-eid.nix
@@ -9,14 +9,11 @@ in {
 
   config = mkIf cfg.enable {
 
-    nixpkgs.overlays = [
-      (final: prev: {
-        firefox = prev.firefox.override { pkcs11Modules = [ prev.eid-mw ]; };
-      })
-    ];
-
     services.pcscd.enable = true;
 
-    environment.systemPackages = with pkgs.unstable; [ eid-mw ];
+    environment.systemPackages = with pkgs.unstable; [
+      (firefox.override { pkcs11Modules = [ eid-mw ]; })
+      eid-mw
+    ];
   };
 }