diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/bg | bin | 1170451 -> 6977835 bytes | |||
| -rwxr-xr-x | config/bspwm/bspwmrc | 49 | ||||
| -rw-r--r-- | config/gtk-3.0/bookmarks | 1 | ||||
| -rw-r--r-- | config/polybar/config | 192 | ||||
| -rwxr-xr-x | config/polybar/launch.sh | 19 | ||||
| -rw-r--r-- | config/sxhkd/sxhkdrc | 8 | ||||
| -rw-r--r-- | config/vim/vimrc | 2 |
7 files changed, 126 insertions, 145 deletions
| Binary files differ diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index febf406..a9f1bb8 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -1,41 +1,34 @@ #!/bin/sh -setup=1 +setup=0 -COLOR_BACKGROUND="#151515" -COLOR_PRIMARY="#f58f44" -COLOR_SECONDARY="#5977b3" +COLOR_BACKGROUND="#191919" +COLOR_PRIMARY="#fefefe" +COLOR_SECONDARY="#f58f44" xsetroot -cursor_name left_ptr & xrdb ~/.Xdefaults -bash $HOME/.config/xrandr.xi.sh - -if [ "$setup" = "0" ]; then - bspc monitor DP-0 -n A - bspc monitor A -d a1 a2 a3 a4 a5 a6 a7 a8 a9 - bspc monitor DP-3 -n B - bspc monitor B -d b1 b2 b3 b4 b5 b6 b7 b8 b9 - bspc monitor DP-4 -n C - bspc monitor C -d c1 c2 c3 c4 c5 c6 c7 c8 c9 - bspc monitor HDMI-0 -n D - bspc monitor D -d d1 d2 -else - bspc monitor DP-3 -n A - bspc monitor A -d a1 a2 a3 a4 a5 a6 a7 a8 a9 - bspc monitor DP-1 -n B - bspc monitor B -d b1 b2 b3 b4 b5 b6 b7 b8 b9 - bspc monitor DP-2 -n C - bspc monitor C -d c1 c2 c3 c4 c5 c6 c7 c8 c9 - bspc monitor HDMI-1 -n D - bspc monitor D -d d1 d2 -fi pgrep -x sxhkd > /dev/null || sxhkd & -pgrep -x picom > /dev/null || picom & pgrep -x xss-lock > /dev/null || xss-lock slock & +pgrep -x bg.sh > /dev/null || $HOME/.scripts/bg.sh > /dev/null & -$HOME/.config/polybar/launch.sh -$HOME/.scripts/bg.sh +[ -f "$HOME/.config/xrandr.sh" ] && . $HOME/.config/xrandr.sh + +primary=$(bspc query --monitors -m primary) +set -- a b c d e f g h i j k l m n o +for m in $primary $(bspc query -M | grep -v $primary); do + echo "adding monitor $m as $1" + bspc monitor $m -n $1 + shift 1 +done + +for m in $(bspc query -M --names); do + bspc monitor $m -d ${m}1 ${m}2 ${m}3 ${m}4 ${m}5 ${m}6 ${m}7 ${m}8 ${m}9 +done + + +$HOME/.config/polybar/launch.sh & bspc config border_width 1 bspc config window_gap 0 diff --git a/config/gtk-3.0/bookmarks b/config/gtk-3.0/bookmarks index 47fde0d..d741357 100644 --- a/config/gtk-3.0/bookmarks +++ b/config/gtk-3.0/bookmarks @@ -1,3 +1,4 @@ +file:///home/david/hd1/important file:///home/david/docs docs file:///home/david/pics pics file:///home/david/dl dl diff --git a/config/polybar/config b/config/polybar/config index e7d4f5c..b28e8ea 100644 --- a/config/polybar/config +++ b/config/polybar/config @@ -1,16 +1,18 @@ [pos] -offsetx = 24 -offsety = 24 +offsetx = 24 +offsety = 24 [color] -bg = #191919 -bga = #191919 -fg1 = #f58d44 -fg2 = #5f819d +bg = #191919 +bga = #191919 +fg4= #f58d44 +fg2 = #5f819d +fg3 = #373b41 +fg1 = #fefefe [bar/base] -monitor = ${env:MONITOR} +monitor = ${env:MONITOR} enable-ipc = true font-0 = mononoki:style=Regular:pixelsize=11;3 @@ -23,33 +25,33 @@ font-5 = Noto Sans Mono CJK TC:style=Medium,Regular;pixelsize height = 25 background = ${color.bga} -module-margin = 1 +module-margin = 1 wm-restack = bspwm radius = 0 foreground = ${color.fg1} -padding-right = 1 +padding-right = 1 [bar/wsonly] -inherit = bar/base -width = 100% +inherit = bar/base +width = 100% modules-left = workspaces -modules-right = time +modules-right = time [bar/ws] inherit = bar/base width = 100% offset-x = 0 modules-left = workspaces xwindow -modules-right = mpd temperature memory wlan battery pulseaudio microphone time -tray-position = right -background = ${color.bga} -border-size = 0 -fg = ${color.fg1} +modules-right = mpd temperature memory wlan battery pulseaudio microphone time +tray-position = right +background = ${color.bga} +border-size = 0 +fg = ${color.fg1} [module/wsnumber] -type = custom/script +type = custom/scrip80 exec = bspc query -D -d focused --names tail = true interval = 0 @@ -60,27 +62,25 @@ format-padding = 0 [module/xwindow] type = internal/xwindow -label = %title:0:40:% +label = %title:0:80:% [module/workspaces] -type = internal/xworkspaces +type = internal/xworkspaces -pin-workspaces = true +pin-workspaces = true -enable-click = true -enable-scroll = true +enable-click = true +enable-scroll = true -format = <label-state> -format-padding = 0 -label-monitor = %name% -label-active = %{T2}雷%{T-} -label-active-padding = 1 +format = <label-state> +format-padding = 0 +label-monitor = %name% +label-active = %{T2}雷%{T-} +label-active-padding = 1 label-occupied = %{T2}ﲭ%{T-} label-occupied-padding = 1 label-empty = %{T2}ﱤ%{T-} label-empty-padding = 1 -label-urgent = %{T2}ﲭ%{T-} -label-urgent-padding = 1 [module/time] @@ -96,26 +96,26 @@ type = internal/mpd host = 127.0.0.1 port = 6600 -format-online = <label-song> <icon-prev> <toggle> <icon-next> <bar-progress> -label-song = %title% +format-online = <label-song> <icon-prev> <toggle> <icon-next> <bar-progress> +label-song = %title% -bar-progress-width = 12 -bar-progress-indicator = | -bar-progress-fill = ─ -bar-progress-empty = ─ +bar-progress-width = 12 +bar-progress-indicator = | +bar-progress-fill = ─ +bar-progress-empty = ─ format-online-padding = 0 format-offline-padding = 0 -label-song-maxlen = 40 +label-song-maxlen = 80 label-song-ellipsis = true -icon-play = -bar-empty = ─ -icon-pause = -icon-prev = -icon-next = +icon-play = +bar-empty = ─ +icon-pause = +icon-prev = +icon-next = [module/pulseaudio] @@ -133,71 +133,71 @@ ramp-volume-2 = "" label-muted = "%{T3} %{T-}--%" [module/microphone] -type = custom/script -exec = pactl list sources | grep -qi 'Mute: yes' && echo "" || echo "" -interval = 1 -click-left = pactl list sources | grep -qi 'Mute: yes' && pactl set-source-mute 2 false || pactl set-source-mute 2 true +type = custom/script +exec = pactl list sources | grep -qi 'Mute: yes' && echo "" || echo "" +interval = 1 +click-left = pactl list sources | grep -qi 'Mute: yes' && pactl set-source-mute 2 false || pactl set-source-mute 2 true [module/vpn] -type = custom/script -exec = echo vpn -exec-if = pgrep -x openvpn -interval = 5 -format-underline = #268bd2 -format-prefix = "🖧 " -format-prefix-foreground = #5b +type = custom/script +exec = echo vpn +exec-if = pgrep -x openvpn +interval = 5 +format-underline = #268bd2 +format-prefix = "🖧 " +format-prefix-foreground = #5b [module/temperature] -type = custom/script -exec = sensors | awk '/^Tctl:/ { print substr($2, 2) }' -format-prefix = " " -interval = 1 +type = custom/script +exec = sensors | awk '/^Tctl:/ { print substr($2, 2) }' +format-prefix = " " +interval = 1 [module/memory] -type = custom/script -exec = free -h | awk '/^Mem:/ {print $3 "/" $2}' -interval = 1 -format-prefix = "力 " +type = custom/script +exec = free -h | awk '/^Mem:/ {print $3 "/" $2}' +interval = 1 +format-prefix = "力 " [module/battery] -type = internal/battery -full-at = 99 -battery = BAT1 -adapter = ADP1 - -poll-interval = 3 -time-format = %H:%M - -format-charging = <animation-charging> <label-charging> -format-discharging = <ramp-capacity> <label-discharging> - -label-charging = %percentage%% -label-discharging = %percentage%% -label-full = %percentage%% - -ramp-capacity-0 = -ramp-capacity-1 = -ramp-capacity-2 = -ramp-capacity-3 = -ramp-capacity-4 = - -animation-charging-0 = -animation-charging-1 = -animation-charging-2 = -animation-charging-3 = -animation-charging-4 = +type = internal/battery +full-at = 99 +battery = BAT1 +adapter = ADP1 + +poll-interval = 3 +time-format = %H:%M + +format-charging = <animation-charging> <label-charging> +format-discharging = <ramp-capacity> <label-discharging> + +label-charging = -%percentage%% +label-discharging = -%percentage%% +label-full = %percentage%% + +ramp-capacity-0 = +ramp-capacity-1 = +ramp-capacity-2 = +ramp-capacity-3 = +ramp-capacity-4 = + +animation-charging-0 = +animation-charging-1 = +animation-charging-2 = +animation-charging-3 = +animation-charging-4 = animation-charging-framerate = 750 [module/network] -type = internal/network -interface = wlan0 -udspeed-minwidth = 5 -accumulate-stats = true -unknown-as-up = true -format-connected = <label-connected> -format-disconnected = <label-disconnected> +type = internal/network +interface = wlan0 +udspeed-minwidth = 5 +accumulate-stats = true +unknown-as-up = true +format-connected = <label-connected> +format-disconnected = <label-disconnected> -format-packetloss = <label-connected> +format-packetloss = <label-connected> -label-connected = %essid% +label-connected = %essid% diff --git a/config/polybar/launch.sh b/config/polybar/launch.sh index 01e4b17..33b6531 100755 --- a/config/polybar/launch.sh +++ b/config/polybar/launch.sh @@ -11,14 +11,11 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 0.1; done #MONITOR=DP-0 polybar --reload wsonly & -export MONITOR=DP-1 -polybar wsonly & - -export MONITOR=DP-2 -polybar wsonly & - -export MONITOR=HDMI-1 -polybar wsonly & - -export MONITOR=DP-3 -polybar ws & +polybar -m | while read -r mon; do + export MONITOR=$(echo $mon | cut -d: -f1) + echo $mon | grep -q "(primary)" && { + polybar ws & + } || { + polybar wsonly & + } +done diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc index 7f87bbd..17067d0 100644 --- a/config/sxhkd/sxhkdrc +++ b/config/sxhkd/sxhkdrc @@ -114,12 +114,6 @@ super + ctrl + alt + c super + shift + Return iocane -i -# switch monitor modes -super + apostrophe - $HOME/.scripts/bg.sh ; $HOME/.config/xrandr.sh -super + shift + apostrophe - $HOME/.scripts/bg.sh ; $HOME/.config/xrandr.alt.sh - # switch monitor input sources ctrl + super + apostrophe ddc-switch-inputs 1 @@ -260,8 +254,6 @@ super + alt + {_,shift + }{1,2,3,4,5,6,7,8,9} bspc {desktop -f,node -d} '{b1,b2,b3,b4,b5,b6,b7,b8,b9}' super + ctrl + {_,shift + }{1,2,3,4,5,6,7,8,9} bspc {desktop -f,node -d} '{c1,c2,c3,c4,c5,c6,c7,c8,c9}' -super + alt + ctrl + {_,shift + }{1,2} - bspc {desktop -f,node -d} '{d1,d2}' #Toggle between vertical and horizontal split diff --git a/config/vim/vimrc b/config/vim/vimrc index 0e1b77b..15d3cc4 100644 --- a/config/vim/vimrc +++ b/config/vim/vimrc @@ -25,8 +25,6 @@ inoremap ( ()<ESC>ha inoremap <C-space> <C-n> -nnoremap <S-J> <C-E> -nnoremap <S-K> <C-Y> nnoremap <C-J> <C-W><C-J> nnoremap <C-K> <C-W><C-K> |