From 8db14d0fa54f292b57344110567f8850047ac79c Mon Sep 17 00:00:00 2001
From: caem <me@caem.dev>
Date: Sun, 2 Mar 2025 22:13:55 +0100
Subject: [PATCH] firefox: Improve overlay

---
 modules/nixos/core/nix.nix                       | 4 +++-
 overlays/nixpak/{firefox.nix => firefox-esr.nix} | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename overlays/nixpak/{firefox.nix => firefox-esr.nix} (95%)

diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix
index 1bbecfa..1d828d0 100644
--- a/modules/nixos/core/nix.nix
+++ b/modules/nixos/core/nix.nix
@@ -2,7 +2,9 @@
 
 let
   importOverlays = builtins.map
-    (overlay: import overlay { inherit lib inputs pkgs cfgPath; })
+    (overlay: import overlay {
+      inherit cfgPath lib inputs;
+    })
     (builtins.filter 
       (file: builtins.match ".*\.nix" (builtins.toString file) != null)
       (lib.filesystem.listFilesRecursive "${cfgPath}/overlays"));
diff --git a/overlays/nixpak/firefox.nix b/overlays/nixpak/firefox-esr.nix
similarity index 95%
rename from overlays/nixpak/firefox.nix
rename to overlays/nixpak/firefox-esr.nix
index 585ff35..bd23c01 100644
--- a/overlays/nixpak/firefox.nix
+++ b/overlays/nixpak/firefox-esr.nix
@@ -22,7 +22,7 @@
       config = { sloth, ... }: {
         app.package = intermediary-firefox-esr;
         app.binPath = "bin/firefox-esr";
-        flatpak.appId = "org.mozilla.firefox";
+        flatpak.appId = "org.mozilla.firefox-esr";
 
         dbus.policies = {
           "org.a11y.Bus" = "talk";
@@ -77,6 +77,8 @@
             (sloth.concat' sloth.xdgConfigHome "/gtk-3.0")
             (sloth.concat' sloth.xdgConfigHome "/gtk-4.0")
             (sloth.concat' sloth.xdgConfigHome "/dconf")
+            "/run/current-system/sw/share/icons"
+            "/run/current-system/sw/share/themes"
           ];
 
           sockets = {