From 9bd863cf696e151d673bd06e4ea588bc1a89dd8d Mon Sep 17 00:00:00 2001 From: kpa28 Date: Tue, 30 Apr 2024 12:45:02 -0700 Subject: [PATCH] fix polybar deprec warnings + refactor --- .config/alacritty/alacritty.toml | 2 +- .config/bspwm/noswallow | 2 +- .config/joshuto/joshuto.toml | 2 +- .config/polybar/config.ini | 114 ++++++++----------------------- .config/polybar/launch.sh | 10 +-- .profile | 4 +- .xinitrc | 3 +- 7 files changed, 41 insertions(+), 96 deletions(-) diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 0afdaf0..a40d9b1 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -12,7 +12,7 @@ import = ["/usr/share/alacritty/themes/everforest_dark.toml"] TERM = "xterm-256color" [font] -size = 12.0 +size = 16.0 normal.family = "monospace" normal.style = "Regular" italic.family = "monospace" diff --git a/.config/bspwm/noswallow b/.config/bspwm/noswallow index 73e526b..101a920 100644 --- a/.config/bspwm/noswallow +++ b/.config/bspwm/noswallow @@ -1,4 +1,4 @@ $TASK_CLIENT $EMAIL_CLIENT -superproductivity +planify tutanota-desktop diff --git a/.config/joshuto/joshuto.toml b/.config/joshuto/joshuto.toml index c49caf6..3a64b9e 100644 --- a/.config/joshuto/joshuto.toml +++ b/.config/joshuto/joshuto.toml @@ -36,7 +36,7 @@ reverse = false [preview] max_preview_size = 2097152 # 2MB -preview_script = "$GOPATH/bin/pistol" +preview_script = "/usr/bin/pistol" # preview_script = "~/.config/joshuto/preview_file.sh" [tab] diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index 35201b8..22d639e 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -21,56 +21,33 @@ secondary = #e60053 linecolor = #FFFFFF linecolorDark = #cccccc -;Top bar -[bar/main] +[bar/top] enable-ipc = true - -;Location -;--------- monitor = ${env:MONITOR:} ;Monitor is set in the launch.sh script because it detect second monitor; ;Normaly you would use something like monitor=eDP-1 - -;Size -;--------- width = 100% height = 36 - -;Suroundings -;-------------- +fixed-center = true +line-size = 3 border-size = 0 border-color = #00000000 padding-left = 3 padding-right = 3 module-margin-left = 1 module-margin-right = 1 - -;Fonts -;------------------ +background = ${colors.background} +foreground = ${colors.foreground} +line-color = ${colors.linecolor} font-0 = Hack Nerd Font:pixelsize=18;2 font-1 = Hack Nerd Font:pixelsize=40;6 font-2 = fixed:pixelsize=18;2 -; Use '%{T-}' for the default font (font-0) -; If no font is specified, polybar will iterate until the first valid one is found. - -;Misc -;------------ -fixed-center = true -line-size = 3 modules-left = powermenu date weather airinfo modules-center = bspwm modules-right = spxprice adaprice -tray-position = right -tray-padding = 1 - -;Color -;------------ -background = ${colors.background} -foreground = ${colors.foreground} -line-color = ${colors.linecolor} [bar/bottom] -inherit = bar/main +inherit = bar/top bottom=true modules-left = battery temperature volume modules-center = tempcpu memory cpu tempgpu memgpu pctutilgpu @@ -78,24 +55,22 @@ modules-center = tempcpu memory cpu tempgpu memgpu pctutilgpu modules-right = network updates-pacman-yay [bar/secondary] -inherit = bar/main +inherit = bar/top monitor = ${env:MONITOR} - - -;Misc -;------------ fixed-center = true line-size = 3 modules-left = modules-center = bspwm modules-right = date powermenu -tray-position = right -tray-padding = 1 ;-----------------; ; Builtin Modules ; ;-----------------; +[module/tray] +type = internal/tray +tray-padding = 1 + [module/bspwm] type = internal/bspwm pin-workspaces = true @@ -104,9 +79,20 @@ enable-click = true enable-scroll = true reverse-scroll = true fuzzy-match = false - -format = label-monitor = %name% +label-focused = [%icon%] +label-occupied = %icon% +label-urgent = <%icon%> +label-focused-foreground = ${colors.linecolor} +label-occupied-foreground = ${colors.linecolorDark} +label-urgent-foreground = ${colors.linecolorDark} +label-focused-padding = 0 +label-occupied-padding = 0 +label-urgent-padding = 0 +label-empty = +label-separator = | +label-separator-padding = 0.6 +format = ws-icon-0 = 1;%{T1}1%{T-} ws-icon-1 = 2;%{T1}2%{T-} ws-icon-2 = 3;%{T1}3%{T-} @@ -119,24 +105,6 @@ ws-icon-8 = 9;%{T1}9%{T-} ws-icon-9 = 0;%{T1}0%{T-} ws-icon-default = %{T1}?%{T-} -label-focused = [%icon%] -label-focused-foreground = ${colors.linecolor} -label-focused-padding = 0 - -label-occupied = %icon% -label-occupied-foreground = ${colors.linecolorDark} -label-occupied-padding = 0 - -label-urgent = <%icon%> -label-urgent-foreground = ${colors.linecolorDark} -label-urgent-padding = 0 - -label-empty = - -label-separator = | -label-separator-padding = 0.6 - - [module/date] type = internal/date date = %m-%d-%Y% @@ -146,7 +114,6 @@ time-alt = %l:%M %p format =