From 5a5b183373c3732d96bb834b3ba0fcf2e88e590f Mon Sep 17 00:00:00 2001
From: Collin Williams <96917990+bluedragon1221@users.noreply.github.com>
Date: Fri, 19 Dec 2025 15:18:07 -0600
Subject: various changes

---
 modules/desktop/hjem/programs/firefox.nix  | 37 ++++++++++++++++++------------
 modules/desktop/nixos/programs/firefox.nix |  6 ++++-
 2 files changed, 27 insertions(+), 16 deletions(-)

(limited to 'modules/desktop')

diff --git a/modules/desktop/hjem/programs/firefox.nix b/modules/desktop/hjem/programs/firefox.nix
index cb0794f..b5ea433 100644
--- a/modules/desktop/hjem/programs/firefox.nix
+++ b/modules/desktop/hjem/programs/firefox.nix
@@ -27,23 +27,30 @@ in
         };
       };
 
-      ".mozilla/firefox/collin/chrome/userChrome.css".text = mkCssHacks [
-        # Tabs
-        "hide_tabs_with_one_tab"
-        "tabs_on_bottom_v2"
-        "tab_close_button_always_on_hover"
-        "tabs_fill_available_width"
+      ".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"
 
-        # 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];
diff --git a/modules/desktop/nixos/programs/firefox.nix b/modules/desktop/nixos/programs/firefox.nix
index be5c2cf..29ef8cb 100644
--- a/modules/desktop/nixos/programs/firefox.nix
+++ b/modules/desktop/nixos/programs/firefox.nix
@@ -27,7 +27,11 @@ in
           };
         in {
           "toolkit.legacyUserProfileCustomizations.stylesheets" = opt true;
-          "browser.tabs.inTitlebar" = opt 0;
+          "browser.tabs.inTitlebar" = opt (
+            if cfg.theme == "catppuccin"
+            then 0
+            else 1
+          );
           "browser.tabs.hoverPreview.enabled" = opt 0;
 
           "browser.tabs.loadBookmarksInTabs" = opt true;
-- 
cgit v1.3.1