diff --git a/zsh/aliases b/zsh/aliases
index f9eb382..88b9c85 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -19,7 +19,7 @@ alias cd...='cd ../..'
 alias cd....='cd ../../..'
 alias cd.....='cd ../../../..'
 
-alias aliases='vim ~/.dotfiles/zsh/aliases'
+alias aliases='nvim ~/.dotfiles/zsh/aliases'
 alias al='aliases'
 alias b='bundle'
 alias be='bundle exec'
@@ -37,7 +37,7 @@ alias cpr='cp -r'
 alias cw='compass watch'
 alias dot='cd ~/.'
 alias duh='du -csh'
-alias functions='vim ~/.dotfiles/zsh/functions'
+alias functions='nvim ~/.dotfiles/zsh/functions'
 alias f='fg'
 alias gib='gem install bundler'
 alias history='fc -l 1'
@@ -85,15 +85,16 @@ alias rc='rails console'
 alias rs='rails server'
 alias reload='source ~/.zshrc'
 alias s='cd ~/.ssh'
-alias sc='vim ~/.ssh/config'
+alias sc='nvim ~/.ssh/config'
 alias t='tree'
 alias u='cd ..'
-alias v='vim'
-alias vi='vim'
+alias v='nvim'
+alias vi='nvim'
+alias vim='nvim'
 alias vh='vagrant halt'
 alias vs='vagrant ssh'
 alias vu='vagrant up'
-alias vimrc='vim ~/.vimrc'
+alias vimrc='nvim ~/.vimrc'
 
 # Git
 alias am='git commit --amend'
@@ -211,7 +212,7 @@ alias gwip="git add . && git commit -m \"WIP\""
 
 # Notes
 alias notes='cd ~/.personal-files/documents'
-alias pn='vim ~/.personal-files/documents/Notes/stack.txt'
+alias pn='nvim ~/.personal-files/documents/Notes/stack.txt'
 alias writing='cd ~/.personal-files/brain/writing'
 
 # Projects