2024-11-17 HEAD master

1 files changed, 6 insertions, 23 deletions

diff --git a/modules/firefox/default.nix b/modules/firefox/default.nix
index 51e464f..c207930 100644
--- a/modules/firefox/default.nix
+++ b/modules/firefox/default.nix
@@ -41,28 +41,6 @@ in
             mkCssWithRoot =
               css:
               mkMerge [
-                # https://github.com/tinted-theming/base24/blob/master/styling.md
-                (with config.colors.withHashtag; ''
-                  :root {
-                    --black: ${base01};
-                    --red: ${base08};
-                    --green: ${base0B};
-                    --yellow: ${base09};
-                    --blue: ${base0D};
-                    --magenta: ${base0E};
-                    --cyan: ${base0C};
-                    --white: ${base06};
-                    --bright-black: ${base02};
-                    --bright-red: ${base12};
-                    --bright-green: ${base14};
-                    --bright-yellow: ${base13};
-                    --bright-blue: ${base16};
-                    --bright-magenta: ${base17};
-                    --bright-cyan: ${base15};
-                    --bright-white: ${base07};
-                    --background: ${base00};
-                    --foreground: ${base05};
-                '')
                 (
                   let
                     mapFonts = concatMapStringsSep ", " (font: ''"${font}"'');
@@ -70,6 +48,7 @@ in
                   in
                   with config.fonts.fontconfig.defaultFonts;
                   ''
+                    :root {
                       --serif-font-family: ${mapFonts serif}, serif;
                       --serif-font-size: ${size};
                       --sans-serif-font-family: ${mapFonts sansSerif}, sans-serif;
@@ -124,7 +103,6 @@ in
               with addons;
               [
                 consent-o-matic
-                darkreader
                 furiganaize
                 languagetool
                 metamask
@@ -422,6 +400,10 @@ in
                 name = "Bookmarks Toolbar";
                 toolbar = true;
                 bookmarks = with config.nixfiles.modules; [
+                  {
+                    name = "XUL";
+                    url = "chrome://browser/content/browser.xhtml";
+                  }
                   (mkIf syncthing.enable {
                     name = "Syncthing";
                     url = "http://${config.services.syncthing.guiAddress}";
@@ -530,6 +512,7 @@ in
               "browser.tabs.warnOnClose" = false;
               "browser.tabs.warnOnCloseOtherTabs" = false;
               "browser.tabs.warnOnOpen" = false;
+              "browser.theme.dark-private-windows" = false;
               "browser.toolbars.bookmarks.visibility" = "newtab";
               "browser.translations.enable" = false;
               "browser.urlbar.decodeURLsOnCopy" = true;