diff --git a/Makefile b/Makefile
index 96ab980..e306ca2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 LOCATION="$(HOME)/.config"
 DATA="$(HOME)/.local/share"
-install_local: install_bspwm install_nvim install_sx install_sxhkd install_zathura install_simplestatus install_bash install_ssh install_git install_tridactyl
+install_local: install_bspwm install_nvim install_sx install_sxhkd install_zathura install_simplestatus install_bash install_ssh install_git install_tridactyl install_htop
 install: .environment
 install_bspwm:
 	ln -sf $(CURDIR)/bspwm $(LOCATION)/bspwm
@@ -22,5 +22,7 @@ install_git:
 	ln -sf $(CURDIR)/git $(LOCATION)/git
 install_tridactyl:
 	ln -sf $(CURDIR)/tridactyl $(LOCATION)/tridactyl
+install_htop:
+	ln -sf $(CURDIR)/htop $(LOCATION)/htop
 .environment:
 	sh environ
diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 4132844..407244c 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -8,3 +8,7 @@ bspc monitor -d 1 2 3 4 5 6 7 8 9
 bspc config normal_border_color "#161510"
 bspc config active_border_color "#727A18"
 bspc config focused_border_color "#727A18"
+
+bspc config pointer_follows_focus true
+bspc config pointer_follows_monitor true
+bspc config focus_follows_pointer true
diff --git a/nvim/init.vim b/nvim/init.vim
index 5b10f6f..93ddf46 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -6,6 +6,7 @@ Plug 'sirver/ultisnips'
 Plug 'tridactyl/vim-tridactyl'
 Plug 'chrisbra/csv.vim'
 Plug 'trapd00r/vimpoint'
+Plug 'vimwiki/vimwiki'
 cal plug#end()
 " }}}
 
@@ -26,14 +27,19 @@ set clipboard=unnamedplus
 set spell
 set spelllang=en_us
 set title
+set ts=2
+set sw=2
+set hlsearch
+set incsearch
+set ignorecase
+set smartcase
+
 colorscheme earth
 " }}}
 
 " shortcuts {{{
 " toggle line numbers and listchars
 nnoremap <Leader>ym :set number!<CR>:set list!<CR>
-" weather
-nnoremap <Leader>w :!curl -s wttr.in/?0T<CR>
 " vimrc thing
 nnoremap <Leader>rr :source ~/.config/nvim/init.vim<CR>
 nnoremap <Leader>re :edit ~/.config/nvim/init.vim<CR>
@@ -53,14 +59,36 @@ nnoremap <C-s> zg
 
 " autocmds {{{
 au Filetype python setl et ts=4 sw=4
+
+function SwapExistsHandler()
+	silent !vim-swap-handler "%:p"
+	if v:shell_error == 0
+		let v:swapchoice='o'
+		return
+	elseif v:shell_error == 1
+		let v:swapchoice='o'
+		echom "The file has been opened read-only, as there is not another vim instance editing this file."
+	elseif v:shell_error == 127
+		echom "The vim-swap-handler command doesn't exist."
+	else
+		echom "An unknown error occurred."
+	endif
+endfunction
+
+autocmd SwapExists * call SwapExistsHandler()
+	
 " }}}
 
 " statusline {{{
 set statusline=%f
 set statusline+=\ 
-set statusline+=%r%m%q
+set statusline+=%r%m%q%h
 set statusline+=%=
-set statusline+=%y\ %B\ %l:%c:%p
+set statusline+=%y\ 0x%02B\ %04l:%03c:%03p
+" }}}
+
+" titlebar {{{
+let &titlestring='%{expand("%:p")}'
 " }}}
 
 " netrw {{{
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index a2c789f..3e0b297 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -8,9 +8,6 @@ super + Return
 super + {_,shift + } b
   {xclip -selection primary -o | xargs vimb,vimb}
 
-super + p
-  pashmenu
-
 super + m
   xclip -selection primary -o | xargs mpv
 
@@ -27,10 +24,10 @@ super + w
 super + {_,shift + }n
   nws {local,national}
 
-{XF86Display,super + o}
+{XF86Display,super + }
   disp
 
-{XF86ScreenSaver,super + shift + l}
+{XF86ScreenSaver,super + shift + z}
   slock
 
 XF86AudioMute
@@ -39,6 +36,16 @@ XF86AudioMute
 {_,shift + }{XF86AudioRaiseVolume,XF86AudioLowerVolume}
   amixer sset Master {5,1}%{+,-}
 
+# mouse movement
+super + u
+	xdotool mousemove_relative -- -10 0
+super + i
+	xdotool mousemove_relative -- 0 10
+super + o
+	xdotool mousemove_relative -- 0 -10
+super + p
+	xdotool mousemove_relative -- 10 0
+
 # bspwm
 
 super + q