Merge branch 'master' of git.riedstra.us:mitch/vim-cfg

1 files changed, 24 insertions, 3 deletions

diff --git a/init.vim b/init.vim
index 5ec08f8..b4ab946 100644
--- a/init.vim
+++ b/init.vim
@@ -3,11 +3,20 @@ set encoding=utf-8
 
 execute pathogen#infect('bundle/{}', 'themes/{}')
 
+" Maily for the ability to match HTML tags with '%'
+runtime macros/matchit.vim
+
+" colorscheme 256_noir
+
 " My old standard theme
 colorscheme distinguished
 " colorscheme solarized
 set background=dark
 
+" colorscheme solarized
+" let g:solarized_termcolors=256
+" set background=dark
+
 
 " Love hate relationship with this thing. I guess it's back
 map <C-n> :NERDTreeToggle<CR>
@@ -109,6 +118,11 @@ set updatecount=0
 " Vi in-compatibility
 set nocompatible
 
+set tabstop=4
+set shiftwidth=4
+set noexpandtab
+
+
 
 autocmd Filetype python call SetPythonOptions()
 autocmd Filetype htmldjango call SethtmldjangoOptions()
@@ -119,7 +133,15 @@ autocmd Filetype html call SetHTMLOptions()
 autocmd Filetype sh call SetShellOptions()
 autocmd Filetype go call SetGoOptions()
 autocmd Filetype yaml call SetYamlOptions()
+autocmd Filetype markdown call SetMarkdownOptions()
 
+function SetMarkdownOptions()
+	set spell
+	set tabstop=4
+	set shiftwidth=4
+	set expandtab
+	AcpDisable
+endfunction
 function SetPythonOptions()
 	set tabstop=4
 	set shiftwidth=4
@@ -187,9 +209,8 @@ function SetYamlOptions()
 	set noic
 endfunction
 
-set tabstop=4
-set shiftwidth=4
-set noexpandtab
+" This is specifically for Salt's state files 'sls'
+autocmd BufNewFile,BufRead *.sls set filetype=yaml
 
 
 function! PhpSyntaxOverride()