Expand the short hand, do some additional clean up
Also added a line to always show the status line, similar to the one thing I liked about NeoVim
This commit is contained in:
parent
7f4c250187
commit
34dba2da21
1 changed files with 24 additions and 12 deletions
36
vim/.vimrc
36
vim/.vimrc
|
@ -4,6 +4,7 @@ if empty(glob('~/.vim/autoload/plug.vim'))
|
||||||
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
" A humble list of plugins
|
||||||
call plug#begin()
|
call plug#begin()
|
||||||
" Solarized, without the bullshit
|
" Solarized, without the bullshit
|
||||||
Plug 'romainl/flattened'
|
Plug 'romainl/flattened'
|
||||||
|
@ -23,26 +24,37 @@ call plug#begin()
|
||||||
Plug 'ruanyl/vim-gh-line'
|
Plug 'ruanyl/vim-gh-line'
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
|
" Color scheme and syntax highlighting
|
||||||
syntax on
|
syntax on
|
||||||
color flattened_dark
|
color flattened_dark
|
||||||
set background=dark
|
set background=dark
|
||||||
|
|
||||||
" Ensures misspellings are highlighted
|
" Ensures misspellings are highlighted
|
||||||
hi SpellBad ctermfg=white ctermbg=red
|
highlight SpellBad ctermfg=white ctermbg=red
|
||||||
|
|
||||||
set ai et si sts=2 sw=2 ts=2
|
|
||||||
set cc=80,100,120
|
|
||||||
set hid
|
|
||||||
set hls ic is
|
|
||||||
set nu rnu
|
|
||||||
|
|
||||||
|
" Global settings
|
||||||
|
set autoindent
|
||||||
|
set colorcolumn=80,100,120
|
||||||
|
set expandtab
|
||||||
|
set hidden
|
||||||
|
set hlsearch
|
||||||
|
set ignorecase
|
||||||
|
set incsearch
|
||||||
|
set laststatus=2
|
||||||
|
set number
|
||||||
|
set relativenumber
|
||||||
|
set shiftwidth=2
|
||||||
|
set smartindent
|
||||||
|
set softtabstop=2
|
||||||
|
set tabstop=2
|
||||||
set undofile
|
set undofile
|
||||||
|
|
||||||
autocmd FileType php,python setl sts=4 sw=4 ts=4
|
" Filetype-specific settings
|
||||||
autocmd FileType gitcommit,markdown,text setl nosi spell
|
autocmd FileType gitcommit setl colorcolumn=50,72 textwidth=72
|
||||||
autocmd FileType gitcommit setl cc=50,72 tw=72
|
autocmd FileType gitcommit,markdown,text setl nosmartindent spell
|
||||||
autocmd FileType markdown,text setl tw=80 wm=2
|
autocmd FileType markdown,text setl textwidth=80 wrapmargin=2
|
||||||
|
autocmd FileType php,python setl shiftwidth=4 softtabstop=4 tabstop=4
|
||||||
|
|
||||||
|
" Strip trailing whitespace on save
|
||||||
autocmd BufWritePre * :%s/\s\+$//e
|
autocmd BufWritePre * :%s/\s\+$//e
|
||||||
|
|
||||||
" Set the runtime path for fzf based on OS
|
" Set the runtime path for fzf based on OS
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue