From 6fa2d3992e82c152a2dd195926e4ec0fe2a9ea80 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Sun, 2 Jul 2023 16:51:11 +0100
Subject: [PATCH] Polybar updates

Remove some old scripts
Add bluetooth and brightness modules with ramp icons
Update layout to mirror waybar setup
---
 home/desktop/config/polybar/polybar.ini | 109 ++++++++++++++----------
 1 file changed, 64 insertions(+), 45 deletions(-)

diff --git a/home/desktop/config/polybar/polybar.ini b/home/desktop/config/polybar/polybar.ini
index 9b204303..75635c05 100644
--- a/home/desktop/config/polybar/polybar.ini
+++ b/home/desktop/config/polybar/polybar.ini
@@ -64,8 +64,7 @@ height = 24pt
 radius = 6
 dpi = 0
 font-0 = FiraCode Nerd Font;size=12
-font-1 = Iosevka Nerd Font;size=12
-font-2 = Noto Sans;size=12
+font-1 = Noto Sans;size=12
 line-size = 3pt
 background = ${colors.background}
 foreground = ${colors.foreground}
@@ -87,8 +86,9 @@ pseudo-transparency = false
 inherit = common
 width = 100%
 
-modules-left = launcher xworkspaces
-modules-right = pulseaudio-control-sink pulseaudio-control-source memory cpu bluetooth wlan eth date power-menu
+modules-left = launcher time date cpu memory
+modules-center = xworkspaces
+modules-right = pulseaudio wlan eth backlight battery power-menu
 
 [module/launcher]
 type = custom/text
@@ -129,31 +129,6 @@ label-empty = %icon%
 label-empty-foreground = ${colors.disabled}
 label-empty-padding = 1
 
-[module/pulseaudio-control-sink]
-type = custom/script
-label = "%output%"
-tail = true
-interval = 0
-exec = ~/.dotfiles/scripts/pulseaudio-control.bash --icon-muted "󰝟 " --icons-volume "󰕿 ,󰖀 ,󰕾 " --node-nicknames-from device.product.name --node-nickname "alsa_output.pci-0000_2d_00.1.hdmi-stereo*:󰽟 " --node-nickname "alsa_output.pci-0000_2f_00.4.analog-stereo*:󰋎 " --node-type output output
-click-left = ~/.dotfiles/scripts/pulseaudio-control.bash --node-type output togmute
-click-right = exec pavucontrol &
-click-middle = ~/.dotfiles/scripts/pulseaudio-control.bash --node-type output next-node
-scroll-up = ~/.dotfiles/scripts/pulseaudio-control.bash --node-type output up
-scroll-down = ~/.dotfiles/scripts/pulseaudio-control.bash --node-type output down
-
-[module/pulseaudio-control-source]
-type = custom/script
-label = "%output%"
-tail = true
-interval = 0
-env-NODE-TYPE = "input"
-exec = ~/.dotfiles/scripts/pulseaudio-control.bash --icon-muted "󰍭 " --icons-volume "󰢳 ,󰍬 ,󰢴 " --node-nickname "alsa_input.pci-0000_2f_00.4.analog-stereo*:󰋎 " --node-nickname "*.monitor:󱦉 " --node-type input output
-click-left = ~/.dotfiles/scripts/pulseaudio-control.bash --node-type input togmute
-click-right = exec pavucontrol &
-click-middle = ~/.dotfiles/scripts/pulseaudio-control.bash --node-type input next-node
-scroll-up = ~/.dotfiles/scripts/pulseaudio-control.bash --node-type input up
-scroll-down = ~/.dotfiles/scripts/pulseaudio-control.bash --node-type input down
-
 [module/memory]
 type = internal/memory
 interval = 2
@@ -168,13 +143,6 @@ format-prefix = "󰻠 "
 format-prefix-foreground = ${colors.primary}
 label = %percentage:2%%
 
-[module/bluetooth]
-type = custom/script
-exec = ~/.dotfiles/scripts/system-bluetooth-bluetoothctl.sh
-tail = true
-interval = 0
-click-left = ~/.dotfiles/scripts/system-bluetooth-bluetoothctl.sh --toggle &
-
 [network-base]
 type = internal/network
 interval = 5
@@ -184,23 +152,74 @@ format-disconnected = <label-disconnected>
 [module/wlan]
 inherit = network-base
 interface-type = wireless
-label-connected = "%{F#b7bdf8}󰖩 {F-} %essid%"
-label-disconnected = "%{F#b7bdf8}󰖪 "
+label-connected = "󰖩 %essid%"
+label-disconnected = "󰖪 "
 
 [module/eth]
 inherit = network-base
 interface-type = wired
-label-connected = "%{F#b7bdf8}󰈁 "
-label-disconnected = "%{F#b7bdf8}󰈂 "
+label-connected = "󰈁 "
+label-disconnected = "󰈂 "
 
 [module/date]
 type = internal/date
-interval = 1
-
-date = %H:%M
-date-alt = %Y-%m-%d %H:%M:%S
-
+interval = 3600
+date = %A %Y-%m-%d
 label = %date%
 label-foreground = ${colors.primary}
 
+[module/time]
+type = internal/date
+interval = 30
+time = %R
+label = %time%
+label-foreground = ${colors.primary}
+
+[module/backlight]
+type = internal/backlight
+card = intel_backlight
+format = <ramp> <label>
+ramp-0 = 
+ramp-1 = 
+ramp-2 = 
+ramp-3 = 
+ramp-4 = 
+ramp-5 = 
+ramp-6 = 
+ramp-7 = 
+ramp-8 = 
+
+[module/battery]
+type = internal/battery
+battery = BAT0
+adapter = AC
+format-charging = <animation-charging> <label-charging>
+format-discharging = <ramp-capacity> <label-discharging>
+label-charging = %percentage%% %time% %consumption%W
+label-discharging = %percentage%% %time% %consumption%W
+ramp-capacity-0 = 󰁺
+ramp-capacity-1 = 󰁻
+ramp-capacity-2 = 󰁼
+ramp-capacity-3 = 󰁽
+ramp-capacity-4 = 󰁾
+ramp-capacity-5 = 󰁿
+ramp-capacity-6 = 󰂀
+ramp-capacity-7 = 󰂁
+ramp-capacity-8 = 󰂂
+ramp-capacity-9 = 󰁹
+animation-low-0 = 󱃍
+animation-low-1 = 
+animation-low-framerate = 200
+animation-charging-0 = 󰢜
+animation-charging-1 = 󰂆
+animation-charging-2 = 󰂇
+animation-charging-3 = 󰂈
+animation-charging-4 = 󰢝
+animation-charging-5 = 󰂉
+animation-charging-6 = 󰢞
+animation-charging-7 = 󰂊
+animation-charging-8 = 󰂋
+animation-charging-9 = 󰂅
+animation-charging-framerate = 750
+
 ; vim:ft=dosini