From cbb17f77352c5dd7a6cf0c2e41587fabd91bbacf Mon Sep 17 00:00:00 2001
From: spinach <spinach@Thinkpad.com>
Date: Fri, 23 Feb 2024 12:39:31 -0500
Subject: [PATCH] adding sway base changes

---
 gui/sway/base                   | 11 ++++++++++-
 gui/waybar/thinkpad             | 12 +++++++++---
 gui/waybar/thinkpad-style.css   |  7 ++++---
 meta/configs/sway.thinkpad.yaml |  1 +
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/gui/sway/base b/gui/sway/base
index 8dfbbef..ed1da48 100644
--- a/gui/sway/base
+++ b/gui/sway/base
@@ -10,12 +10,21 @@ default_border none
 gaps inner 10
 smart_gaps on
 
+# exec --no-startup-id waybar;
+bar {
+    swaybar_command waybar;
+}
 # setup screens
 exec_always killall kanshi; kanshi
 # background
 exec_always wallpaper.sh
 # waybar
-exec_always killall waybar; waybar
+# exec_always killall -SIGUSR2 waybar; waybar
+# Restarts waybar if running, starts otherwise
+exec_always pgrep waybar && (killall -SIGUSR2 waybar) || (waybar)
+# bar {
+#     swaybar_command waybar;
+# }
 
 # loading layout
 assign [class="st-256color"] 1
diff --git a/gui/waybar/thinkpad b/gui/waybar/thinkpad
index 87e5a93..b63d598 100644
--- a/gui/waybar/thinkpad
+++ b/gui/waybar/thinkpad
@@ -2,7 +2,7 @@
     "layer": "top",
     "modules-left": ["sway/workspaces", "sway/window", "pulseaudio/slider"],
     "modules-center": ["custom/weather"],
-    "modules-right": ["cpu", "memory", "network", "custom/bg", "custom/date"],
+    "modules-right": ["cpu", "memory", "network", "battery", "custom/bg", "custom/date"],
     "sway/workspaces": {
         "all-outputs": true
     },
@@ -32,17 +32,23 @@
     },
     "network": {
         "interval": 2,
+        "format-icons": ["󰤟 ", "󰤢 ", "󰤥 ", "󰤨 "],
         "format-ethernet": "ETH: {bandwidthTotalBytes}",
-        "format-wifi": "WLAN: {ssid}",
+        "format-wifi": "WLAN: {icon}",
         "tooltip-format": "DOWN: {bandwidthDownBits} UP: {bandwidthUpBits} IP: {ipaddr}"
     },
+    "battery": {
+        "format": "BAT: {capacity}%",
+        "format-tooltip": "{timeTo}",
+        "format-time":  "{H} hours {M} minutes",
+    },
     "custom/bg": {
         "exec": "echo -e '\uf1c5'",
         "interval": "once",
         "on-click": "wallpaper.sh -s"
     },
     "custom/date": {
-        "exec": "date +'%A, %b %d %l:%M %P'",
+        "exec": "date +'%a, %b %d %l:%M %P'",
         "interval": 10
     }
 }
diff --git a/gui/waybar/thinkpad-style.css b/gui/waybar/thinkpad-style.css
index 52f5f95..6ffe600 100644
--- a/gui/waybar/thinkpad-style.css
+++ b/gui/waybar/thinkpad-style.css
@@ -6,7 +6,7 @@
 }
 
 window.LVDS-1 * {
-    font-size: 12pt;
+    font-size: 10pt;
 }
 
 window#waybar {
@@ -20,7 +20,7 @@ window#waybar.empty {
 }
 
 #workspaces button {
-    padding: 0 5px;
+    padding: 0 3px;
     color: #ddd;
     background-color: rgba(29, 31, 21, 0.8);
 }
@@ -32,7 +32,7 @@ window#waybar.empty {
 
 #workspaces button.focused {
     background-color: #64727D;
-    box-shadow: inset 0 3px #ffffff;
+    box-shadow: inset 0 4px 2px -2px  #ffffff;
 }
 
 #workspaces button.urgent {
@@ -45,6 +45,7 @@ window#waybar.empty {
 }
 
 #backlight,
+#battery,
 #battery.bat1,
 #battery.bat2,
 #clock,
diff --git a/meta/configs/sway.thinkpad.yaml b/meta/configs/sway.thinkpad.yaml
index 1f3d10a..a47e8b1 100644
--- a/meta/configs/sway.thinkpad.yaml
+++ b/meta/configs/sway.thinkpad.yaml
@@ -1,4 +1,5 @@
 - link:
     ~/.config/sway/config: gui/sway/thinkpad
+    ~/.config/sway/base: gui/sway/base
     ~/.config/sway/lock.png: gui/sway/lock.png
     ~/.local/bin/swaylock-blur: bin/swaylock-blur