updated waybar and uswm for hyprland

waybar/style.css

@@ -1,46 +1,87 @@
+
 /* ~/.config/waybar/style.css */
 @import "./catppuccin-waybar/themes/mocha.css";
 
 * {
-    font-family: "0xProto Nerd Font", FontAwesome, sans-serif;
-    font-size: 14px;
-	padding: 0 5px;
+  border: none;
+  border-radius: 0;
+  min-height: 0;
+  font-family: JetBrainsMono Nerd Font;
+  font-size: 13px;
 }
 
 window#waybar {
-    background-color: alpha(@base, 0.9);
-    border-bottom: 3px solid @mauve;
-    color: @text;
+  background-color: alpha(@base, 0.6);
+  margin-right: 10px;
+  transition-property: background-color;
+  transition-duration: 0.5s;
+  color: @text;
+}
+
+window#waybar.hidden {
+  opacity: 0.5;
 }
 
 #workspaces {
-	margin-bottom: 5px;
 }
 
 #workspaces button {
-    padding: 0 5px;
-    background-color: transparent;
-    color: @surface2;
+  all: initial;
+  /* Remove GTK theme values (waybar #1351) */
+  min-width: 0;
+  /* Fix weird spacing in materia (waybar #450) */
+  box-shadow: inset 0 -3px transparent;
+  /* Use box-shadow instead of border so the text isn't offset */
+  padding: 6px 18px;
+  margin: 6px 3px;
+  border-radius: 3px;
+  background-color: alpha(@base, 0.9);
+  color: @text;
 }
 
 #workspaces button.active {
-    color: @mauve;
-    border-bottom: 3px solid @pink;
+  color: @base;
+  background-color: @green;
 }
 
 #workspaces button:hover {
-    background: @surface0;
-    box-shadow: inherit;
-    text-shadow: inherit;
+  box-shadow: inherit;
+  text-shadow: inherit;
+  background-color: @teal;
+  color: @base;
+}
+
+#workspaces button.urgent {
+  background-color: @red;
+  color: @base;
+}
+
+#memory,
+#cpu,
+#custom-power,
+#custom-tlp,
+#battery,
+#backlight,
+#wireplumber,
+#network,
+#clock,
+#tray {
+  border-radius: 4px;
+  margin: 6px 3px;
+  padding: 6px 12px;
+  background-color: @base;
+  color: @text;
 }
 
 #custom-power {
-    color: @red;
-    padding: 0 10px;
+  margin-right: 6px;
+  color: @red;
 }
 
 #custom-tlp {
     padding: 0 10px;
+	padding-right: 5px;
+	margin-right: 0;
 }
 
 #custom-tlp.ac {
@@ -55,6 +96,7 @@ window#waybar {
     color: @text;
     padding: 0 10px;
 	padding-left: 0;
+	margin-left: 0;
 }
 
 #battery.charging, #battery.plugged {
@@ -79,3 +121,38 @@ window#waybar {
         color: @text;
     }
 }
+
+#memory,
+#cpu {
+  color: @maroon;
+}
+
+
+#backlight {
+  color: @mauve;
+}
+
+#wireplumber {
+  color: @mauve;
+}
+
+#network {
+  color: @mauve;
+  padding-right: 15px;
+}
+
+#clock {
+  font-family: JetBrainsMono Nerd Font;
+  color: @mauve;
+}
+
+tooltip {
+  border-radius: 8px;
+  padding: 15px;
+  background-color: @base;
+}
+
+tooltip label {
+  padding: 5px;
+  background-color: @base;
+}