4 files changed, 2 insertions, 111 deletions
diff --git a/bspwm/.config/bspwm/autostart.sh b/bspwm/.config/bspwm/autostart.sh
deleted file mode 100755
index 87777c9..0000000
--- a/bspwm/.config/bspwm/autostart.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-function run {
-  SERVICE="$@"
-  RUNNING=$(ps aux | grep -v grep | grep "$SERVICE")
-  if [ "${RUNNING:-null}" = null ];
-  then
-    $@ &
-  fi
-}
-
-setxkbmap -layout us -variant altgr-intl -option caps:escape
-xmodmap -e "keycode 135 = Super_R"
-run mpd
-run nm-applet
-run compton
-run wal -i ~/.config/wall1.jpg
-run synclient TouchpadOff=1
-run /usr/bin/xflux -l 43.6404 -g -79.3995
-run ~/.config/Scripts/screen.sh d
-run ~/.config/Scripts/launch_polybar.sh
-run st -c email -e neomutt
-run st -c dropdown -e tmux -f ~/.config/tmux/tmux_start.conf attach
-run st -c math -e R
-run vivaldi-stable
-run keepassxc
-amixer -c 0 set Headphone 100% unmute
-#run dropbox
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index c40d8fd..6110295 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -1,6 +1,7 @@
 #! /bin/sh
 pkill sxhkd
-sxhkd &
+sxhkd -c $HOME/.config/sxhkd/sxhkdrc &
+sxhkd -c $HOME/.config/sxhkd/sxhkdrc_bspwm &
 
 m=$(bspc query -M | wc -l)
 if [ "$m" = 1 ]
diff --git a/bspwm/.config/bspwm/lock.png b/bspwm/.config/bspwm/lock.png
deleted file mode 100644
index cd8b228..0000000
--- a/bspwm/.config/bspwm/lock.png
+++ /dev/null
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc_bspwm
index 1fac7fe..df43c44 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc_bspwm
@@ -69,97 +69,15 @@ alt + {Left,Down,Up,Right}
 # regular keymaps use super #
 #                           #
 
-super + w
-	$BROWSER
-
-super + shift + w
-	$BROWSER -incognito
-
-super + e
-	$TERMINAL -n email -e neomutt
-
-super + r
-	$TERMINAL -e vifm
-
-super + shift + r
-	pcmanfm
-
 super + {y,u}
 	scratch {math, dropdown}
 
-super + i
-	$TERMINAL -e htop
-
-super + p
-	notify-send "$(mpc toggle | sed 2q)"
-
-super + shift + p
-	keepassxc
-
-super + shift + a
-	$TERMINAL -e alsamixer
-
-super + d
-	rofi -show run
-
-super + shift + d
-	mpv /mnt/newvol/p/"$(ls /mnt/newvol/p | rofi -dmenu -lines 10)"
-
-super + shift + f
-	dmenuunicode
-
-super + x
-	lock.sh
-
-super + shift + x
-	systemctl restart
-
-super + v
-	$TERMINAL -e ncmpcpp -s visualizer
-
-super + b
-	mpc prev
-
-super + n
-	mpc next
-
-super + m
-	$TERMINAL -e ncmpcpp
-
-super + shift + m
-	pamixer --allow-boost -t
-
-# Other keys
-
-super + Return
-	$TERMINAL
-
 super + shift + Return
 	$TERMINAL -e tmux_connect.sh
 
-super + {minus,equal}
-	pamixer --allow-boost -{d,i} 10
-
 super + BackSpace
 	kill -9 -1
 
-super + shift + BackSpace
-	shutdown now
-
 super + space
 	polybar-msg cmd toggle
 
-super + bracket{left,right}
-	mpc seek {-,\+}30
-
-super + F1
-	amixer -c 0 set Headphone 100% unmute && notify-send -t 1000 "🎧 Unmuted!"
-
-super + F4
-	lock.sh && systemctl suspend
-
-super + {F7,F8}
-	screen.sh {l,d}
-
-{_,shift} + Print
-	maim -{s,i $(xdotool getactivewindow)} ~/Pictures/$(date +%s).png