diff --git a/apps/git/config b/apps/git/config
index eddd686..7f1269b 100644
--- a/apps/git/config
+++ b/apps/git/config
@@ -16,3 +16,8 @@
 	prompt = false
 [alias]
 	d = difftool
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false
diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim
index 56c80d7..075c525 100644
--- a/apps/neovim/plugins.vim
+++ b/apps/neovim/plugins.vim
@@ -66,7 +66,7 @@ let g:indent_guide_auto_colors = 1
 let g:indent_guides_enable_on_vim_startup = 1
 
 Plug 'w0rp/ale' " syntax checker
-let g:ale_completion_enabled = 1
+let g:ale_completion_enabled = 0
 " let g:ale_sign_column_always = 0
 " let g:ale_set_signs = 0
 " highlight clear ALEErrorSign
diff --git a/scripts/arch-linux/provisioning/0-adduser.bash b/scripts/arch-linux/provisioning/0-adduser.bash
index dc9b68e..19f8995 100755
--- a/scripts/arch-linux/provisioning/0-adduser.bash
+++ b/scripts/arch-linux/provisioning/0-adduser.bash
@@ -2,16 +2,16 @@
 
 # user's username
 USERNAME=daniel
-GROUPS=admin,users,wheel
+USER_GROUPS="admin,users,wheel"
 
 # add admin group
 groupadd admin 2>/dev/null
 
 # create actual home directory
-mkdir -p "/home/$USERNAME/usr"
+mkdir -p "/home/$USERNAME/.home"
 
 # add user with groups
-useradd -m -d "/home/$USERNAME/usr" -G "$GROUPS" -s "/bin/bash" "$USERNAME"
+useradd -m -d "/home/$USERNAME/.home" -G "${USER_GROUPS}" -s "/bin/bash" "$USERNAME"
 
 # give home directory ownership
 chown -R "$USERNAME:$USERNAME" "/home/$USERNAME"
diff --git a/shell/aliases b/shell/aliases
index 8b28e52..8d055a0 100644
--- a/shell/aliases
+++ b/shell/aliases
@@ -29,7 +29,7 @@ function c() {
 	if [[ -n $1 ]]; then
 		cd "${NICE_HOME}" || exit 1
 	else
-		cd "${NICE_HOME}" && cd "${[@]}" || exit 1
+		cd "${NICE_HOME}" && cd "${1}" || exit 1
 	fi
 }
 alias cd..="cd .."
diff --git a/shell/bashrc b/shell/bashrc
index 451a680..30d2b6f 100644
--- a/shell/bashrc
+++ b/shell/bashrc
@@ -10,6 +10,7 @@ export DOTFILES_PATH="$XDG_CONFIG_HOME/dotfiles"
 export NICE_HOME="$HOME"
 
 [[ $(basename "${HOME}") = "usr" ]] && export NICE_HOME="$HOME/.."
+[[ $(basename "${HOME}") = ".home" ]] && export NICE_HOME="$HOME/.."
 
 # TODO: nice home on a per-device basis
 
diff --git a/shell/funcs b/shell/funcs
index 0432f4c..eccd54e 100644
--- a/shell/funcs
+++ b/shell/funcs
@@ -76,7 +76,7 @@ export -f gcwd
 fsw() {
 	SHELL_COMMAND="${1}"
 	shift
-	inotifywait -q -m -e close_write "${@}" | while read -r _ _; do
+	inotifywait -q -m -e close_write -r "${@}" | while read -r _ _; do
 		eval "${SHELL_COMMAND}"
 	done
 }