More Polybar changes, launch sequence simplification
This commit is contained in:
parent
435918eac9
commit
7d42e82b19
|
|
@ -1,11 +1,25 @@
|
|||
#! /bin/sh
|
||||
|
||||
# Ensure the primary display is the phone screen
|
||||
# This may not be an issue for you, but it is for me.
|
||||
xrandr --output DSI-1 --primary
|
||||
|
||||
# Start Compositor (optional)
|
||||
#picom -f & > /dev/null 2>&1
|
||||
|
||||
# Start Nitrogen (if that's your thing)
|
||||
#nitrogen --restore
|
||||
|
||||
# Start sxhkd
|
||||
pgrep -x sxhkd > /dev/null || sxhkd &
|
||||
|
||||
# Start polybar
|
||||
$HOME/.config/polybar/launch.sh
|
||||
|
||||
# Enable ten desktops
|
||||
bspc monitor -d I II III IV V VI VII VIII IX X
|
||||
|
||||
# Set border width and window gap
|
||||
bspc config border_width 2
|
||||
bspc config window_gap 12
|
||||
|
||||
|
|
@ -13,8 +27,6 @@ bspc config split_ratio 0.52
|
|||
bspc config borderless_monocle true
|
||||
bspc config gapless_monocle true
|
||||
|
||||
bspc rule -a Gimp desktop='^8' state=floating follow=on
|
||||
bspc rule -a Chromium desktop='^2'
|
||||
bspc rule -a mplayer2 state=floating
|
||||
bspc rule -a Kupfer.py focus=on
|
||||
bspc rule -a Screenkey manage=off
|
||||
# Rules
|
||||
bspc rule -a svkbd sticky=on border=off
|
||||
bspc rule -a Surf state=tiled
|
||||
|
|
|
|||
|
|
@ -4,3 +4,5 @@
|
|||
cp -r ~/.config/bspwm/ .
|
||||
cp -r ~/.config/sxhkd/ .
|
||||
cp -r ~/.config/polybar/ .
|
||||
cp -r ~/.config/sxmo/hooks/ ./sxmo/
|
||||
cp ~/.config/sxmo/sxmo-bspwm-xinit.sh ./sxmo/
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
PERCENTAGESTR=$(upower -i /org/freedesktop/UPower/devices/battery_ip5xxx_battery | grep percentage)
|
||||
echo "${PERCENTAGESTR//[!0-9]/}" > /home/katie/.config/polybar/batt/ip5xxx-battery/
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
[Unit]
|
||||
Description=ip5xxx Battery charge_now Compatability Service
|
||||
|
||||
[Service]
|
||||
User=root
|
||||
ExecStart=ip5xxx_battery.sh
|
||||
Restart=always
|
||||
StartLimitBurst=1000000
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
PERCENTAGESTR=$(upower -i /org/freedesktop/UPower/devices/battery_rk818_battery | grep percentage)
|
||||
echo "${PERCENTAGESTR//[!0-9]/}" > /home/katie/.config/polybar/batt/rk818-battery/
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
[Unit]
|
||||
Description=RK818 Battery charge_now Compatability Service
|
||||
|
||||
[Service]
|
||||
User=root
|
||||
ExecStart=rk818_battery.sh
|
||||
Restart=always
|
||||
StartLimitBurst=1000000
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -73,13 +73,13 @@ font-3 = Monoid Nerd Font Mono:size=12;2
|
|||
font-4 = SauceCodePro Nerd Font:size=18:antialias=false;4
|
||||
font-5 = Material Icons:size=10;2
|
||||
font-6 = unifont:fontformat=truetype:size=8:antialias=false;0
|
||||
|
||||
font-7 = Font Awesome 6 Free:size=10;2
|
||||
|
||||
modules-left = bspwm
|
||||
;modules-center = player-mpris-simple
|
||||
;modules-right = left-bluetooth bluetooth right-bluetooth left-redshift info-redshift-temp right-redshift left-memory memory right-memory left-cpu cpu right-cpu left-temp temperature right-temp left-date date2 right-date
|
||||
modules-center = xwindow
|
||||
modules-right = filesystem pulseaudio memory cpu wlan combobatt temperature date sxmo powermenu
|
||||
modules-right = filesystem pulseaudio memory cpu wireless wlan combobatt temperature date sxmo powermenu
|
||||
;modules-right = pulseaudio
|
||||
|
||||
tray-position = right
|
||||
|
|
@ -128,11 +128,12 @@ font-3 = Monoid Nerd Font Mono:size=12;2
|
|||
font-4 = SauceCodePro Nerd Font:size=18:antialias=false;4
|
||||
font-5 = Material Icons:size=10;2
|
||||
font-6 = unifont:fontformat=truetype:size=8:antialias=false;0
|
||||
font-7 = Font Awesome 6 Free:size=10;2
|
||||
|
||||
|
||||
modules-left = bspwmslim
|
||||
modules-center = xwindow
|
||||
modules-right = wlan combobatt date sxmo powermenu
|
||||
modules-right = wireless wlan combobatt date sxmo powermenu
|
||||
|
||||
tray-position = right
|
||||
tray-padding = 2
|
||||
|
|
@ -178,7 +179,7 @@ interval = 1
|
|||
|
||||
[module/cpu]
|
||||
type = internal/cpu
|
||||
interval = 2
|
||||
interval = 3
|
||||
|
||||
;format-prefix = " "
|
||||
format-prefix = "⏳ "
|
||||
|
|
@ -191,7 +192,7 @@ label-background = ${colors.background}
|
|||
|
||||
[module/memory]
|
||||
type = internal/memory
|
||||
interval = 2
|
||||
interval = 3
|
||||
format-prefix = " "
|
||||
format-prefix-background = ${colors.background}
|
||||
format-prefix-foreground = ${colors.alter2}
|
||||
|
|
@ -202,7 +203,7 @@ label-background = ${colors.background}
|
|||
|
||||
[module/date]
|
||||
type = internal/date
|
||||
interval = 5
|
||||
interval = 3
|
||||
|
||||
date =
|
||||
date-alt = " %Y-%m-%d"
|
||||
|
|
@ -221,7 +222,7 @@ label-background = ${colors.background}
|
|||
|
||||
[module/date2]
|
||||
type = custom/script
|
||||
interval = 5
|
||||
interval = 3
|
||||
|
||||
exec = date +%R" "%a" "%d" "%b" "%Y
|
||||
|
||||
|
|
@ -331,14 +332,14 @@ click-middle = playerctl play-pause 2> /dev/null
|
|||
[module/info-redshift-temp]
|
||||
type = custom/script
|
||||
exec = ~/.scripts/info-redshift-temp.sh
|
||||
interval = 5
|
||||
interval = 3
|
||||
label-background = ${colors.alter1}
|
||||
;format-underline=${colors.underline}
|
||||
|
||||
[module/bluetooth]
|
||||
type = custom/script
|
||||
exec = ~/.scripts/bluetooth.sh
|
||||
interval = 5
|
||||
interval = 3
|
||||
label-background = ${colors.alter2}
|
||||
label-font = 4
|
||||
;format-underline=${colors.underline}
|
||||
|
|
@ -359,7 +360,7 @@ label-foreground = ${colors.background}
|
|||
|
||||
[module/pomo]
|
||||
type = custom/script
|
||||
interval = 1
|
||||
interval = 3
|
||||
exec = pomo status
|
||||
label-background = ${colors.alter1}
|
||||
label-foreground = ${colors.background}
|
||||
|
|
@ -367,7 +368,7 @@ label-foreground = ${colors.background}
|
|||
[module/vpn-nordvpn-status]
|
||||
type = custom/script
|
||||
exec = ~/.scripts/vpn-nordvpn-status.sh
|
||||
interval = 5
|
||||
interval = 3
|
||||
label-background = ${colors.alter2}
|
||||
label-foreground = ${colors.background}
|
||||
|
||||
|
|
@ -515,7 +516,7 @@ label-indicator-underline = ${colors.secondary}
|
|||
|
||||
[module/filesystem]
|
||||
type = internal/fs
|
||||
interval = 25
|
||||
interval = 3
|
||||
|
||||
mount-0 = /
|
||||
|
||||
|
|
@ -556,13 +557,57 @@ bar-volume-empty-foreground = ${colors.foreground-alt}
|
|||
[module/combobatt]
|
||||
type = custom/script
|
||||
exec = ~/.config/polybar/scripts/battery-combined-shell.sh
|
||||
interval = 1
|
||||
interval = 3
|
||||
|
||||
[module/sxmo]
|
||||
type = custom/script
|
||||
exec = ~/.config/polybar/scripts/sxmo.sh
|
||||
interval = 1
|
||||
|
||||
;[module/wireless]
|
||||
;type = internal/network
|
||||
;interface = wwan0
|
||||
;;interface = wlan0
|
||||
;interval = 3.0
|
||||
;format-connected = <ramp-signal> <label-connected>
|
||||
;format-connected-underline=${colors.underline}
|
||||
;label-connected = %essid%
|
||||
;
|
||||
;format-disconnected = <label-disconnected>
|
||||
;format-disconnected-underline = ${colors.alert}
|
||||
;label-disconnected = N/A
|
||||
;label-disconnected-foreground = ${colors.foreground-alt}
|
||||
;
|
||||
;ramp-signal-0 = 1
|
||||
;ramp-signal-1 = 2
|
||||
;ramp-signal-2 = 3
|
||||
;ramp-signal-3 = 4
|
||||
;ramp-signal-4 = 5
|
||||
;ramp-signal-foreground = ${colors.foreground-alt}
|
||||
;
|
||||
;animation-packetloss-0 = ⚠
|
||||
;animation-packetloss-0-foreground = ${colors.alert}
|
||||
;animation-packetloss-0-foreground = ${colors.foreground-alt}
|
||||
;animation-packetloss-1 = " "
|
||||
;animation-packetloss-1-foreground = ${colors.foreground-alt}
|
||||
;; Framerate in milliseconds
|
||||
;animation-packetloss-framerate = 500
|
||||
|
||||
[module/wireless]
|
||||
type = custom/script
|
||||
exec = ~/.config/polybar/scripts/wireless.sh
|
||||
interval = 3.0
|
||||
|
||||
;format = <label>
|
||||
;label = %output%
|
||||
;format = <label-icon> <label-text>
|
||||
;label-icon = %output:0:1:%
|
||||
;label-text = world
|
||||
format-background = ${colors.background}
|
||||
format-foreground = ${colors.foreground}
|
||||
format-underline = ${colors.underline}
|
||||
;label-font = 6
|
||||
|
||||
[module/battery]
|
||||
type = internal/battery
|
||||
battery = rk818-battery
|
||||
|
|
|
|||
|
|
@ -1,140 +0,0 @@
|
|||
#
|
||||
# wm independent hotkeys
|
||||
#
|
||||
|
||||
# terminal emulator
|
||||
#super + Return
|
||||
alt + Return
|
||||
xfce4-terminal
|
||||
|
||||
# program launcher
|
||||
#super + @space
|
||||
alt + @space
|
||||
dmenu_run
|
||||
|
||||
# make sxhkd reload its configuration files:
|
||||
#super + Escape
|
||||
alt + Escape
|
||||
pkill -USR1 -x sxhkd
|
||||
|
||||
#
|
||||
# bspwm hotkeys
|
||||
#
|
||||
|
||||
# quit/restart bspwm
|
||||
ctrl + alt + {q,r}
|
||||
bspc {quit,wm -r}
|
||||
|
||||
# close and kill
|
||||
alt + {_,shift + }\w
|
||||
bspc node -{c,k}
|
||||
|
||||
# alternate between the tiled and monocle layout
|
||||
alt + m
|
||||
bspc desktop -l next
|
||||
|
||||
# send the newest marked node to the newest preselected node
|
||||
alt + y
|
||||
bspc node newest.marked.local -n newest.!automatic.local
|
||||
|
||||
# swap the current node and the biggest window
|
||||
alt + g
|
||||
bspc node -s biggest.window
|
||||
|
||||
#
|
||||
# state/flags
|
||||
#
|
||||
|
||||
# set the window state
|
||||
alt + {t,shift + t,s,f}
|
||||
bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
|
||||
|
||||
# set the node flags
|
||||
alt + ctrl + {m,x,y,z}
|
||||
bspc node -g {marked,locked,sticky,private}
|
||||
|
||||
#
|
||||
# focus/swap
|
||||
#
|
||||
|
||||
# focus the node in the given direction
|
||||
alt + {_,shift + }{h,j,k,l}
|
||||
bspc node -{f,s} {west,south,north,east}
|
||||
|
||||
# focus the node for the given path jump
|
||||
alt + {p,b,comma,period}
|
||||
bspc node -f @{parent,brother,first,second}
|
||||
|
||||
# focus the next/previous window in the current desktop
|
||||
alt + {_,shift + }c
|
||||
bspc node -f {next,prev}.local.!hidden.window
|
||||
|
||||
# focus the next/previous desktop in the current monitor
|
||||
alt + bracket{left,right}
|
||||
bspc desktop -f {prev,next}.local
|
||||
|
||||
# focus the last node/desktop
|
||||
alt + {grave,Tab}
|
||||
bspc {node,desktop} -f last
|
||||
|
||||
# focus the older or newer node in the focus history
|
||||
alt + {o,i}
|
||||
bspc wm -h off; \
|
||||
bspc node {older,newer} -f; \
|
||||
bspc wm -h on
|
||||
|
||||
# focus or send to the given desktop
|
||||
alt + {_,shift + }{1-9,0}
|
||||
bspc {desktop -f,node -d} '^{1-9,10}'
|
||||
|
||||
#
|
||||
# preselect
|
||||
#
|
||||
|
||||
# preselect the direction
|
||||
shift + alt + {h,j,k,l}
|
||||
bspc node -p {west,south,north,east}
|
||||
|
||||
# preselect the ratio
|
||||
shift + alt + {1-9}
|
||||
bspc node -o 0.{1-9}
|
||||
|
||||
# cancel the preselection for the focused node
|
||||
shift + alt + space
|
||||
bspc node -p cancel
|
||||
|
||||
# cancel the preselection for the focused desktop
|
||||
shift + alt + space
|
||||
bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
|
||||
|
||||
#
|
||||
# move/resize
|
||||
#
|
||||
|
||||
# expand a window by moving one of its side outward
|
||||
shift + ctrl + {h,j,k,l}
|
||||
bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
|
||||
|
||||
# contract a window by moving one of its side inward
|
||||
shift + ctrl + alt + {h,j,k,l}
|
||||
bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
|
||||
|
||||
# move a floating window
|
||||
#alt + {Left,Down,Up,Right}
|
||||
shift + ctrl + alt + {Left,Down,Up,Right}
|
||||
bspc node -v {-20 0,0 20,0 -20,20 0}
|
||||
|
||||
#XF86AudioRaiseVolume
|
||||
# amixer set Master 5%+
|
||||
|
||||
#XF86AudioLowerVolume
|
||||
# amixer set Master 5%-
|
||||
|
||||
XF86AudioRaiseVolume
|
||||
sxmo_multikey.sh volup volup_one volup_two volup_three
|
||||
|
||||
XF86AudioLowerVolume
|
||||
sxmo_multikey.sh voldown voldown_one voldown_two voldown_three
|
||||
|
||||
XF86PowerOff
|
||||
sxmo_multikey.sh powerbutton powerbutton_one powerbutton_two powerbutton_three
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
xrandr --output DSI-1 --primary &
|
||||
#nitrogen --restore &
|
||||
#xsettingsd &
|
||||
#picom -f & > /dev/null 2>&1
|
||||
exec bspwm
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
#!/bin/sh
|
||||
# SPDX-License-Identifier: AGPL-3.0-only
|
||||
# Copyright 2022 Sxmo Contributors
|
||||
|
||||
envvars() {
|
||||
export SXMO_WM=dwm
|
||||
# shellcheck disable=SC2086
|
||||
command -v $TERMCMD "" >/dev/null || export TERMCMD="st"
|
||||
command -v "$KEYBOARD" >/dev/null || defaultkeyboard
|
||||
[ -z "$MOZ_USE_XINPUT2" ] && export MOZ_USE_XINPUT2=1
|
||||
}
|
||||
|
||||
defaults() {
|
||||
xmodmap /usr/share/sxmo/appcfg/xmodmap_caps_esc
|
||||
xsetroot -mod 29 29 -fg '#0b3a4c' -bg '#082430'
|
||||
xset s off -dpms
|
||||
for xr in /usr/share/sxmo/appcfg/*.xr; do
|
||||
xrdb -merge "$xr"
|
||||
done
|
||||
[ -e "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources
|
||||
SCREENWIDTH=$(xrandr | grep "Screen 0" | cut -d" " -f 8)
|
||||
SCREENHEIGHT=$(xrandr | grep "Screen 0" | cut -d" " -f 10 | tr -d ",")
|
||||
if [ "$SCREENWIDTH" -lt 1024 ] || [ "$SCREENHEIGHT" -lt 768 ]; then
|
||||
gsettings set org.gtk.Settings.FileChooser window-size "($SCREENWIDTH,$((SCREENHEIGHT / 2)))"
|
||||
fi
|
||||
}
|
||||
|
||||
defaultkeyboard() {
|
||||
if command -v svkbd-mobile-intl >/dev/null; then
|
||||
export KEYBOARD=svkbd-mobile-intl
|
||||
elif command -v svkbd-mobile-plain >/dev/null; then
|
||||
export KEYBOARD=svkbd-mobile-plain
|
||||
else
|
||||
#legacy
|
||||
export KEYBOARD=svkbd-sxmo
|
||||
fi
|
||||
}
|
||||
|
||||
with_dbus() {
|
||||
echo "$DBUS_SESSION_BUS_ADDRESS" > "$XDG_RUNTIME_DIR"/dbus.bus
|
||||
# shellcheck source=configs/appcfg/xinit_template
|
||||
. "$XDG_CONFIG_HOME"/sxmo/xinit
|
||||
exec /usr/bin/bspwm-session.sh
|
||||
}
|
||||
|
||||
start() {
|
||||
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
|
||||
dbus-run-session -- "$0" "with_dbus"
|
||||
else
|
||||
# with_dbus calls exec because dbus-run-session starts it in a
|
||||
# new shell, but we need to keep this shell; start in a subshell
|
||||
( with_dbus )
|
||||
fi
|
||||
}
|
||||
|
||||
cleanup() {
|
||||
sxmo_daemons.sh stop all
|
||||
pkill svkbd
|
||||
pkill dmenu
|
||||
}
|
||||
|
||||
init() {
|
||||
# shellcheck source=scripts/core/sxmo_common.sh
|
||||
. /etc/profile.d/sxmo_init.sh
|
||||
|
||||
_sxmo_load_environments
|
||||
_sxmo_prepare_dirs
|
||||
envvars
|
||||
sxmo_migrate.sh sync
|
||||
|
||||
|
||||
defaults
|
||||
|
||||
# shellcheck disable=SC1090,SC1091
|
||||
. "$XDG_CONFIG_HOME/sxmo/profile"
|
||||
|
||||
start
|
||||
cleanup
|
||||
sxmo_hook_stop.sh
|
||||
}
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
init
|
||||
else
|
||||
"$1"
|
||||
fi
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Name=bspwm (picom'd and sxmo'd)
|
||||
Comment=Binary space partitioning window manager (with picom and sxmo added)
|
||||
Exec=/usr/bin/sxmo-bspwm-xinit.sh
|
||||
Type=Application
|
||||
Loading…
Reference in a new issue