diff --git a/git/config b/git/config
index 3392b35..478fd29 100644
--- a/git/config
+++ b/git/config
@@ -1,3 +1,3 @@
 [user]
 	email = tavo@tavo.one
-	name = tavo-wasd
+	name = tavo
diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
new file mode 100644
index 0000000..442ec6c
--- /dev/null
+++ b/vim/after/ftplugin/go.vim
@@ -0,0 +1,3 @@
+set colorcolumn=81
+set shiftwidth=8
+set noexpandtab
diff --git a/vim/vimrc b/vim/vimrc
index 7e147c4..86b70bb 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -89,9 +89,6 @@ nnoremap <F9> :make<CR><CR>
 autocmd FileType c :compiler gcc | setlocal makeprg=gcc\ -Wall\ -c\ %
 autocmd FileType cpp :compiler gcc | setlocal makeprg=g++\ -Wall\ -c\ %
 
-" Go
-autocmd FileType go setlocal tabstop=8 shiftwidth=8 noexpandtab
-
 " groff
 autocmd FileType troff noremap <buffer> <silent> <F9> :!zathura --fork %:r.pdf<CR> & disown
 autocmd FileType troff noremap <buffer> <C-s> :w<CR> :!grofftex %<CR><CR>