2 files changed, 20 insertions, 159 deletions
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 5d43bf5..0d159fd 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,5 +1,5 @@
 * {
-    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
+    font-family: "JetBrains Mono", "Font Awesome 6 Pro", monospace;
     font-size: 13.5px;
     transition: none;
     margin: 0;
@@ -11,9 +11,10 @@ window#waybar {
 }
 
 window#waybar > box {
+    margin: 10px;
+    margin-bottom: 0px;
+    padding: 0;
     color: #c7c6c3;
-    box-shadow: 1px 1px 3px 1px #151515;
-    background-color: rgba(30, 30, 46, 0.85);
 }
 
 button {
@@ -21,34 +22,40 @@ button {
     border-radius: 0;
 }
 
-.modules-left {
-    margin-left: -4px;
+.modules-left,
+.modules-right {
+    margin: 0;
+    padding: 2px 0px;
+    background-color: #14171d;
+    border-radius: 4px;
+}
+
+#workspaces {
+    padding: 0px 0px;
 }
 
 #workspaces button {
     all: initial;
-    padding: 0px 8px;
+    box-shadow: inherit;
+    text-shadow: inherit;
     color: #c7c6c3;
-    background-color: rgba(0, 0, 0, 0);
+    background-color: transparent;
+    border-radius: 4px;
+    padding: 2px 8px;
 }
 
 #workspaces button:hover {
-    box-shadow: inherit;
-    text-shadow: inherit;
+    background-color: #1a2a3a;
 }
 
 #workspaces button.focused,
 #workspaces button.active {
     background-color: #789ebf;
     color: #14171d;
-    box-shadow: inherit;
-    text-shadow: inherit;
 }
 
 #workspaces button.urgent {
     background-color: #cc5c5c;
-    box-shadow: inherit;
-    text-shadow: inherit;
 }
 
 #clock,
diff --git a/.config/waybar/style.hypr.css b/.config/waybar/style.hypr.css
deleted file mode 100644
index be2f0bb..0000000
--- a/.config/waybar/style.hypr.css
+++ /dev/null
@@ -1,146 +0,0 @@
-* {
-    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
-    font-size: 13.5px;
-    transition: none;
-    margin: 0;
-    padding: 0;
-}
-
-window#waybar {
-    background-color: transparent;
-}
-
-window#waybar > box {
-    color: #c7c6c3;
-    background-color: rgba(30, 30, 46, 0.85);
-    /*margin-bottom: 4px;
-    box-shadow: 1px 1px 3px 1px #151515;
-    transition-property: background-color;
-    transition-duration: .5s;*/
-}
-
-button {
-    border: none;
-    border-radius: 0;
-}
-
-.modules-left {
-    margin-left: -4px;
-}
-
-#workspaces button {
-    all: initial;
-    padding: 0px 8px;
-    color: #c7c6c3;
-    background-color: rgba(0, 0, 0, 0);
-}
-
-#workspaces button:hover {
-    box-shadow: inherit;
-    text-shadow: inherit;
-}
-
-#workspaces button.focused,
-#workspaces button.active {
-    background-color: #789ebf;
-    color: #14171d;
-    box-shadow: inherit;
-    text-shadow: inherit;
-}
-
-#workspaces button.urgent {
-    background-color: #cc5c5c;
-    box-shadow: inherit;
-    text-shadow: inherit;
-}
-
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#network,
-#wireplumber,
-#custom-media,
-#tray,
-#mode,
-#idle_inhibitor,
-#scratchpad,
-#custom-cmus,
-#custom-newsboat,
-#mpd {
-    padding: 0 10px;
-    border-right: 1px solid #4d4754;
-    color: #c7c6c3;
-}
-
-#tray {
-    border: none;
-}
-
-#window {
-    padding: 0 10px;
-    border-left: 1px solid #4d4754;
-    color: #c7c6c3;
-}
-
-#window,
-#workspaces {
-    margin: 0 4px;
-}
-
-#battery {
-    color: #97bd5e;
-}
-
-#battery.warning:not(.charging) {
-    color: #f0c767;
-}
-
-#battery.critical:not(.charging) {
-    color: #cc5c5c;
-}
-
-#network.disconnected,
-#wireplumber.muted {
-    color: #cc5c5c;
-}
-
-#network.wifi,
-#network.ethernet {
-    color: #789ebf;
-}
-
-#wireplumber {
-    color: #E0DB5F;
-}
-
-#backlight {
-    color: #E05F91;
-}
-
-#cpu {
-    color: #789ebf;
-}
-
-#memory {
-    color: #a97fb3;
-}
-
-#temperature {
-    color: #97bd5e;
-}
-
-#temperature.critical {
-    color: #cc5c5c;
-}
-
-#tray > .passive {
-    -gtk-icon-effect: dim;
-}
-
-#tray > .needs-attention {
-    -gtk-icon-effect: highlight;
-}