From cedeb5210300c8b7fa77c5fe30bc951e032806f6 Mon Sep 17 00:00:00 2001
From: ooks-io <ooks@protonmail.com>
Date: Fri, 2 Aug 2024 22:23:05 +1200
Subject: [PATCH] fix(home:firefox) use correct option

---
 .../desktop/browser/firefox/default.nix       |   4 +-
 .../browser/firefox/settings/ooksJs.nix       |   2 +-
 .../desktop/browser/firefox/theme/ooksfox.nix | 313 +++++++++---------
 3 files changed, 159 insertions(+), 160 deletions(-)

diff --git a/home/modules/desktop/browser/firefox/default.nix b/home/modules/desktop/browser/firefox/default.nix
index b7c0bcc..cc395d7 100644
--- a/home/modules/desktop/browser/firefox/default.nix
+++ b/home/modules/desktop/browser/firefox/default.nix
@@ -7,6 +7,8 @@
   ...
 }: let
   inherit (lib) mkIf mkMerge;
+  fonts = config.ooknet.fonts;
+  palette = config.colorscheme.palette;
 
   addons = inputs.firefox-addons.packages.${pkgs.system};
   cfg = config.ooknet.browser.firefox;
@@ -44,7 +46,7 @@ in {
             # onepassword-password-manager # cannot get this to work unfree issue.
           ];
           settings = import ./settings/ooksJs.nix;
-          userChrome = import ./theme/ooksfox.nix;
+          userChrome = import ./theme/ooksfox.nix {inherit fonts palette;};
           userContent = import ./theme/penguinFoxContent.nix;
         };
         profiles.testing = {
diff --git a/home/modules/desktop/browser/firefox/settings/ooksJs.nix b/home/modules/desktop/browser/firefox/settings/ooksJs.nix
index b6b61b4..7bc214d 100644
--- a/home/modules/desktop/browser/firefox/settings/ooksJs.nix
+++ b/home/modules/desktop/browser/firefox/settings/ooksJs.nix
@@ -22,7 +22,7 @@
   "browser.newtabpage.activity-stream.default.sites" = "";
   "browser.aboutConfig.showWarning" = false;
 
-  #Disable recommendations
+  #Disable Recommendations
   "extensions.getAddons.showPane" = false;
   "extensions.htmlaboutaddons.recommendations.enabled" = false;
   "browser.discovery.enabled" = false;
diff --git a/home/modules/desktop/browser/firefox/theme/ooksfox.nix b/home/modules/desktop/browser/firefox/theme/ooksfox.nix
index a3a1794..b0e7ebd 100644
--- a/home/modules/desktop/browser/firefox/theme/ooksfox.nix
+++ b/home/modules/desktop/browser/firefox/theme/ooksfox.nix
@@ -1,178 +1,175 @@
-{config, ...}: let
-  inherit (config.colorscheme) pallete;
-  inherit (config.ooknet.theme) fonts;
-in
-  /*
-  css
-  */
-  ''
-    /* minimal firefox css ooks  */
+{
+  palette,
+  fonts,
+  ...
+}: ''
+  /* minimal firefox css ooks  */
 
-    /* ===== Color Variables and Root Styles ===== */
-    :root {
-      /* Base colors */
-      --base00: #${pallete.base00}; /* ---- */
-      --base01: #${pallete.base01}; /* --- */
-      --base02: #${pallete.base02}; /* -- */
-      --base03: #${pallete.base03}; /* - */
-      --base04: #${pallete.base04}; /* + */
-      --base05: #${pallete.base05}; /* ++ */
-      --base06: #${pallete.base06}; /* +++ */
-      --base07: #${pallete.base07}; /* ++++ */
+  /* ===== Color Variables and Root Styles ===== */
+  :root {
+    /* Base colors */
+    --base00: #${palette.base00}; /* ---- */
+    --base01: #${palette.base01}; /* --- */
+    --base02: #${palette.base02}; /* -- */
+    --base03: #${palette.base03}; /* - */
+    --base04: #${palette.base04}; /* + */
+    --base05: #${palette.base05}; /* ++ */
+    --base06: #${palette.base06}; /* +++ */
+    --base07: #${palette.base07}; /* ++++ */
 
-      /* Accent colors */
-      --base08: #${pallete.base08}; /* red */
-      --base09: #${pallete.base09}; /* orange */
-      --base0A: #${pallete.base0A}; /* yellow */
-      --base0B: #${pallete.base0B}; /* green */
-      --base0C: #${pallete.base0C}; /* aqua/cyan */
-      --base0D: #${pallete.base0D}; /* blue */
-      --base0E: #${pallete.base0E}; /* purple */
-      --base0F: #${pallete.base0F}; /* brown */
+    /* Accent colors */
+    --base08: #${palette.base08}; /* red */
+    --base09: #${palette.base09}; /* orange */
+    --base0A: #${palette.base0A}; /* yellow */
+    --base0B: #${palette.base0B}; /* green */
+    --base0C: #${palette.base0C}; /* aqua/cyan */
+    --base0D: #${palette.base0D}; /* blue */
+    --base0E: #${palette.base0E}; /* purple */
+    --base0F: #${palette.base0F}; /* brown */
 
-      /* UI-specific colors */
-      --toolbar-bgcolor: red;
-      --tab-active-bg-color: red;
+    /* UI-specific colors */
+    --toolbar-bgcolor: red;
+    --tab-active-bg-color: red;
 
-      /* Fonts */
-      --font-mono: ${fonts.monospace.family}, monospace;
-      }
-
-    /* ===== General UI Modifications ===== */
-    /* Hide status panel */
-    #statuspanel { display: none !important; }
-
-    /* Remove border radius from menus */
-    menupopup, panel { --panel-border-radius: 0px !important; }
-    menu, menuitem, menucaption { border-radius: 0px !important; }
-
-    /* Hide navigation context menu items */
-    menupopup > #context-navigation,
-    menupopup > #context-sep-navigation { display: none !important; }
-
-    /* Hide various toolbar buttons */
-    #back-button,
-    #forward-button,
-    #reload-button,
-    #stop-button,
-    #home-button,
-    #library-button,
-    #PanelUI-button,
-    #unified-extensions-button,
-    #star-button,
-    #reader-mode-button,
-    #save-to-pocket-button,
-    #tracking-protection-icon-container,
-    #page-action-buttons,
-    #fxa-toolbar-menu-button,
-    #identity-box { display: none !important; }
-
-    /* Hide customizable UI springs */
-    #customizableui-special-spring1,
-    #customizableui-special-spring2 { display: none; }
-
-    /* Hide Personal Toolbar */
-    #PersonalToolbar { display: none !important; }
-
-    /* ===== URL Bar Styling ===== */
-    /* Style input box */
-    moz-input-box {
-      background: var(--base01) !important;
-      color: var(--base07) !important;
-      border: solid 1px var(--base05) !important;
+    /* Fonts */
+    --font-mono: ${fonts.monospace.family}, monospace;
     }
 
-    /* Style input box */
-    #urlbar-input-container {
-      background: var(--base08) !important;
-      color: var(--base07) !important;
-      border: none !important;
-      border-radius: 5 !important;
-    }
+  /* ===== General UI Modifications ===== */
+  /* Hide status panel */
+  #statuspanel { display: none !important; }
 
-    /* Hide URL bar go button */
-    .urlbar-go-button { display: none !important; }
+  /* Remove border radius from menus */
+  menupopup, panel { --panel-border-radius: 0px !important; }
+  menu, menuitem, menucaption { border-radius: 0px !important; }
 
-    /* Remove navigation bar background */
-    #nav-bar.browser-toolbar { background: none !important; }
+  /* Hide navigation context menu items */
+  menupopup > #context-navigation,
+  menupopup > #context-sep-navigation { display: none !important; }
 
-    /* Position and style navigation bar */
-    #nav-bar {
-      opacity: 0;
-      text-align: center;
-      position: fixed !important;
-      border: solid 1px var(--nix-fg1) !important;
-      top: 30px;
-      left: 25%;
-      right: 25%;
-      z-index: 1;
-    }
+  /* Hide various toolbar buttons */
+  #back-button,
+  #forward-button,
+  #reload-button,
+  #stop-button,
+  #home-button,
+  #library-button,
+  #PanelUI-button,
+  #unified-extensions-button,
+  #star-button,
+  #reader-mode-button,
+  #save-to-pocket-button,
+  #tracking-protection-icon-container,
+  #page-action-buttons,
+  #fxa-toolbar-menu-button,
+  #identity-box { display: none !important; }
 
-    /* Expand navigation bar on focus */
-    #nav-bar:focus-within,
-    #nav-bar:hover {
-      opacity: 1;
-      max-height: 40px !important;
-      height: 60px !important;
-      min-height: 15px !important;
-    }
+  /* Hide customizable UI springs */
+  #customizableui-special-spring1,
+  #customizableui-special-spring2 { display: none; }
 
-    /* ===== Tab Bar Styling ===== */
-    /* Hide title bar buttons and spacer */
-    .titlebar-close,
-    .titlebar-spacer { display: none !important; }
+  /* Hide Personal Toolbar */
+  #PersonalToolbar { display: none !important; }
 
-    /* Remove tab margin */
-    #titlebar {
-      --proton-tab-block-margin: 0px !important;
-      --tab-block-margin: 0px !important;
-    }
+  /* ===== URL Bar Styling ===== */
+  /* Style input box */
+  moz-input-box {
+    background: var(--base01) !important;
+    color: var(--base07) !important;
+    border: solid 1px var(--base05) !important;
+  }
 
-    /* Remove tab shadows */
-    #tabbrowser-tabs:not([noshadowfortests]) .tab-background:is([selected], [multiselected]) {
-      box-shadow: none !important;
-    }
+  /* Style input box */
+  #urlbar-input-container {
+    background: var(--base08) !important;
+    color: var(--base07) !important;
+    border: none !important;
+    border-radius: 5 !important;
+  }
 
-    /* Hide tab-related buttons */
-    #alltabs-button,
-    #tabs-newtab-button,
-    #firefox-view-button,
-    #new-tab-button,
-    .tab-close-button { display: none !important; }
+  /* Hide URL bar go button */
+  .urlbar-go-button { display: none !important; }
 
-    /* Style tabs */
-    tab {
-      font-family: var(--font-mono);
-      font-weight: bold;
-    }
+  /* Remove navigation bar background */
+  #nav-bar.browser-toolbar { background: none !important; }
 
-    /* Set tab and tab bar height */
-    #TabsToolbar, .tabbrowser-tab {
-      max-height: 35px !important;
-      background: var(--base00) !important;
-      padding-bottom:0 !important;
-      border: none;
-    }
+  /* Position and style navigation bar */
+  #nav-bar {
+    opacity: 0;
+    text-align: center;
+    position: fixed !important;
+    border: solid 1px var(--nix-fg1) !important;
+    top: 30px;
+    left: 25%;
+    right: 25%;
+    z-index: 1;
+  }
 
-    /* Center tabs when not overflowing */
-    #tabbrowser-arrowscrollbox:not([overflowing]) {
-      --uc-flex-justify: center;
-    }
+  /* Expand navigation bar on focus */
+  #nav-bar:focus-within,
+  #nav-bar:hover {
+    opacity: 1;
+    max-height: 40px !important;
+    height: 60px !important;
+    min-height: 15px !important;
+  }
 
-    scrollbox[orient="horizontal"] {
-      justify-content: var(--uc-flex-justify, initial);
-    }
+  /* ===== Tab Bar Styling ===== */
+  /* Hide title bar buttons and spacer */
+  .titlebar-close,
+  .titlebar-spacer { display: none !important; }
 
-    /* Style selected tabs */
-    #tabbrowser-tabs .tabbrowser-tab[selected] .tab-content {
-      border: solid 1px var(--base05) !important;
-      color: var(--base07);
-      background: var(--base02)
-    }
+  /* Remove tab margin */
+  #titlebar {
+    --proton-tab-block-margin: 0px !important;
+    --tab-block-margin: 0px !important;
+  }
 
-    /* Style non-selected tabs */
-    tab:not([selected="true"]) {
-      /* border: solid 1px var(--base05) !important; */
-      background: var(--base01) !important;
-    }
-  ''
+  /* Remove tab shadows */
+  #tabbrowser-tabs:not([noshadowfortests]) .tab-background:is([selected], [multiselected]) {
+    box-shadow: none !important;
+  }
+
+  /* Hide tab-related buttons */
+  #alltabs-button,
+  #tabs-newtab-button,
+  #firefox-view-button,
+  #new-tab-button,
+  .tab-close-button { display: none !important; }
+
+  /* Style tabs */
+  tab {
+    font-family: var(--font-mono);
+    font-weight: bold;
+  }
+
+  /* Set tab and tab bar height */
+  #TabsToolbar, .tabbrowser-tab {
+    max-height: 35px !important;
+    background: var(--base00) !important;
+    padding-bottom:0 !important;
+    border: none;
+  }
+
+  /* Center tabs when not overflowing */
+  #tabbrowser-arrowscrollbox:not([overflowing]) {
+    --uc-flex-justify: center;
+  }
+
+  scrollbox[orient="horizontal"] {
+    justify-content: var(--uc-flex-justify, initial);
+  }
+
+  /* Style selected tabs */
+  #tabbrowser-tabs .tabbrowser-tab[selected] .tab-content {
+    border: solid 1px var(--base05) !important;
+    color: var(--base07);
+    background: var(--base02)
+  }
+
+  /* Style non-selected tabs */
+  tab:not([selected="true"]) {
+    /* border: solid 1px var(--base05) !important; */
+    background: var(--base01) !important;
+  }
+''