group mercury cleanup and firefox config updates

1 files changed, 32 insertions, 24 deletions

diff --git a/modules/desktop/hjem/programs/firefox.nix b/modules/desktop/hjem/programs/firefox.nix
index 2078e3c..46d2dd5 100644
--- a/modules/desktop/hjem/programs/firefox.nix
+++ b/modules/desktop/hjem/programs/firefox.nix
@@ -8,10 +8,12 @@
   cfg = config.collinux.desktop.programs.firefox;
 
   mkCssHacks = hacks: hacks |> map (f: ''@import "${inputs.firefox-csshacks}/chrome/${f}.css";'') |> lib.concatStringsSep "\n";
+
+  profileDir = ".config/mozilla/firefox/collin";
 in
   lib.mkIf cfg.enable {
     files = {
-      ".mozilla/firefox/profiles.ini" = {
+      ".config/mozilla/firefox/profiles.ini" = {
         generator = lib.generators.toINI {};
         value = {
           Profile0 = {
@@ -27,32 +29,38 @@ in
         };
       };
 
-      ".mozilla/firefox/collin/user.js".source = "${inputs.betterfox}/user.js";
+      "${profileDir}/user.js".source = "${inputs.betterfox}/user.js";
+
+      "${profileDir}/chrome/utils".source = "${inputs.fx-autoconfig}/profile/chrome/utils";
+
+      "${profileDir}/chrome/JS/test.uc.js".source = "${inputs.fx-autoconfig}/profile/chrome/JS/test.uc.js";
+
+      "${profileDir}/chrome/JS/aboutUserChrome.sys.mjs".source = "${inputs.uc-css-js}/JS/aboutUserChrome.sys.mjs";
+      "${profileDir}/chrome/resources/aboutuserchrome".source = "${inputs.uc-css-js}/resources/aboutuserchrome";
+
+      "${profileDir}/chrome/JS/appMenuMods.uc.js".source = "${inputs.uc-css-js}/JS/appMenuMods.uc.js";
 
-      ".mozilla/firefox/collin/chrome/userChrome.css".text = mkCssHacks (
-        # (lib.optional (cfg.theme == "adwaita") "window_control_placeholder_support") ++
-        [
-          # Tabs
-          (
-            if cfg.theme == "catppuccin"
-            then "hide_tabs_with_one_tab"
-            else "hide_tabs_with_one_tab_w_window_controls"
-          )
-          "tabs_on_bottom_v2"
-          "tab_close_button_always_on_hover"
-          "tabs_fill_available_width"
+      "${profileDir}/chrome/userChrome.css".text = mkCssHacks [
+        # Tabs
+        (
+          if cfg.theme == "catppuccin"
+          then "hide_tabs_with_one_tab"
+          else "hide_tabs_with_one_tab_w_window_controls"
+        )
+        "tabs_on_bottom_v2"
+        "tab_close_button_always_on_hover"
+        "tabs_fill_available_width"
 
-          # Icons!
-          "iconized_main_menu"
-          "iconized_menubar_items"
-          "iconized_places_context_menu"
-          "iconized_tabs_context_menu"
-          "icon_only_context_menu_text_controls"
+        # Icons!
+        "iconized_main_menu"
+        # "iconized_menubar_items"
+        "iconized_places_context_menu"
+        "iconized_tabs_context_menu"
+        "icon_only_context_menu_text_controls"
 
-          # Other
-          "compact_extensions_panel"
-        ]
-      );
+        # Other
+        "compact_extensions_panel"
+      ];
     };
 
     packages = [pkgs.firefox];