diff options
| -rw-r--r-- | init.vim | 27 | ||||
| -rwxr-xr-x | link-vimrc.sh | 5 |
2 files changed, 29 insertions, 3 deletions
@@ -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() diff --git a/link-vimrc.sh b/link-vimrc.sh index a4de866..f7dfc71 100755 --- a/link-vimrc.sh +++ b/link-vimrc.sh @@ -17,6 +17,11 @@ $HOME/.nvimrc" directories="$HOME/.config/nvim $HOME/.nvim" +if ! [ -d "$HOME/.config" ] ; then + mkdir $HOME/.config && \ + printf "\033[1;33mCREATED: %s\033[0m\n" "$HOME/.config" +fi + for _file in $files; do if [ -L $_file ] ; then printf "\033[1;32mOK: %s\033[0m\n" "$_file" |