From 7d42e82b198930b335d25981743b96a06237e38e Mon Sep 17 00:00:00 2001 From: Katie Date: Tue, 28 Jun 2022 03:50:26 -0500 Subject: [PATCH] More Polybar changes, launch sequence simplification --- .config/bspwm/bspwmrc | 22 ++- .config/copyconfigs.sh | 2 + .config/polybar/batt/ip5xxx_battery.sh | 4 - .../batt/ip5xxx_charge_now_compat.service | 11 -- .config/polybar/batt/rk818_battery.sh | 4 - .../batt/rk818_charge_now_compat.service | 11 -- .config/polybar/config.ini | 71 +++++++-- .config/sxhkd/sxhkdrc.save | 140 ------------------ bin/bspwm-session.sh | 7 - bin/sxmo-bspwm-xinit.sh | 86 ----------- xsessions/bspwm.desktop | 5 - 11 files changed, 77 insertions(+), 286 deletions(-) delete mode 100755 .config/polybar/batt/ip5xxx_battery.sh delete mode 100644 .config/polybar/batt/ip5xxx_charge_now_compat.service delete mode 100755 .config/polybar/batt/rk818_battery.sh delete mode 100644 .config/polybar/batt/rk818_charge_now_compat.service delete mode 100644 .config/sxhkd/sxhkdrc.save delete mode 100755 bin/bspwm-session.sh delete mode 100755 bin/sxmo-bspwm-xinit.sh delete mode 100644 xsessions/bspwm.desktop diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 1aed34d..96b46ad 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -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 diff --git a/.config/copyconfigs.sh b/.config/copyconfigs.sh index c497f28..822af2e 100755 --- a/.config/copyconfigs.sh +++ b/.config/copyconfigs.sh @@ -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/ diff --git a/.config/polybar/batt/ip5xxx_battery.sh b/.config/polybar/batt/ip5xxx_battery.sh deleted file mode 100755 index 62db9bf..0000000 --- a/.config/polybar/batt/ip5xxx_battery.sh +++ /dev/null @@ -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/ diff --git a/.config/polybar/batt/ip5xxx_charge_now_compat.service b/.config/polybar/batt/ip5xxx_charge_now_compat.service deleted file mode 100644 index b47cdca..0000000 --- a/.config/polybar/batt/ip5xxx_charge_now_compat.service +++ /dev/null @@ -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 diff --git a/.config/polybar/batt/rk818_battery.sh b/.config/polybar/batt/rk818_battery.sh deleted file mode 100755 index b20e397..0000000 --- a/.config/polybar/batt/rk818_battery.sh +++ /dev/null @@ -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/ diff --git a/.config/polybar/batt/rk818_charge_now_compat.service b/.config/polybar/batt/rk818_charge_now_compat.service deleted file mode 100644 index 36f064b..0000000 --- a/.config/polybar/batt/rk818_charge_now_compat.service +++ /dev/null @@ -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 diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index 4b62a9e..9514b42 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -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 = +;format-connected-underline=${colors.underline} +;label-connected = %essid% +; +;format-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 =