X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=dotfiles%2Fvim%2F.vimrc;h=27e8d3fcde19493b1ff910d573d23f55ada1ead1;hb=d009b280d27991bba1fe21e1a8c566e60b2a6b86;hp=78f58a1b9fd69973bd94f306dbc9fee1382ad724;hpb=799ba44bafe18cf394cf8a59e9fdd0fe7bb6a023;p=shutils.git diff --git a/dotfiles/vim/.vimrc b/dotfiles/vim/.vimrc index 78f58a1..27e8d3f 100644 --- a/dotfiles/vim/.vimrc +++ b/dotfiles/vim/.vimrc @@ -8,10 +8,15 @@ "option and setting. +set nocompatible + " Pathogen runtime path manipulation "call pathogen#infect() "Using the infect method breaks ft detection +filetype off call pathogen#runtime_append_all_bundles() +call pathogen#helptags() +set encoding=utf8 "Activate syntax highlighting syntax on @@ -19,16 +24,15 @@ syntax on filetype plugin indent on set modeline -set autoindent -"set tabstop=4 set number -set bs=2 +set backspace=indent,eol,start "vim-7 and newer has vimspell (spell checker) built in if version >= 703 set spelllang=de_at,en set tabpagemax=20 - set colorcolumn=80,+1 + "set colorcolumn=80,+1 + set colorcolumn=+1 endif "Set some properties for ctags, grep and the size of the @@ -59,37 +63,46 @@ highlight BadWhitespace ctermbg=red guibg=red " Make trailing whitespace be flagged as bad. au Filetype python,tex,c,cpp,cs,objc,java syn match BadWhitespace /\s\+$/ containedin=ALL -" set list to activate set listchars=tab:»­,trail:·,eol:$ +set autoindent +set tabstop=4 +set shiftwidth=4 +if exists(":DetectIndent") + au BufReadPost * :DetectIndent +endif +"au Filetype python,tex,c,cpp,cs,objc,java :DetectIndent +"let g:detectindent_preferred_expandtab = 1 +"let g:detectindent_preferred_indent = 4 -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" fortran -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +let g:syntastic_mode_map = { 'mode' : 'active', 'active_filetypes' : [], 'passive_filetypes' : ['html'] } -"let fortran_free_source=1 -au BufNewFile *.f90 set fortran_free_source=1 -au BufRead,BufNewFile *.INC set filetype=fortran -au Filetype fortran set cindent cst csto=0 +" Use 256 colors +set t_Co=256 +let g:CSApprox_attr_map = { 'bold' : 'bold', 'italic' : '', 'sp' : '' } +colorscheme shuber-wombat +set cursorline +set laststatus=2 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" IRSSI logs +" key bindings """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -au BufRead,BufNewFile */.irssi/logs/*.log set filetype=irssilog +map NERDCommenterToggle """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Easychair conference system review form -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" fortran +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -au BufRead,BufNewFile review_form_*.txt set filetype=easychair -au Syntax easychair runtime! syntax/easychair.vim +"let fortran_free_source=1 +au BufNewFile *.f90 set fortran_free_source=1 +au Filetype fortran set cindent cst csto=0 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -104,8 +117,6 @@ au Filetype c,cpp,cs,objc,java set cindent cst csto=0 au Filetype c,cpp,cs,objc map :make au Filetype java map :!ant -f ../build.xml au Filetype c,cpp,cs,obj set makeprg=make -au Filetype c,cpp,cs,obj set tabstop=4 -au Filetype c,cpp,cs,obj set shiftwidth=4 "Adds STL prefix 'std::' to 'id' @@ -168,6 +179,10 @@ if version>=700 au Filetype mail,text set fo+=n spell endif +"Scissor line +au Filetype mail syn match Statement /^\s*-*\s*>8\s*-*\s*$/ +au Filetype mail syn match Statement /^\s*-*\s*8<\s*-*\s*$/ + """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -218,17 +233,6 @@ let g:LatexBox_latexmk_options="-pvc" au Filetype tex set smartindent -au Filetype tex set tabstop=4 -au Filetype tex set shiftwidth=4 - -au Filetype tex map! ,b \begin{}i -au Filetype tex map! ,e :call TexClosePrev(0)a -au Filetype tex map! ,i \begin{itemize}\end{itemize}O\item -au Filetype tex map! ,f \begin{frame}\end{frame}O\frametitle{ -au Filetype tex map! ,p \begin{figure}\end{figure}O\centering\includegraphics{ - - - if version >= 700 au Filetype tex set spell endif @@ -246,14 +250,11 @@ au Filetype python map :!python % " Number of spaces that a pre-existing tab is equal to. " For the amount of space used for a new tab use shiftwidth. -au Filetype python set tabstop=4 au Filetype python set shiftwidth=4 au Filetype python set expandtab " Wrap text after a certain number of characters -au BufRead,BufNewFile *.py,*.pyw set textwidth=79 - - +au Filetype python set textwidth=79 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -268,45 +269,21 @@ au Filetype xml map :call OpenIn("ipe") " gnuplot """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -au BufRead,BufNewFile *.plt set filetype=gnuplot -au BufRead,BufNewFile *.plot set filetype=gnuplot -au BufRead,BufNewFile *.gnuplot set filetype=gnuplot - "Opens the current file in ipe au Filetype gnuplot map :call OpenIn("gnuplot -persist") - """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Commenting +" youcompleteme """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:EnhCommentifyUseAltKeys = 'Yes' +let g:ycm_min_num_of_chars_for_completion = 999 +let g:ycm_key_list_select_completion = [''] -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" Tab completion -""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" - -"function InsertTabWrapper() -" let col = col('.') - 1 -" if !col || getline('.')[col - 1] !~ '\k' -" return "\" -" else -" return "\" -" endif -"endfunction - -" Remap the tab key to select action with InsertTabWrapper -"inoremap =InsertTabWrapper() - -let g:SuperTabMappingForward = "" -let g:SuperTabDefaultCompletionType = 'context' -"let g:SuperTabDefaultCompletionType = '' - - -source ~/.vimrc-local +if filereadable($HOME . "/.vimrc-local") + source ~/.vimrc-local +endif