home: firefox: treestyletabs: fix colors

4 files changed, 11 insertions, 18 deletions

diff --git a/modules/home-manager/personal/programs/firefox/default.nix b/modules/home-manager/personal/programs/firefox/default.nix
index 8b38450..43e6070 100644
--- a/modules/home-manager/personal/programs/firefox/default.nix
+++ b/modules/home-manager/personal/programs/firefox/default.nix
@@ -12,17 +12,17 @@ with lib; let
   };
   engines = import ./engines.nix {inherit lib pkgs;};
   userchrome = let
-    userchromeTST = ./userchrome/treestyletabs.css;
-    userchromeTSTColors = config.lib.stylix.colors {
-      template = builtins.readFile ./userchrome/treestyletabs-colors.css;
+    userchromeTSTout = ./userchrome/treestyletabs-outer.css;
+    userchromeTSTin = config.lib.stylix.colors {
+      template = builtins.readFile ./userchrome/treestyletabs-inner.css;
       extension = ".css";
     };
   in
     ''
-      @import "${userchromeTST}";
+      @import "${userchromeTSTout}";
     ''
     + lib.optionalString (config.lib ? stylix) ''
-      @import "${userchromeTSTColors}";
+      // @import "${userchromeTSTin}";
     '';
   webappsWithIds =
     (builtins.foldl' ({
diff --git a/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs-colors.css b/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs-colors.css
deleted file mode 100644
index e11c8f8..0000000
--- a/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs-colors.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Not working. Paste this inside TST's extra CSS rules. */
-@-moz-document regexp("moz-extension://.+/sidebar/sidebar.html.*") {
-/* Apply system-wide theme */
-:root {
-    --tab-surface-active: rgb( {{base02-rgb-r}}, {{base02-rgb-g}}, {{base02-rgb-b}}, 50%);
-    --tab-text-active: #{{base05-hex}};
-    --tab-surface-regular: #{{base00-hex}};
-    --tab-text-regular: #{{base05-hex}};
-    --tab-surface-hover: rgb( {{base02-rgb-r}}, {{base02-rgb-g}}, {{base02-rgb-b}}, 50%);
-    --tab-surface-active-hover: rgb( {{base02-rgb-r}}, {{base02-rgb-g}}, {{base02-rgb-b}}, 50%);
-    --tab-border: #{{base00-hex}};
-}
-}
diff --git a/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs-inner.css b/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs-inner.css
new file mode 100644
index 0000000..f6fca37
--- /dev/null
+++ b/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs-inner.css
@@ -0,0 +1,6 @@
+/* Not working. Paste this inside TST's extra CSS rules. */
+@-moz-document regexp("moz-extension://.+/sidebar/sidebar.html.*") {
+    :root.sidebar #background {
+        background: #{{base00-hex}};
+    }
+}
diff --git a/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs.css b/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs-outer.css
index bee1acf..bee1acf 100644
--- a/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs.css
+++ b/modules/home-manager/personal/programs/firefox/userchrome/treestyletabs-outer.css