From 663668b584afa63c6dd1d4017cec56a6765946c6 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Fri, 28 Feb 2025 16:21:34 +0000
Subject: [PATCH] Fix firefox

---
 .../firefox/{nord.css => colors/black.css}         |  4 ----
 modules/common-desktop/firefox/default.nix         | 14 ++++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename modules/common-desktop/firefox/{nord.css => colors/black.css} (96%)

diff --git a/modules/common-desktop/firefox/nord.css b/modules/common-desktop/firefox/colors/black.css
similarity index 96%
rename from modules/common-desktop/firefox/nord.css
rename to modules/common-desktop/firefox/colors/black.css
index c2dab12..0760c97 100644
--- a/modules/common-desktop/firefox/nord.css
+++ b/modules/common-desktop/firefox/colors/black.css
@@ -1,9 +1,5 @@
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* Variables that start with --gnome- are added by me and are assigned
- * to elements somewhere in this code. The rest of the variables are
- * built-in in Firefox, so you need to add an !important if you wanna
- * override them. */
 @media (prefers-color-scheme: dark) {
     :root {
         /* Browser area before a page starts loading */
diff --git a/modules/common-desktop/firefox/default.nix b/modules/common-desktop/firefox/default.nix
index 31f3aa9..2bf5a13 100644
--- a/modules/common-desktop/firefox/default.nix
+++ b/modules/common-desktop/firefox/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
+  pkgs,
   inputs,
-  self,
   ...
 }: {
   # From https://hedgedoc.grimmauld.de/s/rVnTq0-Rs
@@ -29,11 +29,12 @@
     });
   });
 
-  systemd.tmpfiles.settings.firefox = {
-    "/home/quadradical/.mozilla/firefox/quadradical/chrome"."D".user = "quadradical";
-    "/home/quadradical/.mozilla/firefox/quadradical/chrome/userChrome.css"."f+".argument = "@import '${self}/nord.css';@import '${inputs.firefox-gnome-theme}/userChrome.css';";
-    "/home/quadradical/.mozilla/firefox/quadradical/chrome/userContent.css"."f+".argument = "@import '${inputs.firefox-gnome-theme}/userContent.css'";
-  };
+  systemd.tmpfiles.settings.firefox."/home/quadradical/.mozilla/firefox/quadradical/chrome"."L+".argument =
+    toString
+    (pkgs.symlinkJoin {
+      name = "firefox-gnome-theme";
+      paths = [./. inputs.firefox-gnome-theme];
+    });
 
   programs.firefox = {
     enable = true;
@@ -133,6 +134,7 @@
       };
 
       Preferences = {
+        "gnomeTheme.oledBlack" = true; # Enable nord theme
         "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
         "browser.uiCustomization.state" = "{\"placements\":{\"widget-overflow-fixed-list\":[],\"unified-extensions-area\":[],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"save-to-pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"nav-bar\",\"PersonalToolbar\",\"toolbar-menubar\",\"TabsToolbar\"],\"currentVersion\":19}";
       };