vim: re-enable filetype plugin

1 files changed, 10 insertions, 2 deletions

diff --git a/.vimrc b/.vimrc
index 71f3ecb..becc453 100644
--- a/.vimrc
+++ b/.vimrc
@@ -6,6 +6,9 @@ syntax off
 set background=dark
 set t_Co=0
 
+" Set filetype detection on, so that Git and other systems have autowrap
+filetype indent plugin on
+
 " Set utf8 as standard encoding and en_US as the standard language
 set encoding=utf8
 
@@ -23,10 +26,11 @@ set shortmess+=I
 " 1 tab == 8 spaces
 set shiftwidth=8
 set tabstop=8
+set textwidth=120
+set expandtab   " Tabs to spaces
 
-" Linebreak on 500 characters
+" Linebreak on textwidth characters
 set lbr
-set tw=500
 
 set ai "Auto indent
 set si "Smart indent
@@ -41,6 +45,10 @@ set history=100
 set autoread
 au FocusGained,BufEnter * checktime
 
+" Set text-wrap to 72 chars
+autocmd FileType text setlocal textwidth=72
+autocmd FileType markdown setlocal textwidth=72
+
 " Set 7 lines to the cursor - when moving vertically using j/k
 set so=7