From b9471c83ed50eb6a374e31cd8042968d0ecfb7af Mon Sep 17 00:00:00 2001
From: kenji <kenji@hakase>
Date: Sat, 27 Dec 2025 11:05:09 -0600
Subject: [PATCH] add: waybar

---
 apps/matugen/config.toml        | 5 +++++
 apps/matugen/home.nix           | 2 +-
 apps/matugen/templates/hyprland | 2 +-
 apps/matugen/templates/waybar   | 7 +++++++
 apps/stylix/home.nix            | 2 +-
 apps/waybar/style.nix           | 9 ++++-----
 6 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 apps/matugen/templates/waybar

diff --git a/apps/matugen/config.toml b/apps/matugen/config.toml
index 22dab87..f28c37a 100644
--- a/apps/matugen/config.toml
+++ b/apps/matugen/config.toml
@@ -10,3 +10,8 @@ post_hook = "killall -SIGUSR2 .ghostty-wrappe"
 input_path = "~/.config/matugen/templates/hyprland"
 output_path = "~/.config/hypr/matugen.conf"
 post_hook = "hyprctl reload"
+
+[templates.waybar]
+input_path = "~/.config/matugen/templates/waybar"
+output_path = "~/.config/waybar/colors.conf"
+post_hook = "killall -SIGUSR2 .waybar-wrapped"
diff --git a/apps/matugen/home.nix b/apps/matugen/home.nix
index 17bc9a2..e048e9a 100644
--- a/apps/matugen/home.nix
+++ b/apps/matugen/home.nix
@@ -14,5 +14,5 @@
   };
 
   programs.ghostty.settings.theme = "matugen";
-  wayland.windowManager.hyprland.settings.extraConfig = ''source ./matugen.conf'';
+  wayland.windowManager.hyprland.settings.source = ["./matugen.conf"];
 }
diff --git a/apps/matugen/templates/hyprland b/apps/matugen/templates/hyprland
index 5b764ec..d7e6821 100644
--- a/apps/matugen/templates/hyprland
+++ b/apps/matugen/templates/hyprland
@@ -1,4 +1,4 @@
 <* for name, value in colors *>
 $image = {{image}}
 ${{name}} = rgba({{value.default.hex_stripped}}ff)
-* endfor *>
+<* endfor *>
diff --git a/apps/matugen/templates/waybar b/apps/matugen/templates/waybar
new file mode 100644
index 0000000..f246856
--- /dev/null
+++ b/apps/matugen/templates/waybar
@@ -0,0 +1,7 @@
+/*
+* Css Colors
+* Generated with Matugen
+*/
+<* for name, value in colors *>
+    @define-color {{name}} {{value.default.hex}};
+<* endfor *>
diff --git a/apps/stylix/home.nix b/apps/stylix/home.nix
index c9f7788..c93af68 100644
--- a/apps/stylix/home.nix
+++ b/apps/stylix/home.nix
@@ -18,7 +18,7 @@
           "hakase"
         ];
       };
-      waybar.enable = true;
+      waybar.enable = false;
       ghostty.enable = false;
       hyprpaper.enable = true;
       gtk.enable = true;
diff --git a/apps/waybar/style.nix b/apps/waybar/style.nix
index f9714cc..fc1f405 100644
--- a/apps/waybar/style.nix
+++ b/apps/waybar/style.nix
@@ -1,11 +1,10 @@
-{config, ...}: let
-  colors = config.lib.stylix.colors.withHashtag;
-in {
+{config, ...}: {
   programs.waybar = {
     style = ''
+      @import "matugen.css"
       * {
-        background-color: ${colors.base11};
-        color: ${colors.base05};
+        background-color: @background;
+        color: @foreground;
 
         border: none;
         border-radius: 0;