From 9c6ebafcf37ac3eea141dc0c9f0b71aa58ceb88c Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 13 Oct 2023 07:39:49 +0100
Subject: [PATCH] Switch back to waybar for now

Update styling, disable stylix for waybar
---
 home/hyprland/config.nix         |  3 +--
 home/hyprland/waybar/default.nix |  3 ++-
 home/hyprland/waybar/style.css   | 26 ++++++++++++++------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 6a324977..bbd8c4b6 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -281,8 +281,7 @@ in ''
   bindm = SUPER, mouse:272, movewindow
   bindm = SUPER, mouse:273, resizewindow
 
-  # exec-once = ${pkgs.waybar}/bin/waybar
-  exec-once = ${pkgs.ironbar}/bin/ironbar
+  exec-once = ${pkgs.waybar}/bin/waybar
   exec-once = ${pkgs.swaynotificationcenter}/bin/swaync
   exec-once = ${pkgs.hyprpaper}/bin/hyprpaper
   exec-once = ${pkgs.dex}/bin/dex --autostart
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index 962bee16..f26d1a67 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -1,8 +1,9 @@
 { pkgs, ... }: {
   home.packages = with pkgs; [ networkmanagerapplet bluez ];
+  stylix.targets.waybar.enable = false;
   programs.waybar = {
     enable = true;
-    # style = ./style.css;
+    style = ./style.css;
     settings.main = {
       layer = "top";
       position = "top";
diff --git a/home/hyprland/waybar/style.css b/home/hyprland/waybar/style.css
index 9ceb5835..92e08854 100644
--- a/home/hyprland/waybar/style.css
+++ b/home/hyprland/waybar/style.css
@@ -30,16 +30,20 @@
 @define-color rosewater #f4dbd6;
 
 * {
-    border: none;
-    border-radius: 0px;
-    margin: 0px;
-    background: transparent;
-    color: @text;
+    /* border: none; */
+    /* border-radius: 0px; */
+    /* margin: 0px; */
+    /* background: transparent; */
+    /* color: @text; */
     font-family: "Fira Sans";
     font-size: 18px;
 }
 
+window { background: transparent; }
+
 window > box {
+    color: @text;
+    background: rgba(36, 39, 58, 0.5);
     margin-left: 10px;
     margin-right: 10px;
     border-left: 1px solid @surface2;
@@ -49,10 +53,10 @@ window > box {
     border-top-right-radius: 0px;
     border-bottom-left-radius: 10px;
     border-bottom-right-radius: 10px;
-    background: rgba(36, 39, 58, 0.5);
 }
 
 tooltip {
+    color: @text;
     background: rgba(36, 39, 58, 0.5);
     box-shadow: inset 0 0 0 1px rgba(183, 189, 248, 0.1), 0 0 0 1px rgba(36, 39, 58, 0.5);
     border: 1px solid @lavender;
@@ -65,23 +69,21 @@ tooltip {
 #memory,
 #temperature,
 #clock,
+#mpris,
 #pulseaudio,
 #bluetooth,
 #network,
 #backlight,
 #battery,
 #tray {
+    color: @text;
     margin: 0px;
     padding-left: 10px;
     padding-right: 10px;
 }
 
-#workspaces button {
-    border-top: 1px solid transparent;
-    border-radius: 0px;
-    color: @overlay0;
-}
+#workspaces button { color: @surface2; }
 
-#workspaces button.active { color: @text; }
+#workspaces button.active { color: @lavender; }
 
 #workspaces button.urgent { color: @red; }