diff --git a/.bashrc b/.bashrc
index b8864ed..e219a46 100755
--- a/.bashrc
+++ b/.bashrc
@@ -10,6 +10,7 @@ else
 fi
 
 alias dotfiles='cd; curl -#L https://github.com/atomaka/dotfiles/tarball/master | tar -xzv --strip-components 1 --exclude={README,.gitignore}; source ~/.profile'
+alias npdev='sshfs -o idmap=user -o workaround=rename $USER@netprint:/data/test ~/Source/netprint'
 
 alias gvim='gvim -f &'
 
diff --git a/.gitconfig b/.gitconfig
index d5885b9..fae8e41 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,7 +17,7 @@
     changed = green
     untracked = cyan
 [merge]
-    tool = sublime
+    tool = vimdiff
 [apply]
     whitespace = fix
 [core]