re-theming begun

1 files changed, 46 insertions, 56 deletions

diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index 53911ec..8761029 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -7,10 +7,22 @@
 }:
 {
   imports = [
-    ./swayfx.nix
+    ./components
+    ./window-managers
   ];
 
   options.desktop = {
+    accent = lib.mkOption {
+      description = "The accent colour to use from catppuccin";
+      default = "blue";
+      type =
+        with lib.types;
+        enum [
+          "blue"
+          "pink"
+        ];
+    };
+
     windowManager = lib.mkOption {
       description = "Which window manager to use";
       default = null;
@@ -21,16 +33,16 @@
   config = {
     fonts.fontconfig.enable = true;
     home = {
-      file."Pictures/blossoms.jpg" = {
+      file."Pictures/wallpaper.jpg" = {
         enable = (config.desktop.windowManager != null);
-        source = ./blossoms.jpg;
+        source = ./wallpaper.jpg;
       };
 
       packages = with pkgs; [
         brightnessctl
         fira-code
         keepassxc
-        nerd-fonts.fira-code # monospace font
+        nerd-fonts.fira-code
       ];
     };
 
@@ -44,27 +56,33 @@
           };
 
           colors = {
-            alpha = 0.8;
-            background = "191724";
-            foreground = "e0def4";
-            regular0 = "26233a";
-            regular1 = "eb6f92";
-            regular2 = "9ccfd8";
-            regular3 = "f6c177";
-            regular4 = "31748f";
-            regular5 = "c4a7e7";
-            regular6 = "ebbcba";
-            regular7 = "e0def4";
-            bright0 = "47435d";
-            bright1 = "ff98ba";
-            bright2 = "c5f9ff";
-            bright3 = "ffeb9e";
-            bright4 = "5b9ab7";
-            bright5 = "eed0ff";
-            bright6 = "ffe5e3";
-            bright7 = "fefcff";
-            flash = "f6c177";
-            cursor = "191724 e0def4";
+            background = "1e1e2e";
+            cursor = "11111b f5e0dc";
+            foreground = "cdd6f4";
+            regular0 = "45475a";
+            regular1 = "f38ba8";
+            regular2 = "a6e3a1";
+            regular3 = "f9e2af";
+            regular4 = "89b4fa";
+            regular5 = "f5c2e7";
+            regular6 = "94e2d5";
+            regular7 = "bac2de";
+            bright0 = "585b70";
+            bright1 = "f38ba8";
+            bright2 = "a6e3a1";
+            bright3 = "f9e2af";
+            bright4 = "89b4fa";
+            bright5 = "f5c2e7";
+            bright6 = "94e2d5";
+            bright7 = "a6adc8";
+            "16" = "fab387";
+            "17" = "f5e0dc";
+            jump-labels = "11111b fab387";
+            search-box-match = "cdd6f4 313244";
+            search-box-no-match = "11111b f38ba8";
+            selection-background = "414356";
+            selection-foreground = "cdd6f4";
+            urls = "89b4fa";
           };
 
           cursor.blink = true;
@@ -77,41 +95,16 @@
         };
       };
 
-      fuzzel = {
-        enable = lib.mkDefault (config.desktop.windowManager != null);
-        settings = {
-          border.width = 2;
-          colors = {
-            background = "191724ff";
-            border = "ebbcbaff";
-            input = "e0def4ff";
-            match = "ebbcbaff";
-            prompt = "e0def4ff";
-            selection = "524f67ff";
-            selection-match = "ebbcbaff";
-            selection-text = "e0def4ff";
-            text = "e0def4ff";
-          };
-
-          main = {
-            dpi-aware = lib.mkDefault true;
-            font = lib.mkDefault "Fira Code:size=6";
-            show-actions = true;
-            sort-result = false;
-            terminal = "foot -a '{cmd}' -T '{cmd}' {cmd}";
-            use-bold = true;
-          };
-        };
-      };
-
       librewolf = {
         enable = lib.mkDefault (config.desktop.windowManager != null);
         profiles = {
-          default = { };
+          # sidebar visibility keeps getting reset when launching the browser.
+          default.settings."sidebar.visibility" = "hide-sidebar";
           noRFP = {
             id = 1;
             settings = {
               "privacy.resistFingerprinting" = false;
+              "sidebar.visibility" = "hide-sidebar";
               "webgl.disabled" = false;
             };
           };
@@ -122,11 +115,8 @@
           "sidebar.animation.enabled" = false;
           "sidebar.new-sidebar.has-used" = true;
           "sidebar.verticalTabs" = true;
-          # this keeps getting randomly reset at runtime. why? idfk.
-          "sidebar.visibility" = "hide-sidebar";
         };
       };
     };
   };
-
 }