From ce37e5c4986a50fe48bcc485f03e25393ed60df4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 28 Oct 2024 14:12:48 +0000
Subject: [PATCH] Fix firefox profiles/config not working for some reason

---
 system/home/desktop/browser/firefox.nix |  3 ++
 system/home/desktop/browser/nyxt.nix    | 40 ++++++++++++-------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/system/home/desktop/browser/firefox.nix b/system/home/desktop/browser/firefox.nix
index b920e53c..5833ff01 100644
--- a/system/home/desktop/browser/firefox.nix
+++ b/system/home/desktop/browser/firefox.nix
@@ -1,5 +1,6 @@
 { config, pkgs, ... }:
 {
+  stylix.targets.firefox.enable = false;
   programs = {
     browserpass = {
       enable = true;
@@ -109,6 +110,8 @@
         StartDownloadsInTempDirectory = true;
       };
       profiles.default = {
+        id = 0;
+        isDefault = true;
         bookmarks = builtins.fromJSON (builtins.readFile ./bookmarks.json);
         settings = {
           "app.shield.optoutstudies.enabled" = false;
diff --git a/system/home/desktop/browser/nyxt.nix b/system/home/desktop/browser/nyxt.nix
index b5cc2e4b..112eff71 100644
--- a/system/home/desktop/browser/nyxt.nix
+++ b/system/home/desktop/browser/nyxt.nix
@@ -6,7 +6,7 @@
       "nyxt/config.lisp".text =
         let
           fonts = config.stylix.fonts;
-          scheme = config.lib.stylix.scheme;
+          scheme = config.lib.stylix.scheme.withHashtag;
         in
         ''
           ;; Import custom configuration
@@ -14,27 +14,27 @@
           ;; Define custom theme
           (define-configuration browser
             ((theme (make-instance 'theme:theme
-                                   :dark-p t
+                                   :dark-p nil
                                    :font-family "${fonts.sansSerif.name}"
                                    :monospace-font-family "${fonts.monospace.name}"
-                                   :background-color "${scheme.withHashtag.base00}"
-                                   :on-background-color "${scheme.withHashtag.base05}"
-                                   :primary-color "${scheme.withHashtag.base02}"
-                                   :on-primary-color "${scheme.withHashtag.base05}"
-                                   :secondary-color "${scheme.withHashtag.base03}"
-                                   :on-secondary-color "${scheme.withHashtag.base05}"
-                                   :accent-color "${scheme.withHashtag.base0E}"
-                                   :on-accent-color "${scheme.withHashtag.base01}"
-                                   :action-color "${scheme.withHashtag.cyan}"
-                                   :on-action-color "${scheme.withHashtag.base01}"
-                                   :success-color "${scheme.withHashtag.green}"
-                                   :on-success-color "${scheme.withHashtag.base01}"
-                                   :highlight-color "${scheme.withHashtag.magenta}"
-                                   :on-highlight-color "${scheme.withHashtag.base01}"
-                                   :warning-color "${scheme.withHashtag.yellow}"
-                                   :on-warning-color "${scheme.withHashtag.base01}"
-                                   :codeblock-color "${scheme.withHashtag.base02}"
-                                   :on-codeblock-color "${scheme.withHashtag.base05}"))))
+                                   :background-color "${scheme.base00}"
+                                   :on-background-color "${scheme.base05}"
+                                   :primary-color "${scheme.base02}"
+                                   :on-primary-color "${scheme.base05}"
+                                   :secondary-color "${scheme.base03}"
+                                   :on-secondary-color "${scheme.base05}"
+                                   :accent-color "${scheme.base0E}"
+                                   :on-accent-color "${scheme.base01}"
+                                   :action-color "${scheme.cyan}"
+                                   :on-action-color "${scheme.base01}"
+                                   :success-color "${scheme.green}"
+                                   :on-success-color "${scheme.base01}"
+                                   :highlight-color "${scheme.magenta}"
+                                   :on-highlight-color "${scheme.base01}"
+                                   :warning-color "${scheme.yellow}"
+                                   :on-warning-color "${scheme.base01}"
+                                   :codeblock-color "${scheme.base02}"
+                                   :on-codeblock-color "${scheme.base05}"))))
         '';
     };
     dataFile."nyxt/bookmarks.lisp".text =