diff --git a/vim/.vimrc b/vim/.vimrc
index 7eefd21..3c3c02b 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -37,6 +37,7 @@ endif
 
 filetype plugin indent on
 
+set autoindent
 set autowrite
 set expandtab
 set ignorecase
@@ -49,9 +50,8 @@ set number
 set printoptions=paper:A4,syntax:n,number:y
 set shiftwidth=4
 set showbreak=↪\
-set smartindent
 set statusline=[%n]\ %<%f\ %h%w%m%r%=%{&fileencoding?&fileencoding:&encoding}[%{&fileformat}\]\ %y\ %l,%c%V\ %P
-set textwidth=80
+set textwidth=120
 set wrapscan
 
 let mapleader=" "
@@ -76,5 +76,5 @@ augroup flexo
   autocmd BufNewFile,BufRead *.pdc,*.pandoc setlocal filetype=markdown
   autocmd FileType puppet setlocal tw=140
   autocmd FileType sh,zsh,ruby,vim,yaml setlocal sw=2
-  autocmd Filetype go setlocal noexpandtab
+  autocmd Filetype go setlocal noexpandtab sw=8
 augroup END