up

2 files changed, 40 insertions, 44 deletions

diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index fc6a12a..3555c2f 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,12 +1,12 @@
 {
   "layer": "top",
   // "position": "bottom",
-  "output": "DP-2",
+  // "output": "DP-2",
   "reload_style_on_change": true,
   "modules-left": [
-    "hyprland/workspaces",
-    "custom/layout",
-    "hyprland/window"
+    "hyprland/workspaces"
+    // "custom/layout",
+    // "hyprland/window"
   ],
   "modules-right": [
     "custom/recording",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 654c77a..8f23cad 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,32 +1,17 @@
-@define-color bg                #1e1e2e;
-@define-color fg                #cdd6f4;
-@define-color red               #cc241d;
-@define-color bright_red        #fb4934;
-@define-color blue              #458588;
-@define-color bright_blue       #83a598;
-@define-color lavender          #b4befe;
-
 * {
     font-family: monospace;
-    /* font-weight: bold; */
     font-size: 17px;
     border: none;
-    border-radius: 0px;
 }
 
 window#waybar {
-  background-color: @lavender;
-}
-
-.modules-right {
-  color: @fg;
-  background-color: @bg;
-  padding-left: 8px;
+    background-color: #2b3339;
+    color: #d3c6aa;
 }
 
-.modules-left {
-  color: @fg;
-  background-color: @bg;
+window#waybar > * {
+    margin-top: 3px;
+    margin-bottom: 3px; /* margin-top + bar underline thickness */
 }
 
 window#waybar.hidden {
@@ -39,39 +24,26 @@ window#waybar.hidden {
 }
 
 #workspaces button {
-    padding: 3 8 3 8;
+    padding: 0;
     min-height: 0px;
-    /* margin-left: 4px; */
-    color: @fg;
-    background-color: @bg;
+    margin-left: 4px;
+    color: #495156;
 }
 
 #workspaces button.active {
-    color: @bg;
-    background-color: @lavender;
+    color: #d3c6aa;
 }
 
 #workspaces button.urgent {
     color: #e67e80;
 }
 
-#custom-layout {
-  color: @fg;
-  background-color: @bg;
-}
-
-#window {
-  padding-left: 10px;
-  background-color: @lavender;
-  color: @bg;
-}
-
 #mode {
     background-color: #ff0000;
     box-shadow: inset 0 -3px #0000ff;
 }
 
-#clock,
+#custom-clock,
 #battery,
 #cpu,
 #custom-memory,
@@ -91,7 +63,6 @@ window#waybar.hidden {
 #custom-media,
 #custom-music,
 #custom-recording,
-#custom-mouse,
 #custom-internet,
 #image,
 #tray,
@@ -102,10 +73,15 @@ window#waybar.hidden {
 #custom-notifications,
 #custom-power,
 #mpd {
-    padding: 0 5px;
+    padding: 0 2px;
     margin-right: 2px;
 }
 
+#window,
+#workspaces {
+    margin: 0 4px;
+}
+
 /* If workspaces is the leftmost module, omit left margin */
 .modules-left > widget:first-child > #workspaces {
     margin-left: 0;
@@ -398,3 +374,23 @@ label:focus {
 #privacy-item.audio-out {
     background-color: #00ff00;
 }
+
+tooltip {
+  background-color: @color-tooltip-bg;
+  border: none;
+  border-radius: 5px;
+}
+
+tooltip decoration {
+  box-shadow: none;
+}
+
+tooltip decoration:backdrop {
+  box-shadow: none;
+}
+
+tooltip label {
+  color: @color-tooltip-fg;
+  padding-left: 5px;
+  padding-right: 5px;
+}