diff --git a/.config/concession/cleanups/bspwm b/.config/concession/cleanups/bspwm deleted file mode 100644 index fa619ab9..00000000 --- a/.config/concession/cleanups/bspwm +++ /dev/null @@ -1,4 +0,0 @@ -BSPWM_BORDER_WIDTH -BSPWM_DESKTOPS_TOTAL -BSPWM_DESKTOPS_PRIMARY -BSPWM_WINDOW_GAP diff --git a/.config/concession/cleanups/polybar b/.config/concession/cleanups/polybar deleted file mode 100644 index f0f062f4..00000000 --- a/.config/concession/cleanups/polybar +++ /dev/null @@ -1,17 +0,0 @@ -PB_MONITOR -PB_WM_RESTACK -PB_BAR_PRIMARY_MODULES_LEFT -PB_BAR_PRIMARY_MODULES_CENTER -PB_BAR_PRIMARY_MODULES_RIGHT -PB_BAR_PRIMARY_2_MODULES_LEFT -PB_BAR_PRIMARY_2_MODULES_CENTER -PB_BAR_PRIMARY_2_MODULES_RIGHT -PB_BAR_SECONDARY_MODULES_LEFT -PB_BAR_SECONDARY_MODULES_CENTER -PB_BAR_SECONDARY_MODULES_RIGHT -PB_BAR_SECONDARY_2_MODULES_LEFT -PB_BAR_SECONDARY_2_MODULES_CENTER -PB_BAR_SECONDARY_2_MODULES_RIGHT -PB_MODULE_BAR_WIDTH -PB_MODULE_ETH_INTERFACE -PB_MODULE_WLAN_INTERFACE diff --git a/.config/concession/cleanups/terminal b/.config/concession/cleanups/terminal deleted file mode 100644 index b2178157..00000000 --- a/.config/concession/cleanups/terminal +++ /dev/null @@ -1 +0,0 @@ -TERMINAL diff --git a/.config/concession/concederc b/.config/concession/concederc deleted file mode 100755 index 764c5e30..00000000 --- a/.config/concession/concederc +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env bash -export XDG_CURRENT_DESKTOP="kde" diff --git a/.config/concession/devices/dsk-cstm-0.rc b/.config/concession/devices/dsk-cstm-0.rc deleted file mode 100755 index 4f0cc892..00000000 --- a/.config/concession/devices/dsk-cstm-0.rc +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -export TERMINAL=konsole -export PB_MODULE_ETH_INTERFACE=eno1 -export PB_MODULE_WLAN_INTERFACE=wlp5s0 -export BSPWM_WINDOW_GAP=16 -# vim:ft=sh - diff --git a/.config/concession/devices/lap-th-e560-0.rc b/.config/concession/devices/lap-th-e560-0.rc deleted file mode 100755 index 95dffb37..00000000 --- a/.config/concession/devices/lap-th-e560-0.rc +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -export TERMINAL=konsole -# vim:ft=sh - diff --git a/.config/concession/services/03_kdeinit.dtf b/.config/concession/services/03_kdeinit.dtf deleted file mode 100755 index 3fb9882f..00000000 --- a/.config/concession/services/03_kdeinit.dtf +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="KDE kdeinit" -service_process="kdeinit5" -service_kill_on_reload="false" - diff --git a/.config/concession/services/05_kded.dtf b/.config/concession/services/05_kded.dtf deleted file mode 100755 index 726c0714..00000000 --- a/.config/concession/services/05_kded.dtf +++ /dev/null @@ -1,16 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="KDE kded5" -service_process="kded5" -service_kill_on_reload="false" - -start-extra() { - kcminit -} - diff --git a/.config/concession/services/07_ksmserver.dtf b/.config/concession/services/07_ksmserver.dtf deleted file mode 100644 index 1ccf2a4d..00000000 --- a/.config/concession/services/07_ksmserver.dtf +++ /dev/null @@ -1,18 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="KDE ksmserver" -service_process="ksmserver" -service_flags="--no-lockscreen" -service_kill_on_reload="false" - -function start() { - svc_log "Starting" - svc_logstart kwrapper5 $service_process $service_flags -} - diff --git a/.config/concession/services/09_bspwm.dtf b/.config/concession/services/09_bspwm.dtf deleted file mode 100644 index b87d1186..00000000 --- a/.config/concession/services/09_bspwm.dtf +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="bspwm" -service_process="bspwm" -service_kill_on_reload="false" - diff --git a/.config/concession/services/09_i3wm.dtf b/.config/concession/services/09_i3wm.dtf deleted file mode 100755 index 8fd9548e..00000000 --- a/.config/concession/services/09_i3wm.dtf +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="i3wm" -service_process="i3" -service_kill_on_reload="false" - diff --git a/.config/concession/services/10_compton.dtf b/.config/concession/services/10_compton.dtf deleted file mode 100755 index 5fa5730f..00000000 --- a/.config/concession/services/10_compton.dtf +++ /dev/null @@ -1,19 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Compton" -service_process="compton" - -function prestart-extra() { - if [[ "$HOST" == "vm-*" ]]; then - svc_log "Will not start: in a VM" 2 - return 1 - fi - return 0 -} - diff --git a/.config/concession/services/10_polkit-kde-agent.dtf b/.config/concession/services/10_polkit-kde-agent.dtf deleted file mode 100755 index bc415d5f..00000000 --- a/.config/concession/services/10_polkit-kde-agent.dtf +++ /dev/null @@ -1,18 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="KDE Polkit Agent" -service_process="/usr/lib/x86_64-linux-gnu/libexec/polkit-kde-authentication-agent-1" -service_kill_on_reload="false" - -isup() { - pgrep -U "$UID" -f "$service_process" > /dev/null 2>&1 - isup-extra $? - return $? -} - diff --git a/.config/concession/services/10_pulseaudio.dtf b/.config/concession/services/10_pulseaudio.dtf deleted file mode 100755 index 53d60fb4..00000000 --- a/.config/concession/services/10_pulseaudio.dtf +++ /dev/null @@ -1,13 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Pulseaudio" -service_process="pulseaudio" -service_flags="--daemonize=no" -service_kill_on_reload="false" - diff --git a/.config/concession/services/10_sxhkd.dtf b/.config/concession/services/10_sxhkd.dtf deleted file mode 100644 index 21618293..00000000 --- a/.config/concession/services/10_sxhkd.dtf +++ /dev/null @@ -1,19 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Simple X Hotkey Daemon" -service_process="sxhkd" - -function prestart-extra() { - if ! pgrep -U "$UID" bspwm > /dev/null 2>&1; then - svc_log "Not under bspwm" 2 - return 1 - fi - return 0 -} - diff --git a/.config/concession/services/10_xfsettingsd.dtf b/.config/concession/services/10_xfsettingsd.dtf deleted file mode 100644 index 34f15d8a..00000000 --- a/.config/concession/services/10_xfsettingsd.dtf +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Xfce Settings Daemon" -service_process="xfsettingsd" -service_kill_on_reload="false" - diff --git a/.config/concession/services/19_conky.dtf b/.config/concession/services/19_conky.dtf deleted file mode 100755 index 6f5f240e..00000000 --- a/.config/concession/services/19_conky.dtf +++ /dev/null @@ -1,23 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Conky" -service_process="conky" - -function start-extra() { - for i in {1..100}; do - if xprop -name "Conky" > /dev/null 2>&1; then break; fi - sleep 0.01 - if (( $i > 99 )); then - svc_log "Conky may spawn behind the current desktop" 2 - break - fi - done - return 0 -} - diff --git a/.config/concession/services/20_dunst.dtf b/.config/concession/services/20_dunst.dtf deleted file mode 100755 index f02be0ac..00000000 --- a/.config/concession/services/20_dunst.dtf +++ /dev/null @@ -1,11 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Dunst" -service_process="dunst" - diff --git a/.config/concession/services/20_plasmashell.dtf b/.config/concession/services/20_plasmashell.dtf deleted file mode 100644 index ecc3b8c8..00000000 --- a/.config/concession/services/20_plasmashell.dtf +++ /dev/null @@ -1,11 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="KDE Plasma Shell" -service_process="plasmashell" - diff --git a/.config/concession/services/20_polybar.dtf b/.config/concession/services/20_polybar.dtf deleted file mode 100755 index e7baaa4a..00000000 --- a/.config/concession/services/20_polybar.dtf +++ /dev/null @@ -1,46 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Polybar" -service_process="polybar" - -function start() { - # Make sure we have our xrdb stuff going - if $(which xrdbupdate) > /dev/null 2>&1; then - xrdbupdate > /dev/null 2>&1 - fi - # Set some variables, if necessary - if [[ "$PB_BAR_BORDER_SIZE" == "" ]] && pgrep -U "$UID" bspwm > /dev/null 2>&1; then - if ! [[ "$BSPWM_WINDOW_GAP" == "" ]]; then - svc_log "Inferring bar size from BSPWM_WINDOW_GAP" - export PB_BAR_BORDER_SIZE="$BSPWM_WINDOW_GAP" - fi - fi - if pgrep -U "$UID" i3 > /dev/null 2>&1; then - export PB_WM_RESTACK="i3" - fi - # Spawn bars on the primary monitor - export PB_MONITOR=$(xrandr -q | awk '/primary/{print $1}') - svc_log "Starting primary bar(s) on monitor $PB_MONITOR" - svc_logstart polybar -r primary - svc_logstart polybar -r primary-2 - - # Spawn more for each secondary - export secondary_monitors=$(xrandr -q | grep ' connected' | grep -v 'primary' | awk '{print $1}') - if [[ "$secondary_monitors" == "" ]]; then - return 0 - fi - for monitor in $secondary_monitors; do - svc_log "Starting secondary bar(s) on monitor $monitor" - PB_MONITOR=$monitor - svc_logstart polybar -r secondary - svc_logstart polybar -r secondary-2 - done - return 0 -} - diff --git a/.config/concession/services/20_xfdesktop.dtf b/.config/concession/services/20_xfdesktop.dtf deleted file mode 100644 index d03bd855..00000000 --- a/.config/concession/services/20_xfdesktop.dtf +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Xfce Desktop" -service_process="xfdesktop" -service_flags="-D" - diff --git a/.config/concession/services/99_dropbox.dtf b/.config/concession/services/99_dropbox.dtf deleted file mode 100755 index b5f18e16..00000000 --- a/.config/concession/services/99_dropbox.dtf +++ /dev/null @@ -1,13 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Dropbox" -service_process="dropbox" -service_flags="start" -service_kill_on_reload="false" - diff --git a/.config/concession/services/99_redshift.dtf b/.config/concession/services/99_redshift.dtf deleted file mode 100755 index 018e7d89..00000000 --- a/.config/concession/services/99_redshift.dtf +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Redshift" -service_process="redshift" -service_kill_on_reload="false" - diff --git a/.config/concession/services/99_syncthing.dtf b/.config/concession/services/99_syncthing.dtf deleted file mode 100755 index da6902a4..00000000 --- a/.config/concession/services/99_syncthing.dtf +++ /dev/null @@ -1,13 +0,0 @@ -#! /usr/bin/env bash -# -# Simple wmstartup service -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -service_name="Syncthing" -service_process="syncthing" -service_kill_on_reload="false" -service_flags="--no-browser" - diff --git a/.config/concession/tasks/00_bspwm.sh b/.config/concession/tasks/00_bspwm.sh deleted file mode 100755 index d3c48ac8..00000000 --- a/.config/concession/tasks/00_bspwm.sh +++ /dev/null @@ -1,64 +0,0 @@ -#! /usr/bin/env bash -# -# bspwm.sh -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -main() { - if ! pgrep -U "$UID" bspwm > /dev/null 2>&1; then - tsk_log "Not under bspwm" 1 - return 1 - fi - tsk_log "Configuring bspwm miscellanea" - ## Behavior - tsk_log "Configuring behavior" 0 - # Tiling behavior - bspc config split_ratio 0.50 - bspc config remove_disabled_monitors false - bspc config remove_unplugged_monitors true - - # Pointer behavior - bspc config click_to_focus any - bspc config pointer_follows_focus false - bspc config pointer_follows_monitor true - bspc config pointer_modifier mod1 - bspc config pointer_action1 move #LMB - bspc config pointer_action2 resize_corner #RMB - - ## Looks - tsk_log "Configuring looks" 0 - # Padding - bspc config border_width ${BSPWM_BORDER_WIDTH:-2} - bspc config window_gap ${BSPWM_WINDOW_GAP:-8} - bspc config single_monocle false - bspc config borderless_monocle false - bspc config gapless_monocle true - # Colors - bspc config normal_border_color "#3c3836" #Unfocused - bspc config active_border_color "#458588" #Focused, but current monitor isn't - bspc config focused_border_color "#83a598" #Focused completely - bspc config presel_feedback_color "#9b9b9b" #??? - - tsk_log "Setting window rules" 0 - bspc rule -r '*' - bspc rule -a Firefox desktop=1 - bspc rule -a Firefox-esr desktop=1 - bspc rule -a Waterfox desktop=1 - bspc rule -a Liferea desktop=6 - bspc rule -a discord desktop=7 - bspc rule -a spotify desktop=8 - bspc rule -a 'Minecraft 1.7.10' state=fullscreen - bspc rule -a Xephyr state=pseudo_tiled - # For fullscreen Wine - bspc rule -a explorer.exe state=fullscreen - # Plasma rules - bspc rule -a plasmashell state=floating sticky=on border=off - bspc rule -a krunner state=floating layer=above sticky=on border=off - # Widgets - bspc rule -a Conky state=floating layer=below sticky=on - bspc rule -a pavucontrol-qt state=floating layer=above sticky=on -} - -main $@ diff --git a/.config/concession/tasks/00_ksmserver.sh b/.config/concession/tasks/00_ksmserver.sh deleted file mode 100644 index a2d89a51..00000000 --- a/.config/concession/tasks/00_ksmserver.sh +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -# -# 01_ksmserver.sh -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -main() { - if ! which ksmserver > /dev/null 2>&1; then - tsk_log "Could not find ksmserver" 2 - return 50 - fi - if pgrep -U "$UID" ksmserver > /dev/null 2>&1; then - tsk_log "ksmserver is already running" 2 - return 51 - fi - ksmserver -w "/bin/true" --no-lockscreen & - sleep 1 - export $(dbus-launch) -} - -main $@ - diff --git a/.config/concession/tasks/09_bspwm_monitorset.sh b/.config/concession/tasks/09_bspwm_monitorset.sh deleted file mode 100755 index 6f31fb22..00000000 --- a/.config/concession/tasks/09_bspwm_monitorset.sh +++ /dev/null @@ -1,85 +0,0 @@ -#! /usr/bin/env bash -# -# monitorset.sh -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -main() { - if ! pgrep -U "$UID" bspwm > /dev/null 2>&1; then - tsk_log "Not under bspwm" 1 - return 1 - fi - - monitor_primary=$(xrandr -q | awk '/primary/{print $1}') - monitors_secondary=($(xrandr -q | grep ' connected' | grep -v 'primary' | awk '{print $1}')) - - desktops_total=${BSPWM_DESKTOPS_TOTAL:-8} - desktops_primary=${BSPWM_DESKTOPS_PRIMARY:-6} - desktops_secondary=$(($desktops_total - $desktops_primary)) - - # Sanity checks - if ! [[ "$desktops_total" -ge 1 ]]; then - tsk_log "desktops_total cannot be $desktops_total, defaulting to 8" 0 - desktops_total=8 - fi - if ! [[ "$desktops_primary" -ge 1 ]]; then - tsk_log "desktops_primary cannot be $desktops_primary, defaulting to 6" 0 - desktops_primary=6 - fi - - # Do we have enough desktops for all monitors? - # We can correct this without defaulting, so don't error - if [[ $desktops_secondary -lt ${#monitors_secondary[@]} ]]; then - tsk_log "Configuration would leave some monitors without desktops; adding more" 0 - desktops_secondary=${#monitors_secondary[@]} - desktops_total=$(($desktops_secondary + $desktops_primary)) - deskpermon=1 - tsk_log "Remaining desktops set to $desktops_secondary, highest desktop is now $desktops_total" 0 - fi - - # Can we actually reach all of these desktops via keybinds? - if [[ $desktops_total -gt 10 ]]; then - tsk_log "More than ten desktops were allocated! Not all of these can be reached via keybinds!" 0 - if [[ $(($desktops_total - $desktops_secondary)) -gt 0 ]]; then - tsk_log "Adjusting primary desktop reservation" 0 - desktops_primary=$(($desktops_total - $desktops_secondary)) - tsk_log "Set reserved desktops to $desktops_primary" 0 - else - tsk_log "Cannot resolve this situation without starving the primary monitor of desktops!" 1 - tsk_log "This may result in desktops being allocated that cannot be easily accessed!" 1 - fi - fi - - - # The code that actually sets the monitors up - # First, do we actually have any secondaries? - if [[ $(echo ${monitors_secondary:-0}) == "0" ]]; then - # We only have one monitor, so give it everything - layout=$(seq --separator=" " 1 $desktops_total) - tsk_log "Found one monitor: $monitor_primary, so giving it layout \"$layout\"" - bspc monitor $monitor_primary -d $layout - else - deskpermon=$(($desktops_secondary / ${#monitors_secondary[@]})) - layout=$(seq --separator=" " 1 $desktops_primary) - tsk_log "Giving primary monitor $monitor_primary layout \"$layout\"" - bspc monitor $monitor_primary -d $layout - unset layout - tsk_log "Attempting to put $desktops_secondary desktops across ${#monitors_secondary[@]} monitors, $deskpermon each" 0 - for m in $(seq 0 $((${#monitors_secondary[@]} - 1))); do - layout=$(seq --separator=" " $((1 + $m + $desktops_primary)) ${#monitors_secondary[@]} "$desktops_total") - tsk_log "Giving monitor $m (${monitors_secondary[$m]}) layout \"$layout\"" - bspc monitor ${monitors_secondary[$m]} -d $layout - done - fi - unset monitor_primary - unset monitors_secondary - unset desktops_total - unset desktops_primary - unset desktops_secondary - unset deskpermon -} - -main $@ - diff --git a/.config/concession/tasks/10_kill_krunner.sh b/.config/concession/tasks/10_kill_krunner.sh deleted file mode 100755 index 0ec6e7c4..00000000 --- a/.config/concession/tasks/10_kill_krunner.sh +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh -main() { - if ! pgrep krunner > /dev/null 2>&1; then - return 0 - fi - killall krunner - for i in {1..100}; do - if ! pgrep krunner > /dev/null 2>&1; then break ;fi - sleep 0.01 - if (( $i > 99 )); then - killall -9 krunner - fi - done - if pgrep krunner > /dev/null 2>&1; then - tsk_log "Failed to kill krunner" 1 - return 1 - else - tsk_log "Killed krunner" - return 0 - fi -} - -main $@ - diff --git a/.config/concession/tasks/20_nitrogen.sh b/.config/concession/tasks/20_nitrogen.sh deleted file mode 100755 index 80859529..00000000 --- a/.config/concession/tasks/20_nitrogen.sh +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh -# -# 20_nitrogen.sh -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -main() { - if ! which nitrogen > /dev/null 2>&1; then - tsk_log "Nitrogen is not installed" - return 1 - fi - tsk_log "Restoring Nitrogen background" - nitrogen --restore > /dev/null 2>&1 -} - -main $@ - diff --git a/.config/concession/tasks/20_xrdbupdate.sh b/.config/concession/tasks/20_xrdbupdate.sh deleted file mode 100755 index b20a174b..00000000 --- a/.config/concession/tasks/20_xrdbupdate.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh -if [ -r ~/.Xresources ]; then - tsk_log "Loading .Xresources" - xrdb ~/.Xresources -fi -for file in $XDG_CONFIG_HOME/xrdb/*.xresources; do - if ! [ -r "$file" ]; then - tsk_log "Could not read file \"$file\"" 1 - else - tsk_log "Merging in file \"$file\"" - xrdb -merge "$file" - fi -done - diff --git a/.config/concession/tasks/20_xset.sh b/.config/concession/tasks/20_xset.sh deleted file mode 100755 index 50d03412..00000000 --- a/.config/concession/tasks/20_xset.sh +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh -# -# xset.sh -# Copyright (C) 2018 salt -# -# Distributed under terms of the MIT license. -# - -tsk_log "Disabling bell" -xset -b -tsk_log "Disabling screen blanking" -xset s off -