Merge updates from recent build
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
;=====================================================
|
||||
; Includes
|
||||
; File Includes
|
||||
;=====================================================
|
||||
|
||||
[section/base]
|
||||
@ -7,32 +7,6 @@ include-file = /home/liveuser/.config/polybar/master.conf
|
||||
include-file = /home/liveuser/.config/polybar/modules.conf
|
||||
|
||||
|
||||
;=====================================================
|
||||
; i3 Bars
|
||||
;=====================================================
|
||||
|
||||
[bar/i3-bar]
|
||||
inherit = bar/master
|
||||
|
||||
; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1
|
||||
monitor =
|
||||
|
||||
modules-left = i3-workspaces menu
|
||||
modules-center = clock
|
||||
modules-right = pkg memory temperature coreuse network volume
|
||||
|
||||
; All available modules (some require configuration in modules.conf)
|
||||
; redshift github filesystem mpd wired-network wireless-network battery menu volume-bar
|
||||
; pkg keyboard memory temperature coreuse network clock volume i3-workspaces workspaces window_switch
|
||||
|
||||
|
||||
;;;;;; Tray is commented out ;;;;;;;;
|
||||
;tray-position = center
|
||||
;tray-padding = 10
|
||||
;tray-background = ${colors.background}
|
||||
;tray-offset-x = 20%
|
||||
|
||||
|
||||
;=====================================================
|
||||
; Openbox Bars
|
||||
;=====================================================
|
||||
@ -43,12 +17,66 @@ inherit = bar/master
|
||||
; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1
|
||||
monitor =
|
||||
|
||||
modules-left = window_switch workspaces menu
|
||||
modules-left = config window_switch workspaces menu
|
||||
modules-center = clock
|
||||
modules-right = pkg memory temperature coreuse network volume
|
||||
|
||||
; All available modules (some require configuration in modules.conf)
|
||||
; redshift github filesystem mpd wired-network wireless-network battery menu volume-bar
|
||||
; redshift github filesystem mpd wired-network wireless-network battery menu volume-bar bspwm
|
||||
; pkg keyboard memory temperature coreuse network clock volume i3-workspaces workspaces window_switch
|
||||
|
||||
|
||||
;;;;;; Tray is commented out ;;;;;;;;
|
||||
;tray-position = center
|
||||
;tray-padding = 10
|
||||
;tray-background = ${colors.background}
|
||||
;tray-offset-x = 20%
|
||||
|
||||
|
||||
|
||||
;=====================================================
|
||||
; i3 Bars
|
||||
;=====================================================
|
||||
|
||||
[bar/i3-bar]
|
||||
inherit = bar/master
|
||||
|
||||
; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1
|
||||
monitor =
|
||||
|
||||
modules-left = config i3-workspaces menu
|
||||
modules-center = clock
|
||||
modules-right = pkg memory temperature coreuse network volume
|
||||
|
||||
; All available modules (some require configuration in modules.conf)
|
||||
; redshift github filesystem mpd wired-network wireless-network battery menu volume-bar bspwm
|
||||
; pkg keyboard memory temperature coreuse network clock volume i3-workspaces workspaces window_switch
|
||||
|
||||
|
||||
;;;;;; Tray is commented out ;;;;;;;;
|
||||
;tray-position = center
|
||||
;tray-padding = 10
|
||||
;tray-background = ${colors.background}
|
||||
;tray-offset-x = 20%
|
||||
|
||||
|
||||
|
||||
;=====================================================
|
||||
; Bspwm Bars
|
||||
;=====================================================
|
||||
|
||||
[bar/bsp-bar]
|
||||
inherit = bar/master
|
||||
|
||||
; Use $ xrandr -q | grep " connected" | cut -d ' ' -f1
|
||||
monitor =
|
||||
|
||||
modules-left = config bspwm menu
|
||||
modules-center = clock
|
||||
modules-right = pkg memory temperature coreuse network volume
|
||||
|
||||
; All available modules (some require configuration in modules.conf)
|
||||
; redshift github filesystem mpd wired-network wireless-network battery menu volume-bar bspwm
|
||||
; pkg keyboard memory temperature coreuse network clock volume i3-workspaces workspaces window_switch
|
||||
|
||||
|
||||
|
@ -2,31 +2,31 @@
|
||||
; Settings & Colors
|
||||
;=====================================================
|
||||
|
||||
[settings]
|
||||
compositing-background = source
|
||||
compositing-foreground = source
|
||||
compositing-overline = source
|
||||
compositing-underline = source
|
||||
compositing-border = source
|
||||
|
||||
screenchange-reload = true
|
||||
throttle-output = 5
|
||||
throttle-output-for = 10
|
||||
throttle-input-for = 30
|
||||
|
||||
; Fallback colors for modules
|
||||
format-foreground = ${colors.foreground}
|
||||
format-background = ${colors.background}
|
||||
|
||||
[colors]
|
||||
background = #ed2b303b
|
||||
foreground = #8FA1B3
|
||||
urgent = #E7816B
|
||||
blue = #6BA4E7
|
||||
pink = #9181E7
|
||||
orange = #FEBE8E
|
||||
purple = #D7AFF9
|
||||
yellow = #F9F1AF
|
||||
background = #2b303b
|
||||
foreground = #c0c5ce
|
||||
urgent = #E7816B
|
||||
blue = #6BA4E7
|
||||
pink = #9181E7
|
||||
orange = #FEBE8E
|
||||
purple = #D7AFF9
|
||||
yellow = #F9F1AF
|
||||
border = #c0c5ce
|
||||
|
||||
[settings]
|
||||
throttle-output = 5
|
||||
throttle-output-for = 10
|
||||
throttle-input-for = 30
|
||||
compositing-background = source
|
||||
compositing-foreground = source
|
||||
compositing-overline = source
|
||||
compositing-underline = source
|
||||
compositing-border = source
|
||||
screenchange-reload = true
|
||||
|
||||
format-foreground = ${colors.foreground}
|
||||
format-background = ${colors.background}
|
||||
|
||||
|
||||
|
||||
;=====================================================
|
||||
@ -34,24 +34,38 @@ yellow = #F9F1AF
|
||||
;=====================================================
|
||||
|
||||
[bar/master]
|
||||
width = 100%
|
||||
height = 28
|
||||
radius = 0.0
|
||||
line-size = 2
|
||||
bottom = false
|
||||
fixed-center = true
|
||||
border-bottom-size = 2
|
||||
padding-left = 0
|
||||
padding-right = 0
|
||||
module-margin-left = 1
|
||||
module-margin-right = 1
|
||||
width = 100%
|
||||
height = 28
|
||||
border-size = 0
|
||||
border-top-size = 0
|
||||
border-bottom-size = 2
|
||||
radius = 0
|
||||
bottom = false
|
||||
line-size = 2
|
||||
font-0 = "DejaVu Sans Mono:size=10:antialias=false;2"
|
||||
|
||||
separator = │
|
||||
foreground = ${colors.foreground}
|
||||
background = ${colors.background}
|
||||
border-color = ${colors.foreground}
|
||||
|
||||
font-0 = "DejaVu Sans Mono:size=10:antialias=false;2"
|
||||
font-1 = "MaterialIcons:size=9:antialias=false;2"
|
||||
font-2 = "icomoon:size=10:antialias=false;2"
|
||||
font-3 = "Ubuntu Nerd Font:size=9:antialias=false;2"
|
||||
offset-x = 0
|
||||
offset-y = 0
|
||||
fixed-center = true
|
||||
|
||||
border-color = ${colors.border}
|
||||
background = ${colors.background}
|
||||
foreground = ${colors.foreground}
|
||||
|
||||
font-1 = "FontAwesome:size=9:antialias=false;2"
|
||||
font-2 = "MaterialIcons:size=9:antialias=false;3"
|
||||
font-3 = "icomoon:size=10:antialias=false;2"
|
||||
font-4 = "Ubuntu Nerd Font:size=9:antialias=false;2"
|
||||
|
||||
module-margin = 0
|
||||
padding-right = 0
|
||||
padding-left = 0
|
||||
separator = │
|
||||
|
||||
click-middle = skippy-xd --activate-window-picker
|
||||
scroll-up = pamixer -i 2
|
||||
scroll-down = pamixer -d 2
|
||||
double-click-left = python /usr/bin/networkmanager_dmenu
|
||||
double-click-middle = skippy-xd --activate-window-picker
|
||||
double-click-right = pavucontrol &
|
||||
|
71
home/.config/polybar/master.conf.template
Normal file
71
home/.config/polybar/master.conf.template
Normal file
@ -0,0 +1,71 @@
|
||||
;=====================================================
|
||||
; Settings & Colors
|
||||
;=====================================================
|
||||
|
||||
[colors]
|
||||
background = {{.Data.bar_background}}
|
||||
foreground = {{.Data.terminal_foreground}}
|
||||
urgent = {{index .Data.terminal_colors 1}}
|
||||
blue = {{index .Data.terminal_colors 4}}
|
||||
pink = {{index .Data.terminal_colors 1}}
|
||||
orange = {{index .Data.terminal_colors 3}}
|
||||
purple = {{index .Data.terminal_colors 5}}
|
||||
yellow = {{index .Data.terminal_colors 3}}
|
||||
border = {{.Data.border_color}}
|
||||
|
||||
[settings]
|
||||
throttle-output = 5
|
||||
throttle-output-for = 10
|
||||
throttle-input-for = 30
|
||||
compositing-background = source
|
||||
compositing-foreground = source
|
||||
compositing-overline = source
|
||||
compositing-underline = source
|
||||
compositing-border = source
|
||||
screenchange-reload = true
|
||||
|
||||
format-foreground = ${colors.foreground}
|
||||
format-background = ${colors.background}
|
||||
|
||||
|
||||
|
||||
;=====================================================
|
||||
; Master Bar
|
||||
;=====================================================
|
||||
|
||||
[bar/master]
|
||||
width = {{.Data.bar_width}}
|
||||
height = {{.Data.bar_height}}
|
||||
border-size = {{.Data.border_all}}
|
||||
border-top-size = {{.Data.border_top}}
|
||||
border-bottom-size = {{.Data.border_bottom}}
|
||||
radius = {{.Data.bar_radius}}
|
||||
bottom = {{.Data.bar_bottom}}
|
||||
line-size = {{.Data.border_pixels}}
|
||||
font-0 = "{{.Data.bar_font0}}"
|
||||
|
||||
|
||||
offset-x = 0
|
||||
offset-y = 0
|
||||
fixed-center = true
|
||||
|
||||
border-color = ${colors.border}
|
||||
background = ${colors.background}
|
||||
foreground = ${colors.foreground}
|
||||
|
||||
font-1 = "FontAwesome:size=9:antialias=false;2"
|
||||
font-2 = "MaterialIcons:size=9:antialias=false;3"
|
||||
font-3 = "icomoon:size=10:antialias=false;2"
|
||||
font-4 = "Ubuntu Nerd Font:size=9:antialias=false;2"
|
||||
|
||||
module-margin = 0
|
||||
padding-right = 0
|
||||
padding-left = 0
|
||||
separator = │
|
||||
|
||||
click-middle = skippy-xd --activate-window-picker
|
||||
scroll-up = pamixer -i 2
|
||||
scroll-down = pamixer -d 2
|
||||
double-click-left = python /usr/bin/networkmanager_dmenu
|
||||
double-click-middle = skippy-xd --activate-window-picker
|
||||
double-click-right = pavucontrol &
|
@ -2,6 +2,23 @@
|
||||
; Modules
|
||||
;=====================================================
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; GoRice Config UI ;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
[module/config]
|
||||
type = custom/script
|
||||
exec = echo ""
|
||||
interval = 5
|
||||
|
||||
label = %output%
|
||||
label-padding = 2
|
||||
format = <label>
|
||||
|
||||
click-left = ~/go/bin/gorice dump i3 ~/.gorice/output.yaml.template; ~/bin/config_ui &
|
||||
click-right = termite "--exec=$HOME/go/bin/gorice edit i3/current" &
|
||||
|
||||
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Openbox Workspaces ;;
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
@ -77,6 +94,57 @@ label-urgent-padding = 1
|
||||
|
||||
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;
|
||||
;;Bspwm Workspaces;;
|
||||
;;;;;;;;;;;;;;;;;;;;
|
||||
[module/bspwm]
|
||||
type = internal/bspwm
|
||||
pin-workspaces = true
|
||||
inline-mode = false
|
||||
enable-click = true
|
||||
enable-scroll = false
|
||||
reverse-scroll = false
|
||||
fuzzy-match = true
|
||||
; ws-icon-[0-9]+ = label;icon
|
||||
; Note that the label needs to correspond with the bspwm workspace name
|
||||
;ws-icon-0 = code;♚
|
||||
;ws-icon-1 = office;♛
|
||||
;ws-icon-2 = graphics;♜
|
||||
;ws-icon-3 = mail;♝
|
||||
;ws-icon-4 = web;♞
|
||||
;ws-icon-default = ♟
|
||||
|
||||
format = <label-state> <label-mode>
|
||||
label-monitor = %name%
|
||||
label-dimmed-foreground = #555
|
||||
label-dimmed-underline = ${bar/top.background}
|
||||
label-dimmed-focused-background = #f00
|
||||
label-focused = %icon% %name%
|
||||
label-focused-foreground = ${colors.blue}
|
||||
label-focused-underline = ${colors.blue}
|
||||
label-occupied = %icon% %name%
|
||||
label-occupied-underline = ${colors.purple}
|
||||
label-urgent = %icon% %name%
|
||||
label-urgent-foreground = ${colors.urgent}
|
||||
label-urgent-underline = ${colors.urgent}
|
||||
label-empty = %icon% %name%
|
||||
|
||||
; The following labels will be used to indicate the layout/mode
|
||||
; for the focused workspace. Requires <label-mode>
|
||||
label-monocle =
|
||||
label-tiled =
|
||||
label-fullscreen =
|
||||
label-floating =
|
||||
label-pseudotiled = P
|
||||
label-locked =
|
||||
label-locked-foreground = ${colors.yellow}
|
||||
label-sticky =
|
||||
label-sticky-foreground = ${colors.purple}
|
||||
label-private =
|
||||
label-private-foreground = ${colors.urgent}
|
||||
|
||||
|
||||
|
||||
;;;;;;;;;;;;;
|
||||
;; Network ;;
|
||||
;;;;;;;;;;;;;
|
||||
@ -86,6 +154,7 @@ exec = $HOME/.config/polybar/scripts/network.sh
|
||||
click-left = networkmanager_dmenu &
|
||||
click-right = networkmanager_dmenu &
|
||||
interval = 1
|
||||
label-padding = 1
|
||||
tail = true
|
||||
|
||||
|
||||
@ -96,7 +165,7 @@ tail = true
|
||||
type = custom/script
|
||||
interval = 5
|
||||
label = "%{A1:skippy-xd:} %{A3:skippy-xd:} %output% %{A} %{A}"
|
||||
exec = echo " "
|
||||
exec = echo ""
|
||||
format = <label>
|
||||
|
||||
|
||||
@ -106,15 +175,20 @@ format = <label>
|
||||
[module/coreuse]
|
||||
type = internal/cpu
|
||||
interval = 1
|
||||
format = <label><ramp-coreload>
|
||||
format = "<label><ramp-coreload> "
|
||||
label = %{A1:termite --exec=htop & disown:} %percentage%% %{A}
|
||||
ramp-coreload-0 = %{T1}%{F#8FA1B3}▂%{F-}%{T-}
|
||||
ramp-coreload-1 = %{T1}%{F#8FA1B3}▃%{F-}%{T-}
|
||||
ramp-coreload-2 = %{T1}%{F#6BA4E7}▄%{F-}%{T-}
|
||||
ramp-coreload-3 = %{T1}%{F#6BA4E7}▅%{F-}%{T-}
|
||||
ramp-coreload-4 = %{T1}%{F#FFFE5D}▆%{F-}%{T-}
|
||||
ramp-coreload-5 = %{T1}%{F#FFFE5D}▇%{F-}%{T-}
|
||||
ramp-coreload-6 = %{T1}%{F#FF5B6C}█%{F-}%{T-}
|
||||
ramp-coreload-0 = %{T1}▂%{T-}
|
||||
ramp-coreload-0-foreground = ${colors.foreground}
|
||||
ramp-coreload-1 = %{T1}▃%{T-}
|
||||
ramp-coreload-1-foreground = ${colors.foreground}
|
||||
ramp-coreload-2 = %{T1}▄%{T-}
|
||||
ramp-coreload-2-foreground = ${colors.yellow}
|
||||
ramp-coreload-3 = %{T1}▅%{T-}
|
||||
ramp-coreload-3-foreground = ${colors.yellow}
|
||||
ramp-coreload-4 = %{T1}▆%{T-}
|
||||
ramp-coreload-4-foreground = ${colors.urgent}
|
||||
ramp-coreload-5 = %{T1}▇%{T-}
|
||||
ramp-coreload-5-foreground = ${colors.urgent}
|
||||
|
||||
;;;;;;;;;
|
||||
;; MEM ;;
|
||||
@ -159,7 +233,7 @@ thermal-zone = 0
|
||||
warn-temperature = 70
|
||||
|
||||
format = <ramp><label>
|
||||
label = %{A1:termite --exec='watch sensors' & disown:} %temperature% %{A}
|
||||
label = %{A1:termite --exec='watch sensors' & disown:} %temperature%%{A}
|
||||
|
||||
ramp-0 = ""
|
||||
ramp-0-foreground = ${colors.blue}
|
||||
@ -183,16 +257,16 @@ type = internal/volume
|
||||
master-mixer = Master
|
||||
label-volume-foreground = ${colors.foreground}
|
||||
label-volume = %{A3:pavucontrol & disown:}%percentage%% %{A}
|
||||
format-volume = <ramp-volume> <label-volume>
|
||||
label-muted = " muted "
|
||||
format-volume = <ramp-volume><label-volume>
|
||||
label-muted = " muted "
|
||||
label-muted-foreground = #888
|
||||
ramp-volume-0 = ""
|
||||
ramp-volume-0 = " "
|
||||
ramp-volume-0-foreground = ${colors.foreground}
|
||||
ramp-volume-1 = ""
|
||||
ramp-volume-1 = " "
|
||||
ramp-volume-1-foreground = ${colors.blue}
|
||||
ramp-volume-2 = ""
|
||||
ramp-volume-2 = " "
|
||||
ramp-volume-2-foreground = ${colors.orange}
|
||||
ramp-volume-3 = ""
|
||||
ramp-volume-3 = " "
|
||||
ramp-volume-3-foreground = ${colors.urgent}
|
||||
|
||||
|
||||
|
@ -5,7 +5,7 @@ icon=" "
|
||||
|
||||
if pgrep -x "compton" > /dev/null
|
||||
then
|
||||
echo "%{F#EFF0F1}$icon"
|
||||
echo "$icon"
|
||||
else
|
||||
echo "%{F#484852}$icon"
|
||||
fi
|
||||
|
@ -33,6 +33,9 @@ echo "WM is $cur_wm... Launching appropriate bars"
|
||||
if [[ $cur_wm == i3 ]]; then # if i3 launch the i3-bar
|
||||
polybar -r --config=$CONF_PATH/config i3-bar &
|
||||
|
||||
elif [[ $cur_wm == bspwm ]]; then # if bspwm launch the bsp-bar
|
||||
polybar -r --config=$CONF_PATH/config bsp-bar &
|
||||
|
||||
else # otherwise we assume openbox
|
||||
polybar -r --config=$CONF_PATH/config openbox-bar &
|
||||
|
||||
|
@ -4,10 +4,10 @@ online=$(ip addr | grep "state UP" | cut -d ":" -f2)
|
||||
|
||||
#connected=""
|
||||
#offline=""
|
||||
connected=" "
|
||||
offline=" "
|
||||
connected=""
|
||||
offline=""
|
||||
if [[ "$online" ]]; then
|
||||
echo %{F#8FA1B3}${connected}
|
||||
echo ${connected}
|
||||
else
|
||||
echo %{F#E7816B}${offline}; sleep 0.6; echo %{F#8FA1B3}${offline}
|
||||
echo ${offline}; sleep 0.6; echo ${connected}
|
||||
fi
|
||||
|
@ -26,7 +26,7 @@ fi
|
||||
|
||||
# OPTIONAL: Append ' ${temp}K' after $icon
|
||||
if [[ -z $temp ]]; then
|
||||
echo "%{F#8FA1B3} $icon " # Greyed out (not running)
|
||||
echo " $icon " # Greyed out (not running)
|
||||
elif [[ $temp -ge 5000 ]]; then
|
||||
echo "%{F#6BA4E7} $icon " # Blue
|
||||
elif [[ $temp -ge 4000 ]]; then
|
||||
|
Reference in New Issue
Block a user