diff --git a/vim/.vimrc b/neovim/.config/init.vim
similarity index 100%
rename from vim/.vimrc
rename to neovim/.config/init.vim
diff --git a/vim/.vim/.netrwhist b/neovim/.config/nvim/.netrwhist
similarity index 100%
rename from vim/.vim/.netrwhist
rename to neovim/.config/nvim/.netrwhist
diff --git a/vim/.vim/init.vim b/neovim/.config/nvim/init.vim
similarity index 100%
rename from vim/.vim/init.vim
rename to neovim/.config/nvim/init.vim
diff --git a/vim/.vim/shada/main.shada b/neovim/.config/nvim/shada/main.shada
similarity index 100%
rename from vim/.vim/shada/main.shada
rename to neovim/.config/nvim/shada/main.shada
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index 10f1623..f8d4422 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -1,104 +1,137 @@
-#
-# bspwm hotkeys
-#
-
-super + alt + Escape
-	bspc quit
-
-super + w
-	bspc window -c
-
-super + t
-	bspc desktop -l next
-
-super + b
-	bspc desktop -B
-
-super + {s,f}
-	bspc window -t {floating,fullscreen}
-
-super + {grave,Tab}
-	bspc {window,desktop} -f last
-
-super + apostrophe
-	bspc window -s last
-
-super + {o,i}
-	bspc control --record-history off; \
-	bspc window {older,newer} -f; \
-	bspc control --record-history on
-
-super + y
-	bspc window -w last.manual
-
-super + m
-	bspc window -s biggest
-
-super + {_,shift + }{h,j,k,l}
-	bspc window -{f,s} {left,down,up,right}
-
-super + {_,shift + }c
-	bspc window -f {next,prev}
-
-super + {comma,period}
-	bspc desktop -C {backward,forward}
-
-super + bracket{left,right}
-	bspc desktop -f {prev,next}
-
-super + ctrl + {h,j,k,l}
-	bspc window -p {left,down,up,right}
-
-super + ctrl + {_,shift + }space
-	bspc {window -p cancel,desktop -c}
-
-super + alt + {h,j,k,l}
-	bspc window -e {left -10,down +10,up -10,right +10}
-
-super + alt + shift + {h,j,k,l}
-	bspc window -e {right -10,up +10,down -10,left +10}
-
-super + ctrl + {1-9}
-	bspc window -r 0.{1-9}
-
-super + {_,shift + }{1-9,0}
-	bspc {desktop -f,window -d} ^{1-9,10}
-
-~button1
-	bspc pointer -g focus
-
-super + button{1-3}
-	; bspc pointer -g {move,resize_side,resize_corner}
-
-super + @button{1-3}
-	bspc pointer -u
-
 #
 # wm independent hotkeys
 #
 
+# terminal emulator
 super + Return
 	urxvt
 
+# program launcher
 super + space
-	rofi -show run
+	dmenu_run
 
 # make sxhkd reload its configuration files:
 super + Escape
 	pkill -USR1 -x sxhkd
 
-# media keys
+#
+# bspwm hotkeys
+#
 
-XF86AudioPlay
-	/home/alex/bspwm/spotifykeys.sh play			
+# quit bspwm normally
+super + alt + Escape
+	bspc quit
 
-XF86AudioNext
-	/home/alex/bspwm/spotifykeys.sh next
+# close and kill
+super + {_,shift + }w
+	bspc node -{c,k}
 
-XF86AudioPrev
-	/home/alex/bspwm/spotifykeys.sh prev
+# alternate between the tiled and monocle layout
+super + m
+	bspc desktop -l next
 
-# misc
+# if the current node is automatic, send it to the last manual, otherwise pull the last leaf
+super + y
+	bspc query -N -n focused.automatic && bspc node -n last.!automatic || bspc node last.leaf -n focused
 
-super + e
-	thunar
+# swap the current node and the biggest node
+super + g
+	bspc node -s biggest
+
+#
+# state/flags
+#
+
+# set the window state
+super + {t,shift + t,s,f}
+	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
+
+# set the node flags
+super + ctrl + {x,y,z}
+	bspc node -g {locked,sticky,private}
+
+#
+# focus/swap
+#
+
+# focus the node in the given direction
+super + {_,shift + }{h,j,k,l}
+	bspc node -{f,s} {west,south,north,east}
+
+# focus the node for the given path jump
+super + {p,b,comma,period}
+	bspc node -f @{parent,brother,first,second}
+
+# focus the next/previous node
+super + {_,shift + }c
+	bspc node -f {next,prev}
+
+# focus the next/previous desktop
+super + bracket{left,right}
+	bspc desktop -f {prev,next}
+
+# focus the last node/desktop
+super + {grave,Tab}
+	bspc {node,desktop} -f last
+
+# focus the older or newer node in the focus history
+super + {o,i}
+	bspc wm -h off; \
+	bspc node {older,newer} -f; \
+	bspc wm -h on
+
+# focus or send to the given desktop
+super + {_,shift + }{1-9,0}
+	bspc {desktop -f,node -d} '^{1-9,10}'
+
+#
+# preselect
+#
+
+# preselect the direction
+super + ctrl + {h,j,k,l}
+	bspc node -p {west,south,north,east}
+
+# preselect the ratio
+super + ctrl + {1-9}
+	bspc node -o 0.{1-9}
+
+# cancel the preselection for the focused node
+super + ctrl + space
+	bspc node -p cancel
+
+# cancel the preselection for the focused desktop
+super + ctrl + shift + space
+	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
+
+#
+# resize tiled/floating
+#
+
+# expand the tiled space in the given direction
+super + alt + {h,j,k,l}
+	bspc node {@west -r -10,@south -r +10,@north -r -10,@east -r +10}
+
+# contract the tiled space in the given direction
+super + alt + shift + {h,j,k,l}
+	bspc node {@east -r -10,@north -r +10,@south -r -10,@west -r +10}
+
+# move a floating window
+super + {Left,Down,Up,Right}
+	xdo move {-x -20,-y +20,-y -20,-x +20}
+
+#
+# pointer focus/move/resize
+#
+
+# focus
+~button1
+	bspc pointer -g focus
+
+# start move/resize
+super + button{1-3}
+	; bspc pointer -g {move,resize_side,resize_corner}
+
+# end move/resize
+super + @button{1-3}
+	bspc pointer -u
diff --git a/vim/.vim/bundle/Vundle.vim b/vim/.vim/bundle/Vundle.vim
deleted file mode 160000
index 5f70ae6..0000000
--- a/vim/.vim/bundle/Vundle.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5f70ae6025e951f0154e3940d123138adffa4c88
diff --git a/vim/.vim/bundle/ctrlp.vim b/vim/.vim/bundle/ctrlp.vim
deleted file mode 160000
index b5d3fe6..0000000
--- a/vim/.vim/bundle/ctrlp.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
deleted file mode 160000
index 47c20c4..0000000
--- a/vim/.vim/bundle/nerdtree
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 47c20c4b64e30e2948b327c55f49e140f80d5d79
diff --git a/vim/.vim/bundle/nerdtree-git-plugin b/vim/.vim/bundle/nerdtree-git-plugin
deleted file mode 160000
index 23d5199..0000000
--- a/vim/.vim/bundle/nerdtree-git-plugin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 23d5199f0eaee036186f3df8a87ec356905c6a32
diff --git a/vim/.vim/bundle/vim-airline b/vim/.vim/bundle/vim-airline
deleted file mode 160000
index 14d14cf..0000000
--- a/vim/.vim/bundle/vim-airline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 14d14cf951c08fc88ca6c3e6f28fe47b99421e23
diff --git a/vim/.vim/bundle/vim-expand-region b/vim/.vim/bundle/vim-expand-region
deleted file mode 160000
index 257a527..0000000
--- a/vim/.vim/bundle/vim-expand-region
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 257a527787e033f72d8510cd057739f169f031d8
diff --git a/vim/.vim/bundle/vim-gitgutter b/vim/.vim/bundle/vim-gitgutter
deleted file mode 160000
index bcb601a..0000000
--- a/vim/.vim/bundle/vim-gitgutter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bcb601acd2b0b6376cb6a1ca623414663f643306
diff --git a/vim/.vim/bundle/vim-gotham b/vim/.vim/bundle/vim-gotham
deleted file mode 160000
index 3c5c613..0000000
--- a/vim/.vim/bundle/vim-gotham
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3c5c6130b8f87a0772f9d33e2808e30fe669b49d
diff --git a/vim/.vim/bundle/vim-instant-markdown b/vim/.vim/bundle/vim-instant-markdown
deleted file mode 160000
index 915c681..0000000
--- a/vim/.vim/bundle/vim-instant-markdown
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 915c6812d45c00e5ad85c8147c6179743a41ae11
diff --git a/x/.Xresources b/x/.Xresources
index 02ba1f8..b10a371 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -7,7 +7,7 @@ URxvt*scrollBar:                      false
 URxvt*transparent:                    false
 URxvt*highlightColor:                 #202020
 URxvt*highlightTextColor:             #383838
-URxvt*font:                           xft:Inconsolata for Powerline:size=10:antialias=true:hinting=true
+URxvt*font:                           xft:Inconsolata:size=10:antialias=true:hinting=true
 !URxvt*depth:                            32
 URxvt*letterSpace:                    -1
 URxvt*perl-ext-common: tabbedex