Add vpn module and improve battery module

1 files changed, 182 insertions, 95 deletions

diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 52720b1..2c9149e 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -59,6 +59,7 @@ font5 = "UbuntuMono Nerd font:size=11;2"
 font6 = "Feather:style=Regular:size=15;4"
 font7 = "Font Awesome 6 Pro Solid:style=Solid:size=14;4"
 font8 = "JetBrainsMono Nerd Font:size=9;2"
+font9 = "Fira Nerd font:size=11;2"
 
 [common]
 line-size = 1pt
@@ -74,36 +75,44 @@ font-5 = ${fonts.font5}
 font-6 = ${fonts.font6}
 font-7 = ${fonts.font7}
 font-8 = ${fonts.font8}
+font-9 = ${fonts.font9}
 background = ${colors.background}
 foreground = ${colors.foreground}
 
 
 [bar/top-left]
 monitor = ${env:MONITOR:}
-width = 260px
+;width = 260px
+width = 180px
 offset-x = 0%:+10px
 offset-y = 1%
 height = 22pt
 radius = 10.0
 fixed-center = true
 inherit = common
-modules-left = space space menu space bspwm space space
+modules-left = space space menu space space space bspwm space space
 
 [bar/top-middle-left]
 monitor = ${env:MONITOR:}
-width = 230px
-offset-x = 33.3333%:-130px
+;width = 230px
+;offset-x = 33.3333%:-130px
+width = 290px
+offset-x = 33.3333%:-190px
 offset-y = 1%
 height = 22pt
 radius = 10.0
 fixed-center = true
 inherit = common
-modules-center = space space cpu space sep space memory space sep space temperature space space
+modules-center = space space cpu space sep space memory space sep space temperature space sep space battery space space
 
 [bar/top-middle]
 monitor = ${env:MONITOR:}
-width = 220px
-offset-x = 50%:-110px
+;width = 220px
+;width = 150px
+width = 170px
+;offset-x = 50%:-110px
+;offset-x = 50%:-110px
+offset-x = 50%:-85px
 offset-y = 1%
 height = 22pt
 radius = 10.0
@@ -112,24 +121,30 @@ inherit = common
 font-0 = "RobotoMono Nerd Font:weight=bold:size=9;2"
 font-1 = "RobotoMono Nerd Font:size=10;3"
 font-2 = "RobotoMono Nerd Font:size=11;3"
-modules-center = space space day space sep space date space sep space time space space
+;modules-center = space space day space sep space date space sep space time space space
+modules-center = space space date space space
 
 [bar/top-middle-right]
 monitor = ${env:MONITOR:}
-width = 230px
+;width = 230px
+;offset-x = 66.6667%:-100px
+width = 290px
 offset-x = 66.6667%:-100px
 offset-y = 1%
 height = 22pt
 radius = 10.0
 fixed-center = true
-padding-right = 4
+;padding-right = 4
 inherit = common
-modules-center = space space wireless-network netspeed space space
+;modules-center = space space space sep space vpn space space
+modules-center = space space wireless-network space sep space netspeed space sep space vpn space space
+;modules-center = space space wireless-network netspeed space sep space space space
 
 [bar/top-right]
 monitor = ${env:MONITOR:}
-width = 260px
-offset-x = 100%:-270px
+;width = 260px
+width = 180px
+offset-x = 100%:-190px
 offset-y = 1%
 height = 22pt
 radius = 10.0
@@ -137,7 +152,7 @@ fixed-center = true
 padding-left = 2
 ;padding-right = 2
 inherit = common
-modules-right = space space mic space sep space volume space sep space backlight space sep space inbox space space systray space space control space space
+modules-right = space space mic space sep space volume space sep space backlight space sep space inbox space sep space systray space space sep control space space
 
 
 ;; Modules
@@ -174,7 +189,30 @@ label-empty-foreground = ${colors.disabled}
 
 [module/volume]
 type = internal/pulseaudio
-format-volume = <ramp-volume> <label-volume>
+;format-volume = <label-volume> <bar-volume>
+;label-volume = 
+;label-volume-foreground = ${colors.foreground}
+;label-muted =  muted
+;bar-volume-width = 10
+;bar-volume-foreground-0 = #55aa55
+;bar-volume-foreground-1 = #55aa55
+;bar-volume-foreground-2 = #55aa55
+;bar-volume-foreground-3 = #55aa55
+;bar-volume-foreground-4 = #55aa55
+;bar-volume-foreground-5 = #f5a70a
+;bar-volume-foreground-6 = #ff5555
+;bar-volume-gradient = false
+;bar-volume-indicator = │
+;bar-volume-indicator-font = 2
+;bar-volume-indicator-foreground = #ff
+;bar-volume-fill = ─
+;bar-volume-fill-font = 2
+;bar-volume-empty = ─
+;bar-volume-empty-font = 2
+;bar-volume-empty-foreground =
+
+;format-volume = <ramp-volume> <label-volume
+format-volume = <ramp-volume>
 format-volume-font = 9
 format-volume-padding = 0
 label-volume = %percentage:2%%
@@ -184,9 +222,10 @@ label-volume-padding = 1
 format-muted-foreground = ${colors.red}
 format-muted-underline = ${colors.red}
 ramp-volume-foreground   = ${colors.foreground}
-label-muted = "muted"
+;label-muted = "muted"
+label-muted = " "
 label-muted-foreground = ${colors.disabled}
-ramp-volume-0 = " "
+ramp-volume-0 = " "
 ramp-volume-1 = " "
 ramp-volume-2 = " "
 ramp-volume-3 = " "
@@ -194,31 +233,49 @@ ramp-volume-4 = " "
 ramp-volume-5 = " "
 ramp-volume-6 = " "
 click-right = "pavucontrol"
+scroll-interval = 10
 
 [module/inbox]
 type = custom/text
 content-foreground = ${colors.foreground}
 ;content-padding = 1
-content = 󰮒
-;󰧬󰮒󰻨􀍕
-;click-left = "dunstctl history-pop"
-;click-left = bash $HOME/.config/eww/scripts/openNotificationCenter.sh
+;content-font = 3
+content = "󰮒"
+;content = "   "
+;󰧬󰮒󰻨
 click-left = notification-center
 
 [module/day]
 type = internal/date
 interval = 1
-date = %A
-label = %date:8%
+date = %a
+label = %date%
 label-foreground = ${colors.foreground}
 
+;[module/day]
+;type = internal/date
+;interval = 1
+;date = %A
+;label = %date:8%
+;label-foreground = ${colors.foreground}
+;
+;[module/date]
+;type = internal/date
+;interval = 1
+;;date = %d-%m-%Y
+;date = %d %b %Y
+;label = %date%
+;label-foreground = ${colors.foreground}
+;format = %{A1:$HOME/.config/eww/scripts/popup calendar &:}<label>%{A}
+
 [module/date]
 type = internal/date
 interval = 1
-date = %d-%m-%Y
-label = %date%
-label-foreground = ${colors.foreground}
-format = %{A1:$HOME/.config/eww/scripts/popup calendar &:}<label>%{A}
+label = %date%  %time%
+;label-padding = 2.5
+label-background =
+date = %a  %d %b %Y
+time = %H:%M:%S
 
 [module/calendar]
 type = custom/text
@@ -236,48 +293,6 @@ date = %H:%M:%S
 label = %date%
 label-foreground = ${colors.foreground}
 
-[module/battery]
-type = internal/battery
-full-t = 99
-time-format = %H:%M
-battery = BAT1
-adapter = ACAD
-format-padding = 1
-format-charging = <animation-charging> <label-charging>
-format-charging-background =
-label-charging = %percentage%%
-format-discharging = <ramp-capacity> <label-discharging>
-format-discharging-background =
-label-discharging = %percentage%%
-format-full = <label-full>
-format-full-prefix = " "
-format-full-prefix-foreground = ${colors.green}
-;format-foreground = ${colors.green}
-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 = 
-ramp-capacity-0-foreground = ${colors.red}
-ramp-capacity-1-foreground = ${colors.red}
-ramp-capacity-foreground   = ${colors.green}
-;ramp-capacity-foreground   = ${colors.foreground}
-bar-capacity-width = 10
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-3 = 
-animation-charging-4 = 
-animation-charging-5 = 
-animation-charging-6 = 
-animation-charging-foreground = ${colors.green}
-animation-charging-framerate = 750
-
 [module/memory]
 type=internal/memory
 interval=5
@@ -326,8 +341,8 @@ base-temperature=20
 warn-temperature=60
 ; Threshold temperature to display warning label (in degrees celsius)
 ; Default: 80
-format-prefix="  "
-format-warn-prefix="  "
+format-prefix="   "
+format-warn-prefix="   "
 format-warn-foreground=${colors.red}
 format-foreground=${colors.foreground}
 format-font=4
@@ -337,22 +352,70 @@ label-foreground=${colors.foreground}
 format = "<label>"
 label-font=2
 
-[module/xbacklight]
-type = internal/xbacklight
-enable-scroll = true
+[module/battery]
+type = custom/script
+exec = $HOME/.scripts/battery.sh
+format-font = 1
+format-prefix = " "
+interval = 10
+;click-right = xfce4-power-manager-settings
 
 [module/backlight]
-inherit = module/xbacklight
 type = internal/backlight
+; Use the following command to list available cards:
+; $ ls -1 /sys/class/backlight/
+; Default: first usable card in /sys/class/backlight (new in version 3.7.0)
 card = intel_backlight
-format-backlight = <label>
-;format-backlight = <ramp-backlight> <label>
-format-padding = 0
-format-prefix = "󰃟"
-format-prefix-forejround = ${colors.foreground}
-;ramp-backlight = %percentage:4%%
-label = %percentage:4%%
-;label-foreground = ${colors.foreground}
+; Use the `/sys/class/backlight/.../actual-brightness` file
+; rather than the regular `brightness` file.
+; New in version 3.6.0
+; Changed in version: 3.7.0: Defaults to true also on amdgpu backlights
+; Default: true
+;use-actual-brightness = true
+; Interval in seconds after which after which the current brightness is read
+; (even if no update is detected).
+; Use this as a fallback if brightness updates are not registering in polybar
+; (which happens if the use-actual-brightness is false).
+; There is no guarantee on the precisio of this timing.
+; Set to 0 to turn off
+; New in version 3.7.0
+; Default: 0 (5 if use-actual-brightness is false)
+;poll-interval = 0
+; Enable changing the backlight with the scroll wheel
+; NOTE: This may require additional configuration on some systems. Polybar will
+; write to `/sys/class/backlight/${self.card}/brightness` which requires polybar
+; to have write access to that file.
+; DO NOT RUN POLYBAR AS ROOT.
+; The recommended way is to add the user to the
+; `video` group and give that group write-privileges for the `brightness` file.
+; See the ArchWiki for more information:
+; https://wiki.archlinux.org/index.php/Backlight#ACPI
+; Default: false
+enable-scroll = true
+; Interval for changing the brightness (in percentage points).
+; New in version 3.7.0
+; Default: 5
+scroll-interval = 10
+; Available tags:
+;   <label> (default)
+;   <ramp>
+;   <bar>
+format = <ramp>
+format-foreground = {colors.foreground}
+; Available tokens:
+;   %percentage% (default)
+label = %percentage:2%%
+label-font=7
+;; Only applies if <ramp> is used
+ramp-0 = 󰃞
+ramp-1 = 󰃝
+ramp-2 = 󰃟
+ramp-3 = 󰃠
+;; Only applies if <bar> is used
+;bar-width = 10
+;bar-indicator = |
+;bar-fill = ─
+;bar-empty = ─
 
 [module/bluetooth]
 type = custom/text
@@ -382,13 +445,14 @@ format-connected-background = ${colors.background}
 format-connected-foreground = ${colors.foreground}
 format-connected-padding = 1
 format-connected = %{A1:$HOME/.scripts/rofi-network-manager.sh:}<ramp-signal> <label-connected>%{A}
-label-connected = "%essid:03:5%/%local_ip% |"
+label-connected = "%essid:03:5%/%local_ip%"
 format-disconnected-background = ${colors.background}
 format-disconnected-foreground = ${colors.foreground}
 format-disconnected-padding = 1
 format-disconnected = %{A1:$HOME/.scripts//rofi-network-manager.sh:}<label-disconnected>%{A}
 ;label-disconnected ="Network Disconnected 󱍢 ......"
-label-disconnected ="󰤮 Network Disconnected"
+;label-disconnected ="    󰤮 Network Disconnected   ......... 󱍢 ..........     "
+label-disconnected ="󰤮  Net Disconnected"
 ramp-signal-0 = "󰤯"
 ramp-signal-1 = "󰤟"
 ramp-signal-2 = "󰤢"
@@ -427,14 +491,15 @@ type = internal/network
 interface-type = wireless
 interval = 3.0
 accumulate-stats = true
-unknown-as-up = true
+;unknown-as-up = true
 format-connected = <label-connected>
 format-disconnected = <label-disconnected>
-label-disconnected = ""
-format-disconnected-prefix = ""
+;label-disconnected = ""
+label-disconnected = "   0 KB/s "
+format-disconnected-prefix = "󰯎"
 format-connected-prefix = "󰯎"
 speed-unit = ""
-label-connected = "%netspeed:4%B/s"
+label-connected = "%netspeed:5%B/s "
 
 [module/upspeed]
 type = internal/network
@@ -458,6 +523,31 @@ format-disconnected-prefix = ""
 format-connected-prefix = ""
 label-connected = " %downspeed:8%"
 
+[module/vpn]
+type = custom/script
+#exec = protonvpn status
+exec = ~/.config/polybar/scripts/vpn.sh
+;tail = true
+interval = 1
+label-font = 6
+format-prefix = " "
+format = <label>
+click-left = sudo protonvpn c -f
+click-right = sudo protonvpn disconnect
+;
+
+[module/gpu-nvidia]
+type = custom/script
+exec = $HOME/.config/polybar/scripts/gpu-nvidia.sh
+interval = 2
+format-font = 2
+format-foreground = #69F0AE
+
+[module/gpu-intel]
+type = custom/script
+#exec = $HOME/.config/polybar/scripts/gpu-intel.sh
+interval = 2
+
 [module/spotify]
 type = custom/script
 tail = true
@@ -466,11 +556,6 @@ format-prefix = " "
 format = <label>
 exec = ~/.config/polybar/scripts/get_spotify_status.sh
 
-[module/tray]
-type = internal/tray
-format-margin = 8px
-tray-spacing = 8px
-
 [module/menu]
 type = custom/text
 content = 󱎂
@@ -499,6 +584,7 @@ click-left=systray
 initial=2
 format-font=2
 format-foreground=${colors.blue}
+;format-foreground=${colors.foreground}
 
 [module/weather]
 type = custom/script
@@ -524,7 +610,8 @@ click-left = pamixer --source 1 -t
 scroll-up = pamixer --source 1 -i 5
 scroll-down = pamixer --source 1 -d 5
 
-; decor
+
+;; decor
 
 [module/sep]
 type = custom/text