fixed a lot of things, and hotkeys not related to the WM is now managed by sxhkd

bin/mshot

@@ -4,8 +4,8 @@ if [ "$1" = "" ]; then
 	echo "mshot <name>"
 fi
 
-sleep 0.2
+sleep 0.1
 DIR=`mktemp -d`
-gnome-screenshot -f "$DIR/pic.png"
+scrot "$DIR/pic.png"
 
 mupload "$DIR/pic.png" "img/${1}.png"

bin/mupload

@@ -7,5 +7,5 @@ fi
 
 scp "$1" "martin@serve.mort.coffee:/var/www/mort.coffee/d/public/$2"
 URL="http://d.mort.coffee/$2"
-echo $URL | xsel -i
+echo $URL | xsel -ib
 echo $URL

dotfiles/i3/config

@@ -11,10 +11,6 @@
 
 set $mod Mod4
 
-#STARTUP
-
-exec compton --config ~/.comptonrc --backend glx --vsync opengl-swc --paint-on-overlay -b
-exec feh --bg-scale ~/background.jpg
 # hide dem borders
 hide_edge_borders both
 
@@ -183,35 +179,3 @@ bindsym $mod+r mode "resize"
 bar {
 	status_command i3status
 }
-
-# volume and audio
-bindsym XF86AudioLowerVolume exec amixer -D pulse sset Master 5%- && killall -USR1 i3status
-bindsym XF86AudioRaiseVolume exec amixer -D pulse sset Master 5%+ && killall -USR1 i3status
-bindsym XF86MonBrightnessDown exec xbacklight -dec 10
-bindsym XF86MonBrightnessUp exec xbacklight -inc 10
-
-# augment mouse
-bindsym $mod+a exec xdotool mousemove_relative -- -50 0
-bindsym $mod+o exec xdotool mousemove_relative -- 0  50
-bindsym $mod+e exec xdotool mousemove_relative -- 0 -50
-bindsym $mod+u exec xdotool mousemove_relative -- 50  0
-bindsym $mod+semicolon exec xdotool mousemove_relative -- -10m 0
-bindsym $mod+q         exec xdotool mousemove_relative -- 0  10
-bindsym $mod+j         exec xdotool mousemove_relative -- 0 -10
-bindsym $mod+k         exec xdotool mousemove_relative -- 10  0
-bindsym $mod+comma exec xdotool click 1
-
-# toggle touchpad
-bindsym $mod+d exec touchpad-toggle
-
-# paste
-bindsym $mod+shift+v exec xdotool click 2
-
-# norwegian
-bindsym $mod+shift+x exec setxkbmap no
-bindsym $mod+shift+b exec setxkbmap dvorak
-
-# things
-exec sh .startup.sh
-exec xset r rate 200 60
-exec setxkbmap dvorak -option "ctrl:nocaps"

dotfiles/profile

@@ -0,0 +1,8 @@
+export PATH="$PATH:$HOME/bin"
+
+xset r rate 200 60
+setxkbmap dvorak -option "ctrl:nocaps"
+compton --config ~/.comptonrc --backend glx --vsync opengl-swc --paint-on-overlay -b
+feh --bg-scale ~/background.jpg
+
+sxhkd -c ~/.sxhkdrc &

dotfiles/sxhkdrc

@@ -0,0 +1,35 @@
+# audio
+XF86Audio{Raise,Lower}Volume
+	amixer -D pulse sset Master {5%+,5%-} && killall -USR1 i3status
+alt + XF86Audio{Raise,Lower}Volume
+	amixer -D pulse sset Master {1%+,1%-} && killall -USR1 i3status
+
+# brightness
+XF86MonBrightness{Up,Down}
+	xbacklight {-inc,-dec}} 10 -time 0 -steps 1
+alt + XF86MonBrightness{Up,Down}
+	xbacklight {-inc,-dec}} 1 -time 0 -steps 1
+
+# mouse
+mod4 + {a, u}
+	xdotool mousemove_relative -- {-50, 50}, 0
+mod4 + {o, e}
+	xdotool mousemove_relative -- 0, {-50, 50}
+mod4 + {semicolon, k}
+	xdotool mousemove_relative -- {-10, 10}, 0
+mod4 + {q, j}
+	xdotool mousemove_relative -- 0, {-10, 10}
+mod4 + comma
+	xdotool click 1
+
+# touchpad toggle
+mod4 + d
+	touchpad-toggle
+
+# paste
+mod4 + shift + v
+	xdotool click 2
+
+# norwegian
+mod4 + shift + {x, b}
+	setxkbmap {no, dvorak} && xmodmap ~/.Xmodmaprc

setup.sh

@@ -3,7 +3,7 @@
 issues=0
 check_command()
 {
-	which "$1" 1> /dev/null
+	which "$1" &> /dev/null
 	if [ "$?" -ne 0 ]; then
 		issues=1
 		echo "Missing command: $1"
@@ -30,7 +30,8 @@ check_command "amixer"
 check_command "xbacklight"
 check_command "feh"
 check_command "xsel"
-check_command "byzanz-record"
+check_command "ffmpeg"
+check_command "sxhkd"
 
 check_file ~/.mrecrc
 
@@ -62,4 +63,16 @@ done
 cd ..
 echo "Done."
 
+while getopts :m option; do
+	case "$option" in
+	m)
+		echo "Not switching mod and alt keys."
+		echo "" > ~/.Xmodmaprc
+		;;
+	*)
+		echo "Unknown option: $option"
+		;;
+	esac
+done
+
 echo "Everything set up!"