theme update

nixos/home/imports/waybar.nix

@@ -4,14 +4,13 @@
   pkgs,
   ...
 }: let
-  userSettings.theme = "moss";
+  userSettings.theme = "campfire-night";
 in {
   options = {
     desktop.hyprland.waybar.enable = lib.mkEnableOption "enable Waybar module";
   };
 
-  config =
-    lib.mkIf config.desktop.hyprland.waybar.enable {
+  config = lib.mkIf config.desktop.hyprland.waybar.enable {
     home.packages = [
       pkgs.waybar
     ];
@@ -329,15 +328,33 @@ in {
             @define-color ws-hover-bg rgba(180, 120, 180, 0.5);"
           else if userSettings.theme == "moss"
           then "
-@define-color main-text     rgba(174, 183, 134, 0.90);   /* base06 */
-@define-color part-bg       rgba(28,  29,  17,  0.50);   /* base00 */
-@define-color ws-fg         rgba(117, 124,  62, 1.00);   /* base05 */
-@define-color ws-active-fg  rgba( 28,  29,  17, 1.00);   /* base00 */
-@define-color ws-active-bg  rgba( 95, 100,  49, 0.20);   /* base04 */
-@define-color ws-hover-fg   rgba(174, 183, 134, 1.00);   /* base06 */
-@define-color ws-hover-bg   rgba( 95, 100,  49, 0.30);"
+            @define-color main-text     rgba(174, 183, 134, 0.90);   /* base06 */
+            @define-color part-bg       rgba(28,  29,  17,  0.50);   /* base00 */
+            @define-color ws-fg         rgba(117, 124,  62, 1.00);   /* base05 */
+            @define-color ws-active-fg  rgba( 28,  29,  17, 1.00);   /* base00 */
+            @define-color ws-active-bg  rgba( 95, 100,  49, 0.20);   /* base04 */
+            @define-color ws-hover-fg   rgba(174, 183, 134, 1.00);   /* base06 */
+            @define-color ws-hover-bg   rgba( 95, 100,  49, 0.30);"
+          else if userSettings.theme == "tokyo-night"
+          then "
+            @define-color main-text     rgba(169, 177, 214, 0.90);   /* base05 */
+            @define-color part-bg       rgba(26,  27,  38,  0.50);   /* base00 */
+            @define-color ws-fg         rgba(114, 122, 162, 1.00);   /* base04 */
+            @define-color ws-active-fg  rgba(205, 202, 245, 1.00);   /* base06 */
+            @define-color ws-active-bg  rgba(65,  72, 104, 0.20);    /* base03 */
+            @define-color ws-hover-fg   rgba(205, 202, 245, 1.00);   /* base06 */
+            @define-color ws-hover-bg   rgba(65,  72, 104, 0.30);"
+          else if userSettings.theme == "campfire-night"
+          then "
+            @define-color main-text     rgba(202, 203, 201, 0.90);   /* base05 */
+            @define-color part-bg       rgba(13,  15,  15, 0.50);    /* base00 */
+            @define-color ws-fg         rgba(85,  92,  94, 1.00);    /* base04 */
+            @define-color ws-active-fg  rgba(245, 233, 211, 1.00);   /* base06 */
+            @define-color ws-active-bg  rgba(56,  61,  63, 0.20);    /* base03 */
+            @define-color ws-hover-fg   rgba(255, 255, 255, 1.00);   /* base07 */
+            @define-color ws-hover-bg   rgba(56,  61,  63, 0.30);"
           /*
-            base04
+          base03
           */
           else "
             @define-color main-text rgba(200, 200, 200, 1);

nixos/system/stylix.nix

@@ -1,8 +1,8 @@
 {pkgs, ...}: {
   stylix = {
     enable = true;
-    image = ./../../src/wallpapers/monoe.png;
-    base16Scheme = ./../../src/themes/mossplus.yaml;
+    image = ./../../src/wallpapers/wpmaterial.png;
+    base16Scheme = ./../../src/themes/campfire-night.yaml;
     polarity = "dark";
     autoEnable = true;
 

src/themes/campfire-night.yaml

@@ -0,0 +1,23 @@
+system: "base16"
+name: "Campfire-Night"
+author: "You"
+variant: "dark"
+
+palette:
+  base00: "0d0f0f" # darkest – background forest
+  base01: "181b1d" # tree shadows
+  base02: "232728" # tent shading
+  base03: "383d3f" # log and clothing shadows
+  base04: "555c5e" # tent outer edge
+  base05: "cacbc9" # face light
+  base06: "f5e9d3" # bright highlights
+  base07: "ffffff" # lightest (fire + extreme highlights)
+  base08: "d36f4a" # red – fire ember
+  base09: "e89f6f" # orange – flame edge
+  base0A: "f8c78f" # yellow – flame core
+  base0B: "89a068" # green – sprite tent box
+  base0C: "678d88" # teal – tent shadows
+  base0D: "44596e" # blue – beanie
+  base0E: "85718b" # violet – shirt reflections
+  base0F: "6c3d26" # brown – log and dirt
+

src/themes/tokyonight.yaml

@@ -0,0 +1,23 @@
+system: "base16"
+name: "Tokyo-Night"
+author: "You"
+variant: "dark"
+
+palette:
+  base00: "1a1b26" # darkest – main background
+  base01: "1f2335"
+  base02: "2f3549"
+  base03: "414868"
+  base04: "737aa2"
+  base05: "a9b1d6" # default foreground / text
+  base06: "c0caf5" # bright fg / selections
+  base07: "d5d6db" # lightest
+  base08: "f7768e" # red    – sakura pink
+  base09: "ff9e64" # orange – lantern glow
+  base0A: "e0af68" # yellow – evening light
+  base0B: "9ece6a" # green  – fresh leaf
+  base0C: "7dcfff" # teal   – cool breeze
+  base0D: "7aa2f7" # blue   – evening sky
+  base0E: "bb9af7" # violet – twilight bloom
+  base0F: "965027" # brown  – warm earth
+