From dfe28c416c9b72ad7673632fe971951cab415c57 Mon Sep 17 00:00:00 2001
From: maia arson crimew <maia@crimew.gay>
Date: Thu, 2 Jun 2022 16:31:32 +0200
Subject: [PATCH] improve polybar setup

---
 .config/bspwm/bspwmrc      |  1 +
 .config/polybar/config.ini | 74 ++++++++++++++++++++++++++++----------
 2 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index 27cfd7f..c377c88 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -35,6 +35,7 @@ bspc rule -a REAPER desktop='10' follow=off
 bspc rule -a Pavucontrol        state=floating rectangle=600x800+0+0  center=on
 bspc rule -a 1Password          state=floating rectangle=1000x900+0+0 center=on
 bspc rule -a Org.gnome.Nautilus state=floating rectangle=1200x900+0+0 center=on
+bspc rule -a kitty_float        state=floating rectangle=1000x700+0+0 center=on
 
 # startup
 picom --experimental-backends &
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 41155de..fb6e432 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -53,10 +53,11 @@ separator = |
 separator-foreground = ${colors.disabled}
 
 font-0 = monospace;2
+font-1 = JetBrainsMono NerdFont;2
 
-modules-left = xworkspaces xwindow
+modules-left = bspwm xwindow
 modules-center = date
-modules-right = pulseaudio xkeyboard memory cpu
+modules-right = eth pulseaudio xkeyboard memory cpu
 cursor-click = pointer
 cursor-scroll = ns-resize
 
@@ -90,9 +91,11 @@ separator = |
 separator-foreground = ${colors.disabled}
 
 font-0 = monospace;2
+font-1 = JetBrainsMono NerdFont;2
 
-modules-left = xworkspaces xwindow
-modules-right = date                     
+modules-left = bspwm xwindow
+modules-center = date                     
+modules-right = wlan pulseaudio xkeyboard battery
 cursor-click = pointer
 cursor-scroll = ns-resize
 
@@ -106,13 +109,13 @@ enable-ipc = true
 
 ; override-redirect = true
 
-[module/xworkspaces]
-type = internal/xworkspaces
+[module/bspwm]
+type = internal/bspwm
 
-label-active = %name%
-label-active-background = ${colors.background-alt}
-label-active-underline= ${colors.primary}
-label-active-padding = 1
+label-focused = %name%
+label-focused-background = ${colors.background-alt}
+label-focused-underline= ${colors.primary}
+label-focused-padding = 1
 
 label-occupied = %name%
 label-occupied-padding = 1
@@ -143,15 +146,17 @@ label-unmounted-foreground = ${colors.disabled}
 [module/pulseaudio]
 type = internal/pulseaudio
 
-format-volume-prefix = "VOL "
+format-volume-prefix = "墳 "
 format-volume-prefix-foreground = ${colors.primary}
 format-volume = <label-volume>
 
 label-volume = %percentage%%
 
-label-muted = muted
+label-muted = ﱝ
 label-muted-foreground = ${colors.disabled}
 
+click-right = pavucontrol
+
 [module/xkeyboard]
 type = internal/xkeyboard
 blacklist-0 = num lock
@@ -167,33 +172,35 @@ label-indicator-background = ${colors.secondary}
 [module/memory]
 type = internal/memory
 interval = 2
-format-prefix = "RAM "
+format-prefix = " "
 format-prefix-foreground = ${colors.primary}
-label = %percentage_used:2%%
+label = %{A1:kitty --class kitty_float htop:}%percentage_used:2%%%{A}
 
 [module/cpu]
 type = internal/cpu
 interval = 2
-format-prefix = "CPU "
+format-prefix = ""
 format-prefix-foreground = ${colors.primary}
-label = %percentage:2%%
+label = %{A1:kitty --class kitty_float htop:}%percentage:2%%%{A}
 
 [network-base]
 type = internal/network
 interval = 5
 format-connected = <label-connected>
 format-disconnected = <label-disconnected>
-label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected
+label-disconnected-foreground = ${colors.disabled}
 
 [module/wlan]
 inherit = network-base
 interface-type = wireless
-label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%
+label-connected = %{A1:networkmanager_dmenu:}%{F#cba6f7}  %essid%%{F-} %local_ip%%{A}
+label-disconnected = %{A1:networkmanager_dmenu:}睊%{A}
 
 [module/eth]
 inherit = network-base
 interface-type = wired
-label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%
+label-connected = %{F#cba6f7}%{F-} %local_ip%
+label-disconnected = 
 
 [module/date]
 type = internal/date
@@ -205,6 +212,35 @@ date-alt = %Y-%m-%d %H:%M:%S
 label = %date%
 label-foreground = ${colors.primary}
 
+[module/battery]
+type = internal/battery
+
+full-at = 79
+
+battery = BAT0
+adapter = AC
+
+label-charging = %percentage%%
+label-discharging = %percentage%%
+format-charging = <animation-charging>  <label-charging>
+format-discharging = <ramp-capacity>  <label-discharging>
+label-full = %{F#cba6f7}%{F-}
+
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-3 = 
+animation-charging-4 = 
+animation-charging-foreground = ${colors.primary}
+animation-charging-framerate = 750
+
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+ramp-capacity-foreground = ${colors.primary}
+
 [settings]
 screenchange-reload = true
 pseudo-transparency = false