From cf1cfc18ac4e1e6a076cbab04390d0a760ae9fb3 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@andyscott.me>
Date: Sun, 18 Jun 2023 00:06:39 -0400
Subject: [PATCH] Adjust new waybar for laptop

---
 dot_config/waybar/config.tmpl    |  3 ++-
 dot_config/waybar/style.css.tmpl | 35 +++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/dot_config/waybar/config.tmpl b/dot_config/waybar/config.tmpl
index b9a2b5c..808a213 100644
--- a/dot_config/waybar/config.tmpl
+++ b/dot_config/waybar/config.tmpl
@@ -6,10 +6,11 @@
 {{- else if eq .chezmoi.hostname "helix" }}
     "output": "eDP-1",
     "position": "top",
-    "width": 3840,
+    //"width": 3840,
 {{- else }}
     "output": "eDP-1",
     "position": "top",
+    // "width": 1920,
 {{- end }}
     "layer": "top",
     "height": 32,
diff --git a/dot_config/waybar/style.css.tmpl b/dot_config/waybar/style.css.tmpl
index 0db7393..868e00c 100644
--- a/dot_config/waybar/style.css.tmpl
+++ b/dot_config/waybar/style.css.tmpl
@@ -136,7 +136,7 @@ button:hover {
 }
 
 #battery.charging,
-#battery.plugged {
+#battery.plugged.charging {
   color: #4a555b;
   background-color: #9bb86f;
 {{- if eq .chezmoi.hostname "hydrus"}}
@@ -153,6 +153,26 @@ button:hover {
   }
 }
 
+#battery.good {
+  background-color: #323d43;
+  color: #d8caac;
+{{- if eq .chezmoi.hostname "hydrus"}}
+  border-bottom: 3px solid rgba(208, 191, 155, 0.7);
+{{- else }}
+  border-top: 3px solid rgba(208, 191, 155, 0.7);
+{{- end }}
+}
+
+#battery.warning:not(.charging) {
+  background-color: #d5b26b;
+  color: #4a555b;
+{{- if eq .chezmoi.hostname "hydrus"}}
+  border-bottom: 3px solid rgba(208, 191, 155, 0.7);
+{{- else }}
+  border-top: 3px solid rgba(208, 191, 155, 0.7);
+{{- end }}
+}
+
 #battery.critical:not(.charging) {
   background-color: #e26c6e;
   color: #4a555b;
@@ -166,7 +186,6 @@ button:hover {
 {{- else }}
   border-top: 3px solid rgba(208, 191, 155, 0.7);
 {{- end }}
-
 }
 
 label:focus {
@@ -204,7 +223,13 @@ label:focus {
 }
 
 #backlight {
-  background-color: #d0bf9b;
+  background-color: #323d43;
+  color: #d8caac;
+{{- if eq .chezmoi.hostname "hydrus"}}
+  border-bottom: 3px solid rgba(208, 191, 155, 0.7);
+{{- else }}
+  border-top: 3px solid rgba(208, 191, 155, 0.7);
+{{- end }}
 }
 
 #network {
@@ -355,8 +380,8 @@ label:focus {
 /* River */
 
 #mode.normal {
+  background-color: #323d43;
   color: #d8caac;
-  background-color: #4a555b;
 }
 
 #mode.passthrough {
@@ -392,5 +417,5 @@ label:focus {
 }
 
 #window {
-  font-size: 10px;
+  font-size: 12px;
 }