From f526e4cb4604b516507c25e0e67dbedd6b2e032e Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Wed, 1 May 2024 13:59:33 -0400
Subject: [PATCH] waybar: remove custom css for sway

---
 homeManagerModules/apps/waybar/waybar.css   | 29 ++++++++++++++++--
 homeManagerModules/desktop/hypr/waybar.css  | 33 +--------------------
 homeManagerModules/desktop/sway/default.nix |  8 ++---
 homeManagerModules/desktop/sway/waybar.css  | 27 -----------------
 4 files changed, 30 insertions(+), 67 deletions(-)
 delete mode 100644 homeManagerModules/desktop/sway/waybar.css

diff --git a/homeManagerModules/apps/waybar/waybar.css b/homeManagerModules/apps/waybar/waybar.css
index 6f3f24b2..e6412638 100644
--- a/homeManagerModules/apps/waybar/waybar.css
+++ b/homeManagerModules/apps/waybar/waybar.css
@@ -7,7 +7,7 @@
 }
 
 window#waybar {
-    background: rgba (35, 38, 52, 0.4);
+    background: rgba (35, 38, 52, 0.0);
     color: #FAFAFA;
 }
 
@@ -17,11 +17,13 @@ window#waybar {
     color: #FAFAFA;
 }
 
-#workspaces button.active, #workspaces button.focused {
+#workspaces button.active,
+#workspaces button.focused {
     color: #ca9ee6;
 }
 
-#submap, #mode {
+#submap,
+#mode {
     padding: 0 15px;
     margin: 0 5px;
     color: #e78284;
@@ -61,4 +63,25 @@ window#waybar {
 
 #battery.critical:not(.charging) {
     color: #e78284;
+}
+
+#workspaces,
+#mode,
+#submap,
+#tray,
+#clock,
+#hardware {
+    border-radius: 10;
+    background: rgba (35, 38, 52, 0.8);
+    margin: 5px 10px 0px 10px;
+    padding: 0px 10px 0px 10px;
+}
+
+#clock {
+    padding: 0px 20px 0px 20px;
+} 
+#submap,
+#mode {
+    color: #FAFAFA;
+    background: rgba(231, 130, 132, 0.8);
 }
\ No newline at end of file
diff --git a/homeManagerModules/desktop/hypr/waybar.css b/homeManagerModules/desktop/hypr/waybar.css
index 16a0379d..40d98c15 100644
--- a/homeManagerModules/desktop/hypr/waybar.css
+++ b/homeManagerModules/desktop/hypr/waybar.css
@@ -1,32 +1 @@
-@import url("style.css");
-
-/* Style overrides for sway */
-
-window#waybar {
-    background: rgba (35, 38, 52, 0.0);
-}
-
-#workspaces,
-#submap,
-#tray,
-#clock,
-#hardware
-{
-border-radius: 10;
-background: rgba (35, 38, 52, 0.8);
-margin: 5px 10px 0px 10px;
-padding: 0px 10px 0px 10px;
-}
-
-#clock {
-    padding: 0px 20px 0px 20px;
-}
-
-/* #workspaces {
-    padding: 0px 5px;
-} */
-
-#submap {
-    color: #FAFAFA;
-    background: rgba(231, 130, 132, 0.8);
-}
\ No newline at end of file
+@import url("style.css");
\ No newline at end of file
diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix
index 3655b174..3a343186 100644
--- a/homeManagerModules/desktop/sway/default.nix
+++ b/homeManagerModules/desktop/sway/default.nix
@@ -55,8 +55,6 @@
       };
     };
 
-    xdg.configFile."waybar/sway-style.css".source = ./waybar.css;
-
     wayland.windowManager.sway.enable = true;
     wayland.windowManager.sway.package = pkgs.swayfx;
     wayland.windowManager.sway.wrapperFeatures.gtk = true;
@@ -83,7 +81,7 @@
       media_prev = "${media} previous";
 
       # Sway desktop utilities
-      bar = pkgs.waybar + "/bin/waybar -s ${config.xdg.configHome}/waybar/sway-style.css";
+      bar = pkgs.waybar + "/bin/waybar";
       launcher = pkgs.fuzzel + "/bin/fuzzel";
       notifyd = pkgs.mako + "/bin/mako";
       wallpaperd = pkgs.swaybg + "/bin/swaybg -i ${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
@@ -143,7 +141,7 @@
         fi
       '';
     in {
-      bars = [];
+      bars = [{command = "${bar}";}];
       modifier = "${modifier}";
       colors.background = "${colorPrimary}";
       colors.focused = {
@@ -327,7 +325,7 @@
         };
       };
       startup = [
-        {command = "${bar}";}
+        # {command = "${bar}";}
         {command = "${wallpaperd}";}
         {command = "${fileManager} --daemon";}
         {command = "${idled}";}
diff --git a/homeManagerModules/desktop/sway/waybar.css b/homeManagerModules/desktop/sway/waybar.css
deleted file mode 100644
index cb5f72fe..00000000
--- a/homeManagerModules/desktop/sway/waybar.css
+++ /dev/null
@@ -1,27 +0,0 @@
-@import url("style.css");
-
-/* Style overrides for sway */
-
-window#waybar {
-    background: rgba (35, 38, 52, 0.0);
-}
-
-#workspaces,
-#mode,
-#tray,
-#clock,
-#hardware {
-    border-radius: 10;
-    background: rgba (35, 38, 52, 0.8);
-    margin: 5px 10px 0px 10px;
-    padding: 0px 10px 0px 10px;
-}
-
-#clock {
-    padding: 0px 20px 0px 20px;
-}
-
-#mode {
-    color: #FAFAFA;
-    background: rgba(231, 130, 132, 0.8);
-}
\ No newline at end of file