diff --git a/roles/dotfiles/files/fish/config.fish b/roles/dotfiles/files/fish/config.fish
index 01a47fb..e7e546d 100644
--- a/roles/dotfiles/files/fish/config.fish
+++ b/roles/dotfiles/files/fish/config.fish
@@ -23,4 +23,6 @@ if test -e /home/rothe/catkin_ws/install/setup.bash
 	bass source ~/.profile
 end
 
+set -Ua fish_user_paths ~/go/bin/
+
 eval (keychain --eval --agents ssh)
diff --git a/roles/dotfiles/files/vimrc b/roles/dotfiles/files/vimrc
index db5b0b0..6456323 100644
--- a/roles/dotfiles/files/vimrc
+++ b/roles/dotfiles/files/vimrc
@@ -21,6 +21,12 @@ augroup terraform
 	autocmd FileType terraform :set tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent fileformat=unix
 	autocmd FileType terraform nnoremap <F9> :! terraform fmt<CR>
 augroup end
+augroup go
+	autocmd FileType go :set tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix
+	autocmd FileType go nnoremap <F9> :GoFmt<CR>
+	au FileType go nmap <F7> <Plug>(go-build)
+	au FileType go nmap <F8> <Plug>(go-run)
+augroup end
 augroup sh
 	autocmd FileType sh :set tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent fileformat=unix
 augroup end
@@ -47,6 +53,7 @@ Plug 'sainnhe/sonokai'
 " Language specific
 Plug 'vim-python/python-syntax'
 Plug 'wgwoods/vim-systemd-syntax'
+Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
 call plug#end()
 
 " Theme
@@ -85,7 +92,7 @@ autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
 map <C-t> :NERDTreeToggle<CR>
 
 " RAINBOW_PARENTHESES
-au FileType c,cpp,py call rainbow#load()
+"au FileType c,cpp,py call rainbow#load()
 
 " python syntax
 let g:python_highlight_all = 1