From 7b12211aa7c25b795d1827b3706d7021308a6b23 Mon Sep 17 00:00:00 2001 From: Matthew Reschke Date: Wed, 14 May 2025 17:36:14 -0600 Subject: [PATCH] Tweaks --- ac-adaptive/config.ini | 4 +- ac-adaptive/modules.ini | 9 +- qpanels/config.ini | 332 +++++++++++++++++++++++++++++----------- shared/modules.ini | 2 +- 4 files changed, 253 insertions(+), 94 deletions(-) diff --git a/ac-adaptive/config.ini b/ac-adaptive/config.ini index 0ba84d4..5dc0480 100644 --- a/ac-adaptive/config.ini +++ b/ac-adaptive/config.ini @@ -30,7 +30,7 @@ include-file = ./decor.ini ; This is for the primary monitor, the launch.sh script uses this bar for primary monitor only ; the modules-right includes the tray for primary monitor only! inherit = bar/main -modules-right = 2RD ethernet 3RD battery 4RD volume 5RD date 6RD tray 7RD sysmenu sepR +modules-right = i3 2RD ethernet 3RD battery 4RD volume 5RD date 6RD tray 7RD sysmenu sepR [bar/main] @@ -148,7 +148,7 @@ font-3 = "Symbols Nerd Font:size=10;3" modules-left = sepL menu 1LD workspaces2 2LD cpu 3LD memory 4LD filesystem 5LD mpd #modules-center = mpd i3 modules-center = workspace_name -modules-right = 2RD ethernet 3RD battery 4RD volume 5RD date 6RD 7RD sysmenu sepR +modules-right = i3 2RD ethernet 3RD battery 4RD volume 5RD date 6RD 7RD sysmenu sepR diff --git a/ac-adaptive/modules.ini b/ac-adaptive/modules.ini index f0de27d..aed2d7b 100644 --- a/ac-adaptive/modules.ini +++ b/ac-adaptive/modules.ini @@ -112,8 +112,13 @@ full-at = 99 ; Use the following command to list batteries and adapters: ; $ ls -1 /sys/class/power_supply/ -battery = ${system.sys_battery} -adapter = ${system.sys_adapter} +; battery = ${system.sys_battery} +; adapter = ${system.sys_adapter} + +# NOTE, ohmyi3 vars are not merged here +#battery = {{ battery_device }} +battery = BAT0 +adapter = AC ; If an inotify event haven't been reported in this many ; seconds, manually poll for new values. diff --git a/qpanels/config.ini b/qpanels/config.ini index 48bc7b5..8a6fbad 100644 --- a/qpanels/config.ini +++ b/qpanels/config.ini @@ -56,7 +56,7 @@ monitor-strict = false override-redirect = false ; Put the bar at the bottom of the screen -bottom = true +bottom = false ; Prefer fixed center position for the `modules-center` block ; When false, the center position will be based on the size of the other blocks. @@ -66,7 +66,7 @@ fixed-center = true ; the percentage can optionally be extended with a pixel offset like so: ; 50%:-10, this will result in a width or height of 50% minus 10 pixels width = 100% -height = 22 +height = 28 ; Offset defined as pixel value (e.g. 35) or percentage (e.g. 50%) ; the percentage can optionally be extended with a pixel offset like so: @@ -111,19 +111,19 @@ radius-bottom = 0.0 ; the border is placed withing this area. So you effectively only have the ; following horizontal space on the bar: ; width - border-right-size - border-left-size -border-size = 1 -border-color = ${color.bg} +;;border-size = 2 +;;border-color = ${color.ac} ; Number of spaces to add at the beginning/end of the bar ; Individual side values can be defined using: ; padding-{left,right} -padding = 0 +padding = 3 ; Number of spaces to add before/after each module ; Individual side values can be defined using: ; module-margin-{left,right} -module-margin-left = 0 -module-margin-right = 1 +module-margin-left = 3 +module-margin-right = 3 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ @@ -135,60 +135,24 @@ module-margin-right = 1 ; font-3 = FontAwesome:size=10 ; See the Fonts wiki page for more details -; 1111 -; Main font (clock, workspace num, volume bars) -; also affects separator spacing (blanks get larger) -; font-0 = "Noto Sans:size=9;4" -; font-0 = "Iosevka Nerd Font:size=10;4" -font-0 = "MesloLGS NF:size=9;3" -; font-0 = "Hack Nerd Font:size=9;3" -; font-0 = "JetBrains Mono Font:size=9;3" +font-0 = "Noto Sans:size=9:weight:bold;3" +font-1 = "Iosevka Nerd Font:size=12;3" -; 2222 -; Right icons (switch theme, wifi, battery) -font-1 = "icomoon\\-feather:size=10;4" -; font-1 = "MesloLGS NF:size=9;3" -; 3333 -; Left icons like menu, terminal, firefox, folder, settings... (12) -; font-2 = "Iosevka Nerd Font:size=14;3" font-2 = "MesloLGS NF:size=14;3" -; font-2 = "Hack Nerd Font:size=14;3" -; font-2 = "JetBrains Mono Font:size=14;3" -; font-2 = "NotoSansMono Nerd Font:size=12;3" - -; 4444 -; ?? (8) -; some things use font 4 like /batter module, label-discharging-font = 4 (starts on 1) -; font-3 = "Noto Sans:size=8;4" font-3 = "MesloLGS NF:size=8;3" -; font-3 = "Hack Nerd Font:size=8;3" -; font-3 = "JetBrains Mono Nerd Font:size=8;3" - -; 5555 -; Even smaller for larger glips -; Used for batter charging animation glyph -; use x-font = 5 font-4 = "MesloLGS NF:size=7;2" -# forest for small volume -# font-0 = "Iosevka Nerd Font:size=10;4" -# font-1 = "Iosevka Nerd Font:size=10;3" -# font-2 = "feather:size=12;3" - - -;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ; Modules are added to one of the available blocks ; modules-left = cpu ram ; modules-center = xwindow xbacklight ; modules-right = ipc clock -modules-left = menu settings htop taskmanager bashtop files web web2 term editor notepad calc spotify -; modules-center = memory cpu -; alsa volume brightness title colorpicker -modules-right = i3 cpu memory style workspaces volume_bar network battery date powermenu +modules-left = menu +modules-center = date +modules-right = i3 workspaces style alsa network battery settings powermenu ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ @@ -294,9 +258,6 @@ cursor-scroll = ;;scroll-up = i3-msg workspace next_on_output ;;scroll-down = i3-msg workspace prev_on_output - - - ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ;; Application Settings @@ -341,8 +302,7 @@ compositing-border = over ; If set to true the bar can be transparent without a compositor. pseudo-transparency = false - - +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ;; ┌────────────────────────────────────────────────────────────┐ ;; │░█▀█░█▀█░█░░░█░█░█▀▄░█▀█░█▀▄░░░░░░░░░█▀▀░█▀█░█░░░█▀█░█▀▄░█▀▀│ @@ -350,13 +310,13 @@ pseudo-transparency = false ;; │░▀░░░▀▀▀░▀▀▀░░▀░░▀▀░░▀░▀░▀░▀░░░░▀░░░░▀▀▀░▀▀▀░▀▀▀░▀▀▀░▀░▀░▀▀▀│ ;; │░Created░By░Aditya░Shakya░@adi1090x░░░░░░░░░░░░░░░░░░░░░░░░░│ ;; └────────────────────────────────────────────────────────────┘ +;; +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ [color] ;; Active Colors -bg = #59000000 -bg-alt = #1A000000 -;;bg = #072919 +bg = #000000 fg = #EAEAEA fg-alt = #9C9C9C @@ -386,8 +346,7 @@ brown = #6d4c41 grey = #757575 blue-gray = #546e7a - - +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ ;; ┌────────────────────────────────────────────────────────────────┐ ;; │░█▀█░█▀█░█░░░█░█░█▀▄░█▀█░█▀▄░░░░░░░░░█▄█░█▀█░█▀▄░█░█░█░░░█▀▀░█▀▀│ @@ -395,50 +354,245 @@ blue-gray = #546e7a ;; │░▀░░░▀▀▀░▀▀▀░░▀░░▀▀░░▀░▀░▀░▀░░░░▀░░░░▀░▀░▀▀▀░▀▀░░▀▀▀░▀▀▀░▀▀▀░▀▀▀│ ;; │░Created░By░Aditya░Shakya░@adi1090x░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│ ;; └────────────────────────────────────────────────────────────────┘ +;; +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ + + +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ [module/menu] type = custom/text -content = "%{T3}%{T-}" -content-foreground = ${color.green} -content-background = ${color.bg-alt} -content-padding = 2 -click-left = ~/.config/polybar/qpanels/scripts/launcher.sh --deepin -click-right = ~/.config/polybar/qpanels/scripts/launcher.sh --deepin +content = Applications +;;content-background = ${color.bg} +content-foreground = ${color.fg} +;;content-padding = 4 +click-left = ~/.config/polybar/qpanels/scripts/launcher.sh --gnome +click-right = ~/.config/polybar/qpanels/scripts/launcher.sh --gnome ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ [module/powermenu] type = custom/text -; content =  -;content = "%{T3}%{T-}" -;content = "%{T3}襤%{T-}" content = 襤 -content-font = 3 +;;content-background = ${color.bg} content-foreground = ${color.fg} -content-background = ${color.bg-alt} -content-padding = 1 -click-left = ~/.config/polybar/qpanels/scripts/powermenu.sh --deepin -click-right = ~/.config/polybar/qpanels/scripts/powermenu.sh --deepin +;;content-padding = 4 +click-left = ~/.config/polybar/qpanels/scripts/powermenu.sh --gnome +click-right = ~/.config/polybar/qpanels/scripts/powermenu.sh --gnome ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ [module/style] type = custom/text -; content =  -; content =  -; content = "%{T3}%{T-}" -; content = "%{T3}%{T-}" -; content = "%{T3}%{T-}" -; content = "%{T3}%{T-}" -; content = "%{T3}%{T-}" -;content = "%{T3}%{T-} " -;content = "%{T3}%{T-} " -;content = 漣 -content = 頋 -content-font = 3 -content-padding = 1 -content-foreground = ${color.grey} -click-left = ~/.config/polybar/qpanels/scripts/style-switch.sh --deepin -click-right = ~/.config/polybar/qpanels/scripts/style-switch.sh --deepin +#content = פֿ +content =  +click-left = ~/.config/polybar/qpanels/scripts/style-switch.sh --gnome +click-right = ~/.config/polybar/qpanels/scripts/style-switch.sh --gnome + +;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ + + + + + + +[module/alsa] +type = internal/alsa + +; You can find the different card numbers in `/proc/asound/cards` +;;master-soundcard = default +;;speaker-soundcard = default +;;headphone-soundcard = default + +; Default: Master +;;master-mixer = Master + +; Optionally define speaker and headphone mixers +; Default: none +;;speaker-mixer = Speaker +; Default: none +;;headphone-mixer = Headphone + +; Default: 5 +;;interval = 5 + +; Available tags: +; (default) +; +; +format-volume = + +; Available tags: +; (default) +; +; +;format-muted = + +; Available tokens: +; %percentage% (default) +label-volume = %percentage%% + +; Available tokens: +; %percentage% (default +label-muted = ﱝ +label-muted-foreground = ${color.fg-alt} + +ramp-volume-0 =  +ramp-volume-1 =  +ramp-volume-2 =  +ramp-volume-3 =  + +click-right = pavucontrol & + +; ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ + +; [module/battery] +; type = internal/battery + +; full-at = 99 + +; ; $ ls -1 /sys/class/power_supply/ +; battery = BAT1 +; adapter = ACAD + +; poll-interval = 2 +; time-format = %H:%M + +; ; Available tags: +; ; (default) +; ; +; ; +; ; +; format-charging = + +; ; Available tags: +; ; (default) +; ; +; ; +; ; +; format-discharging = + +; ; Available tags: +; ; (default) +; ; +; ; +; ;format-full = + +; ; Available tokens: +; ; %percentage% (default) +; ; %time% +; ; %consumption% (shows current charge rate in watts) +; label-charging = %percentage%% + +; ; Available tokens: +; ; %percentage% (default) +; ; %time% +; ; %consumption% (shows current discharge rate in watts) +; label-discharging = %percentage%% + +; ; Available tokens: +; ; %percentage% (default) +; ;label-full = Fully Charged +; label-full =  +; label-full-foreground = ${color.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 =  + +; animation-charging-0 =  +; animation-charging-1 =  +; animation-charging-2 =  +; animation-charging-3 =  +; animation-charging-4 =  +; animation-charging-5 =  +; animation-charging-6 =  + +; ; Framerate in milliseconds +; animation-charging-framerate = 750 + +; ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_ + +; [module/date] +; type = internal/date + +; interval = 1.0 + +; time = %a %I:%M %p +; time-alt = %B %d, %Y + +; format =