diff options
| author | Alex Auvolat <alex@adnab.me> | 2017-07-06 14:32:12 -0700 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2018-01-15 14:46:57 +0100 |
| commit | ba119ce15c875d2d1440a0ed4a66c963a765724b (patch) | |
| tree | faa355d934e4f147f2758f94bbe77e3c2fe00bb4 /dot_vimrc | |
| parent | 6babc5177251a2afa526daf8aa4ec3e2fbcdb6e8 (diff) | |
| download | user-config-ba119ce15c875d2d1440a0ed4a66c963a765724b.tar.gz user-config-ba119ce15c875d2d1440a0ed4a66c963a765724b.zip | |
Radical changes
Diffstat (limited to 'dot_vimrc')
| -rw-r--r-- | dot_vimrc | 98 |
1 files changed, 51 insertions, 47 deletions
@@ -1,6 +1,4 @@ -set ts=4 -set sw=4 -" autocmd FileType make setlocal noexpandtab +" ============== KEY MAPPINGS let mapleader="," @@ -9,50 +7,12 @@ map <leader>m <Esc>:set expandtab ts=2 sw=2 sts=2<CR> map <leader>t <Esc>:set noexpandtab ts=4 sw=4 sts=4<CR> map <leader>T <Esc>:set expandtab ts=4 sw=4 sts=4<CR> -au FileType python setl sw=4 sts=4 et -au FileType html setl sw=2 sts=2 et -au FileType htmldjango setl sw=2 sts=2 et -au FileType json setl sw=2 sts=2 et -au FileType yaml setl sw=2 sts=2 et -au FileType css setl sw=4 sts=4 et -au FileType lua setl ts=4 sw=4 noet - " Folds: map <leader>f <Esc>:set fen fdn=3 fdm=indent fml=1 fdc=3<CR> " H-L for next-prev buffer -nnoremap L :bnext<CR> -nnoremap H :bprev<CR> - - -set hlsearch -syntax on -set bg=dark - -set mouse=a -set number -set relativenumber -filetype plugin indent on -set term=xterm-256color - -set cursorline -hi CursorLine cterm=bold ctermbg=0 -hi Folded ctermfg=2 ctermbg=0 -hi FoldColumn ctermfg=2 ctermbg=0 - -let g:sclangTerm = "urxvt -e" - -autocmd FileType tex setlocal spell spelllang=en -highlight SpellBad ctermfg=red ctermbg=none - -let NERDTreeIgnore=['\.o$', '\.cmo$', '\.cmx$', '\.cmi$', '\.lib$', '\.pyc$', '^__pycache__$'] - -set wildmode=list:longest - -au BufRead,BufNewFile *.make set filetype=make -au BufRead,BufNewFile *.md set filetype=markdown -au BufRead,BufNewFile *.lus set filetype=lustre -au BufRead,BufNewFile *.scade set filetype=scade +nnoremap <leader>l :bnext<CR> +nnoremap <leader>k :bprev<CR> " Append modeline after last line in buffer. @@ -67,6 +27,29 @@ endfunction nnoremap <silent> <Leader>ml :call AppendModeline()<CR> +" =================== OPTIONS + +filetype plugin indent on +set autoindent +set ts=4 sw=4 + +" Controls +set mouse=a +set nostartofline +set wildmode=list:longest + +" Display +highlight SpellBad ctermfg=red ctermbg=none +set bg=dark +set hlsearch +set incsearch +syntax on +set lazyredraw +set number +set relativenumber +set showcmd +set shortmess=a +set display+=lastline " indentation for long line wraps set wrap @@ -74,15 +57,36 @@ set linebreak set breakindent let &showbreak = '> ' -set display+=lastline +" set cursorline +" hi CursorLine cterm=bold ctermbg=0 +" hi Folded ctermfg=2 ctermbg=0 +" hi FoldColumn ctermfg=2 ctermbg=0 -" set completeopt=menuone,menu,longest,preview +let g:sclangTerm = "urxvt -e" +let NERDTreeIgnore=['\.o$', '\.cmo$', '\.cmx$', '\.cmi$', '\.lib$', '\.pyc$', '^__pycache__$'] -set directory=~/.vim/swp -set backupdir=~/.vim/backup +" set completeopt=menuone,menu,longest,preview set undofile +set directory=~/.vim/swp +set backupdir=~/.vim/backup set undodir=~/.vim/undo +" =========== FILE TYPE SPECIFIC +au BufRead,BufNewFile *.make set filetype=make +au BufRead,BufNewFile *.md set filetype=markdown +au BufRead,BufNewFile *.lus set filetype=lustre +au BufRead,BufNewFile *.scade set filetype=scade + +au FileType make setl noexpandtab +au FileType python setl sw=4 sts=4 et +au FileType html setl sw=2 sts=2 et +au FileType htmldjango setl sw=2 sts=2 et +au FileType json setl sw=2 sts=2 et +au FileType yaml setl sw=2 sts=2 et +au FileType css setl sw=4 sts=4 et +au FileType lua setl ts=4 sw=4 noet + +autocmd FileType tex setlocal spell spelllang=en |