diff --git a/bash/.bashrc b/bash/.bashrc
index 6376c48..73fac78 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -10,8 +10,8 @@
                                                             
 
 # Set some defaults.
-export EDITOR="emacsclient -t"
-export VISUAL="emacsclient -c -a emacs"
+export EDITOR="nvim"
+export VISUAL="nvim"
 export ALTERNATE_EDITOR=""
 export PATH=".:~/bin:~/.local/bin:/usr/games:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
diff --git a/git/.gitconfig b/git/.gitconfig
index 10258ea..59cd894 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Andrew Davidson
-	email = andrew@andr3w.net
+	email = amd@amd.im 
 	signingkey = /home/amd/.ssh/id_rsa
 	
 [color]
diff --git a/vim/.vimrc b/vim/.vimrc
index 712637e..b5c728f 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,7 +1,6 @@
 " ==================== Plugins ====================
 call plug#begin()
 
-
 " Git integration
 Plug 'tpope/vim-fugitive'
 Plug 'airblade/vim-gitgutter'
@@ -193,6 +192,9 @@ map q: :q
 " Allow saving of files as sudo when I forgot to start vim using sudo.
 cmap w!! w !sudo tee > /dev/null %
 
+" Disable F1 key
+nmap <F1> <nop>
+
 " Go shortcuts just for .go files
 autocmd FileType go nmap <leader>r  <Plug>(go-run)
 autocmd FileType go nmap <leader>t  <Plug>(go-test)