1 files changed, 69 insertions, 32 deletions

diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index d28b142..35b73b6 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -19,18 +19,18 @@
 @define-color accentdarker #3e355a;
 
 @define-color foreground @color07;
-@define-color background @color00;
+@define-color background rgba(15,15,15, 0.96);
 /* @define-color dimmed #777777; */
 /* @define-color dimmeddarker #302a29; */
-@define-color dimmed @color05;
-@define-color dimmeddarker #292929;
+@define-color dimmed #404540; /*@color05;*/
+@define-color dimmeddarker @color00;
 @define-color urgent #9f353a;
 
 * {
   border: none;
   border-radius: 0;
   font-family: Iosevka SS14, Noto Mono, Material Design Icons, Font Awesome;
-  font-size: 11pt;
+  font-size: 10pt;
 }
 
 #window,
@@ -50,12 +50,27 @@
 #custom-weather,
 #custom-mpris,
 #custom-todo,
+#custom-covid,
 #tray {
-  border-top: 2px solid @dimmeddarker;
-  padding: 0 0.3rem;
-  margin: 0 0.25rem;
+  border-top: 1px solid @dimmeddarker;
+  padding: 0 0.1rem;
+  margin: 0 0.2rem;
   color: @foreground;
 }
+
+#cpu,
+#memory,
+#disk,
+#temperature,
+#idle_inhibitor,
+#backlight,
+#custom-gammastep,
+#network.vpn,
+#network.tailscale,
+#custom-covid {
+  color: @dimmed;
+}
+
 #cpu:hover,
 #memory:hover,
 #backlight:hover,
@@ -108,15 +123,16 @@
 }
 
 #window {
-  /* border-top: 2px solid @accentdarker; */
+  /* border-top: 1px solid @accentdarker; */
   border-top: none;
+  padding: 0 0.3rem;
 }
 window#waybar {
   background: @background;
   color: @foreground;
 }
 window#waybar.empty {
-  border-top: none;
+  /* border-top: none; */
 }
 window#waybar.solo {}
 /* window#waybar.<appid> {} */
@@ -130,8 +146,8 @@ window#waybar.solo {}
 
 #clock {}
 #clock.local {
-  margin-right: 0;
-  padding-right: 0;
+  /* margin-right: 0; */
+  /* padding-right: 0; */
 }
 #clock.utc {
   color: @dimmed;
@@ -139,8 +155,8 @@ window#waybar.solo {}
 
 #disk.root {}
 #disk.home {
-  margin-left: 0;
-  padding-left: 0;
+  /* margin-left: 0; */
+  /* padding-left: 0; */
 }
 
 #battery {}
@@ -176,24 +192,24 @@ label:focus {
 }
 #network {}
 #network.disconnected {
-  border-top: 2px solid @urgent;
+  border-top: 1px solid @urgent;
   color: @dimmed;
 }
 #network.vpn.disconnected {
-  border-top: 2px solid @dimmeddarker;
+  border-top: 1px solid @dimmeddarker;
 }
 #network.vpn:not(.disconnected) {
-  border-top: 2px solid @color11;
+  border-top: 1px solid @color11;
 }
 #network.tailscale.disconnected {
-  border-top: 2px solid @dimmeddarker;
+  border-top: 1px solid @dimmeddarker;
 }
 #network.tailscale:not(.disconnected) {
-  border-top: 2px solid @color14;
+  border-top: 1px solid @color14;
 }
 #pulseaudio {}
 #pulseaudio.muted {
-  border-top: 2px solid @urgent;
+  border-top: 1px solid @urgent;
   color: @dimmed;
 }
 
@@ -206,32 +222,31 @@ label:focus {
 #tray {}
 
 #idle_inhibitor {
-  color: @dimmed;
 }
 #idle_inhibitor.activated {
-  color: unset;
-  border-top: 2px solid @color02;
+  color: @foreground;
+  border-top: 1px solid @color02;
 }
 
 #custom-mpris {
-  min-width: 100px;
   color: @foreground;
-  border-top: 2px solid @color04;
+  border-top: 1px solid @color04;
 }
 
 #custom-toggl {
   color: @foreground;
-  border-top: 2px solid @urgent;
+  border-top: 1px solid @urgent;
 }
 
 #custom-todo.off {
-  color: red;
-  border-top: 2px solid @dimmeddarker;
+  color: @dimmed;
+  border-top: 1px solid @dimmeddarker;
+  padding: 0 0 0 0.4rem;
 }
 #custom-todo.on {
   color: @foreground;
+  border-top: 1px solid @urgent;
   font-weight: bold;
-  border-top: none;
   padding: 0 0.6rem 0 0.4rem;
 }
 #custom-todo.work {
@@ -245,7 +260,7 @@ label:focus {
   }
 }
 #custom-gammastep.night {
-  border-top: 2px solid @color12;
+  border-top: 1px solid @color12;
   color: @foreground;
   animation-name: flash;
   animation-duration: 0.3s;
@@ -257,13 +272,35 @@ label:focus {
 }
 #custom-gammastep.off,
 #custom-gammastep.unknown {
-  border-top: 2px solid @urgent;
+  border-top: 1px solid @urgent;
   color: @dimmed;
 }
 
 #custom-weather {
   color: @dimmed;
 }
-#custom-weather.sunny {
-  color: rgba(255,255,0, 0.6);
+
+#custom-covid.green {
+  /* border-top: 1px solid #00cc00; */
+  /* color: #00cc00; */
+}
+#custom-covid.yellow {
+  /* border-top: 1px solid #f7dd31; */
+  /* color: #f7dd31; */
+}
+#custom-covid.orange {
+  /* border-top: 1px solid #faa31b; */
+  /* color: #faa31b; */
+}
+#custom-covid.red {
+  /* border-top: 1px solid #f92206; */
+  /* color: #f92206; */
+}
+#custom-covid.darkred {
+  /* border-top: 1px solid #c01a00; */
+  /* color: #c01a00; */
+}
+#custom-covid.darkdarkred {
+  /* border-top: 1px solid #941100; */
+  /* color: #941100; */
 }