From 2c02ad8741d9e137035d14d0170237cc9025a523 Mon Sep 17 00:00:00 2001
From: spinach <spinach@Thinkpad.com>
Date: Wed, 8 Feb 2023 12:16:03 -0500
Subject: [PATCH] updated st font size and corrected scripts

---
 gui/polybar-thinkpad/config.ini | 29 ++++++++++++++++-------------
 meta/configs/st.desktop.yaml    |  2 ++
 meta/configs/st.laptop.yaml     |  2 ++
 meta/configs/st.yaml            |  2 --
 meta/profiles/arch.desktop      |  2 +-
 meta/profiles/arch.laptop       |  2 +-
 meta/profiles/arch.thinkpad     |  2 +-
 shells/st-desktop               |  1 +
 shells/st-laptop                |  1 +
 9 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 meta/configs/st.desktop.yaml
 create mode 100644 meta/configs/st.laptop.yaml
 delete mode 100644 meta/configs/st.yaml
 create mode 160000 shells/st-desktop
 create mode 160000 shells/st-laptop

diff --git a/gui/polybar-thinkpad/config.ini b/gui/polybar-thinkpad/config.ini
index 427f9cb..9bcae25 100644
--- a/gui/polybar-thinkpad/config.ini
+++ b/gui/polybar-thinkpad/config.ini
@@ -19,22 +19,19 @@ module-margin = 1
 padding = 2
 
 ; font
-font-0 = Hack Nerd Font:size=12;2
+font-0 = Hack Nerd Font:size=10;2
 
 monitor = ${env:MONITOR:}
 
 bottom = false
 
-fixed-center = true
-
 ; hybrid bg color, might go lighter grey
 background = ${colors.background}
 
 ; hybrid fg color, might go lighter if I go lighter grey
 foreground = ${colors.foreground}
 
-modules-left = xworkspaces xwindow
-modules-center = weather
+modules-left = xworkspaces xwindow weather
 modules-right = battery pulseaudio memory cpu wlan date
 
 [module/xworkspaces]
@@ -83,7 +80,7 @@ type = internal/memory
 interval = 2
 format-prefix = "RAM "
 format-prefix-foreground = ${colors.primary}
-label = %used%/%total%
+label = %percentage_used%%
 format = <label>
 
 [module/battery]
@@ -93,14 +90,19 @@ poll-interval = 10
 
 low-at = 10
 
-format-charging = <label-charging>
+format-discharging-prefix = "BAT "
+format-discharging-prefix-foreground = ${colors.primary}
 format-discharging = <label-discharging>
 
-time-format = %H:%M
+format-charging-prefix = "CHR "
+format-charging-prefix-foreground = ${colors.primary}
+format-charging = <label-charging>
+
+time-format = %l:%M
 
-label-charging = CHR %percentage%% %time%
+label-charging = %percentage%%%time%
 
-label-discharging = %percentage%% %time%
+label-discharging = %percentage%%%time%
 
 
 [module/cpu]
@@ -108,19 +110,20 @@ type = internal/cpu
 interval = 2
 format-prefix = "CPU "
 format-prefix-foreground = ${colors.primary}
-label = %percentage:2%%
+label = %percentage%%
 
 [network-base]
 type = internal/network
 interval = 5
 format-connected = <label-connected>
+format-connected-foreground = ${colors.primary}
 format-disconnected = <label-disconnected>
-label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
+format-disconnected-foreground = ${colors.disabled}
 
 [module/wlan]
 inherit = network-base
 interface-type = wireless
-label-connected = %{F#F0C674}%ifname%%{F-} %signal%
+label-connected = %ifname%
 
 [module/eth]
 inherit = network-base
diff --git a/meta/configs/st.desktop.yaml b/meta/configs/st.desktop.yaml
new file mode 100644
index 0000000..a315f77
--- /dev/null
+++ b/meta/configs/st.desktop.yaml
@@ -0,0 +1,2 @@
+- shell:
+  - [cd shells/st-desktop && sudo make install, Installing st]
diff --git a/meta/configs/st.laptop.yaml b/meta/configs/st.laptop.yaml
new file mode 100644
index 0000000..3bf0f9c
--- /dev/null
+++ b/meta/configs/st.laptop.yaml
@@ -0,0 +1,2 @@
+- shell:
+  - [cd shells/st-laptop && sudo make install, Installing st]
diff --git a/meta/configs/st.yaml b/meta/configs/st.yaml
deleted file mode 100644
index ac605d7..0000000
--- a/meta/configs/st.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-- shell:
-  - [cd shells/st && sudo make install, Installing st]
diff --git a/meta/profiles/arch.desktop b/meta/profiles/arch.desktop
index 77ef736..24ce2e5 100644
--- a/meta/profiles/arch.desktop
+++ b/meta/profiles/arch.desktop
@@ -7,7 +7,7 @@ zsh
 oh-my-zsh
 fzf
 tmux.sparse
-st
+st.desktop
 i3.desktop
 polybar.desktop
 picom
diff --git a/meta/profiles/arch.laptop b/meta/profiles/arch.laptop
index 56160e4..0a1d11c 100644
--- a/meta/profiles/arch.laptop
+++ b/meta/profiles/arch.laptop
@@ -7,7 +7,7 @@ zsh
 oh-my-zsh
 fzf
 tmux.sparse
-st
+st.laptop
 i3.laptop
 polybar.laptop
 picom
diff --git a/meta/profiles/arch.thinkpad b/meta/profiles/arch.thinkpad
index eb9977e..48c3608 100644
--- a/meta/profiles/arch.thinkpad
+++ b/meta/profiles/arch.thinkpad
@@ -7,7 +7,7 @@ zsh
 oh-my-zsh
 fzf
 tmux.sparse
-st
+st.laptop
 i3.laptop
 polybar.thinkpad
 picom
diff --git a/shells/st-desktop b/shells/st-desktop
new file mode 160000
index 0000000..d698aee
--- /dev/null
+++ b/shells/st-desktop
@@ -0,0 +1 @@
+Subproject commit d698aee479f7fd5ce635568aa9892380d80f8ed7
diff --git a/shells/st-laptop b/shells/st-laptop
new file mode 160000
index 0000000..d698aee
--- /dev/null
+++ b/shells/st-laptop
@@ -0,0 +1 @@
+Subproject commit d698aee479f7fd5ce635568aa9892380d80f8ed7