waybar: cleanup left/sway config

2 files changed, 60 insertions, 71 deletions

diff --git a/.config/waybar/config b/.config/waybar/config
index 2990657..a8cb36a 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -4,8 +4,8 @@
     "position": "top",
     "height": 30,
 
-    "modules-left": ["sway/mode", "sway/workspaces", "sway/window", "custom/media", "custom/toggl"],
-    "modules-center": ["clock#local", "clock#utc"],
+    "modules-left": ["sway/mode", "sway/workspaces", "sway/window"],
+    "modules-center": ["custom/media", "custom/toggl", "clock#local", "clock#utc"],
     "modules-right": ["tray", "cpu", "memory", "disk#root", "disk#home", "temperature", "idle_inhibitor", "backlight", "pulseaudio", "network#wg", "network", "battery"],
     "sway/workspaces": {
         "disable-scroll": true,
@@ -19,7 +19,7 @@
     },
     "sway/window": {
         "format": "{}",
-        "max-length": 50
+        "max-length": 100
     },
     "sway/mode": {
         "format": "{}"
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 763310e..0b7016c 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -11,89 +11,84 @@
   border-radius: 0;
   font-family: Iosevka SS05, Liberation Mono, Noto Sans, Font Awesome;
   font-size: 12pt;
-  min-height: 0;
 }
 
-window#waybar {
-  background: @background;
-  /* opacity: 0.98; */
-  /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
+#window,
+#mode,
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#custom-toggl,
+#mpd,
+#tray,
+#idle_inhibitor {
+  border-top: 2px solid @dimmeddarker;
+  padding: 0 0.3rem;
+  margin: 0 0.25rem;
   color: @foreground;
-  transition-property: background-color;
-  transition-duration: 0.1s;
 }
 
-window#waybar.hidden {
-  opacity: 0.2;
-}
-/* window#waybar.empty {} */
-/* window#waybar.solo {} */
-/* window#waybar.<appid> {} */
-
 #workspaces button {
   padding: 0 5px;
-  /* background-color: transparent; */
   background: transparent;
   color: @dimmed;
   /* border-bottom: 3px solid transparent; */
 }
-
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-#workspaces button:hover {
-  background: @dimmeddarker;
-  box-shadow: inherit;
-  text-shadow: inherit;
-}
-
 #workspaces button.focused {
   color: @foreground;
   background: @accentdarker;
+  transition-property: background;
+  transition-duration: 0.1s;
 }
+#workspaces button.urgent {
+  color: @background;
+  background: @urgent;
+}
+#workspaces button:hover,
 #workspaces button.focused:hover {
   background: @accent;
-}
+  color: @foreground;
+  transition-property: background, color;
+  transition-duration: 0.1s;
 
-#workspaces button.urgent {
-  color: @background;
-  background-color: @urgent;
+  /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+  box-shadow: inherit;
+  text-shadow: inherit;
+}
+#workspaces button.urgent:hover {
+  background: @foreground;
+  transition-property: background;
+  transition-duration: 0.1s;
 }
 
 #window {
+  /* border-top: 2px solid @accentdarker; */
+  border-top: none;
+}
+window#waybar {
+  background: @background;
   color: @foreground;
-  border-top: 2px solid @accent;
 }
+window#waybar.empty {
+  border-top: none;
+}
+window#waybar.solo {}
+/* window#waybar.<appid> {} */
 
 #mode {
   font-style: italic;
-  background-color: #64727d;
+  background: #64727d;
   border-top: 2px solid @foreground;
 }
 
-#clock,
-#battery,
-#cpu,
-#memory,
-#disk,
-#temperature,
-#backlight,
-#network,
-#pulseaudio,
-#custom-media,
-#custom-toggl,
-#mpd,
-#tray,
-#mode,
-#window,
-#idle_inhibitor {
-  padding: 0 0.3rem;
-  margin: 0 0.25rem;
-  color: @foreground;
-  border-top: 2px solid @dimmeddarker;
-}
-
-#clock {
-  /* background-color: #64727d; */
-}
+#clock {}
 #clock.local {
   margin-right: 0;
   padding-right: 0;
@@ -134,17 +129,13 @@ window#waybar.hidden {
 }
 
 label:focus {
-  background-color: @background;
+  background: @background;
 }
 
-#cpu {
-}
-#memory {
-}
-#backlight {
-}
-#network {
-}
+#cpu {}
+#memory {}
+#backlight {}
+#network {}
 #network.disconnected {
   color: @dimmed;
 }
@@ -154,14 +145,12 @@ label:focus {
   color: @dimmed;
 }
 
-#temperature {
-}
+#temperature {}
 #temperature.critical {
-  background-color: #eb4d4b;
+  background: #eb4d4b;
 }
 
-#tray {
-}
+#tray {}
 
 #idle_inhibitor {
   color: @dimmed;