cleanups.
This commit is contained in:
parent
e5f119f088
commit
36942192ff
1 changed files with 31 additions and 26 deletions
57
.vimrc
57
.vimrc
|
|
@ -1,7 +1,10 @@
|
||||||
|
" Vim configuration from Johannes Findeisen <you@hanez.org>
|
||||||
|
|
||||||
" Managed plugins
|
" Managed plugins
|
||||||
call plug#begin()
|
call plug#begin()
|
||||||
" List your plugins here
|
" List your plugins here
|
||||||
Plug 'tpope/vim-sensible'
|
Plug 'tpope/vim-sensible'
|
||||||
|
Plug 'tpope/vim-eunuch'
|
||||||
Plug 'tpope/vim-fugitive'
|
Plug 'tpope/vim-fugitive'
|
||||||
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
Plug 'neoclide/coc.nvim', {'branch': 'release'}
|
||||||
Plug 'bluz71/vim-moonfly-colors', { 'as': 'moonfly' }
|
Plug 'bluz71/vim-moonfly-colors', { 'as': 'moonfly' }
|
||||||
|
|
@ -15,14 +18,16 @@ call plug#end()
|
||||||
" desert feral gentooish grb256 jellygrass kalt last256 matrix
|
" desert feral gentooish grb256 jellygrass kalt last256 matrix
|
||||||
colorscheme molokai
|
colorscheme molokai
|
||||||
|
|
||||||
" * User Interface
|
" Dark background, by default (is this needed when setting the colorsheme?).
|
||||||
|
|
||||||
" dark background, by default
|
|
||||||
set background=dark
|
set background=dark
|
||||||
" mouse selection
|
|
||||||
|
" Mouse selection
|
||||||
|
set mouse=
|
||||||
set selectmode=mouse
|
set selectmode=mouse
|
||||||
|
|
||||||
" No beeping, please...
|
" No beeping, please...
|
||||||
set vb
|
set vb
|
||||||
|
|
||||||
" Display the current mode and partially-typed commands in the status line
|
" Display the current mode and partially-typed commands in the status line
|
||||||
set showmode
|
set showmode
|
||||||
set showcmd
|
set showcmd
|
||||||
|
|
@ -49,34 +54,34 @@ set guioptions-=e
|
||||||
set statusline=
|
set statusline=
|
||||||
" filename, relative to cwd
|
" filename, relative to cwd
|
||||||
set statusline+=%f
|
set statusline+=%f
|
||||||
" separator
|
" Separator
|
||||||
set statusline+=\
|
set statusline+=\
|
||||||
" modified flag
|
" modified flag
|
||||||
set statusline+=%#wildmenu#
|
set statusline+=%#wildmenu#
|
||||||
set statusline+=%m
|
set statusline+=%m
|
||||||
set statusline+=%*
|
set statusline+=%*
|
||||||
"Display a warning if file encoding isnt utf-8
|
" Display a warning if file encoding isnt utf-8
|
||||||
set statusline+=%#question#
|
set statusline+=%#question#
|
||||||
set statusline+=%{(&fenc!='utf-8'&&&fenc!='')?'['.&fenc.']':''}
|
set statusline+=%{(&fenc!='utf-8'&&&fenc!='')?'['.&fenc.']':''}
|
||||||
set statusline+=%*
|
set statusline+=%*
|
||||||
"display a warning if fileformat isnt unix
|
" Display a warning if fileformat isnt unix
|
||||||
set statusline+=%#directory#
|
set statusline+=%#directory#
|
||||||
set statusline+=%{&ff!='unix'?'['.&ff.']':''}
|
set statusline+=%{&ff!='unix'?'['.&ff.']':''}
|
||||||
set statusline+=%*
|
set statusline+=%*
|
||||||
"display a warning if files contains tab chars
|
" Display a warning if files contains tab chars
|
||||||
set statusline+=%#warningmsg#
|
set statusline+=%#warningmsg#
|
||||||
set statusline+=%{StatuslineTabWarning()}
|
set statusline+=%{StatuslineTabWarning()}
|
||||||
set statusline+=%*
|
set statusline+=%*
|
||||||
" read-only
|
" Read-only
|
||||||
set statusline+=%r
|
set statusline+=%r
|
||||||
set statusline+=%*
|
set statusline+=%*
|
||||||
" right-align
|
" Right-align
|
||||||
set statusline+=%=
|
set statusline+=%=
|
||||||
" filetype
|
" Filetype
|
||||||
set statusline+=[%{strlen(&ft)?&ft:'none'}]
|
set statusline+=[%{strlen(&ft)?&ft:'none'}]
|
||||||
" separator
|
" Separator
|
||||||
set statusline+=\
|
set statusline+=\
|
||||||
" current char
|
" Current char
|
||||||
set statusline+=[%b],[0x%02B]
|
set statusline+=[%b],[0x%02B]
|
||||||
" separator
|
" separator
|
||||||
set statusline+=\
|
set statusline+=\
|
||||||
|
|
@ -140,17 +145,19 @@ set encoding=utf-8
|
||||||
" Code indentation
|
" Code indentation
|
||||||
syntax enable
|
syntax enable
|
||||||
filetype plugin indent on
|
filetype plugin indent on
|
||||||
set tabstop=4
|
set tabstop=2
|
||||||
set shiftwidth=4
|
set shiftwidth=2
|
||||||
|
set softtabstop=2
|
||||||
set expandtab
|
set expandtab
|
||||||
" set number
|
set autoindent
|
||||||
" filetype indent on
|
|
||||||
" set autoindent
|
|
||||||
|
|
||||||
filetype indent off
|
"filetype indent off
|
||||||
set noautoindent
|
"set noautoindent
|
||||||
set nocindent
|
"set nocindent
|
||||||
set nosmartindent
|
"set nosmartindent
|
||||||
|
|
||||||
|
" Show line number
|
||||||
|
"set number
|
||||||
|
|
||||||
" Better command-line completion
|
" Better command-line completion
|
||||||
set wildmenu
|
set wildmenu
|
||||||
|
|
@ -197,16 +204,14 @@ function! XTermPasteBegin()
|
||||||
return ""
|
return ""
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
" * Load Additional Settings
|
" OS-specific configuration
|
||||||
|
|
||||||
" OS-specific configuration loading
|
|
||||||
let s:os=substitute(system('uname -s'), '\n', '', 'g')
|
let s:os=substitute(system('uname -s'), '\n', '', 'g')
|
||||||
let s:osfile=$HOME . '/.vim/local/os-' . s:os . '.vim'
|
let s:osfile=$HOME . '/.vim/local/os-' . s:os . '.vim'
|
||||||
if filereadable(s:osfile)
|
if filereadable(s:osfile)
|
||||||
execute 'source '. s:osfile
|
execute 'source '. s:osfile
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" host-specific configuration loading
|
" host-specific configuration
|
||||||
let s:hostfile=$HOME . '/.vim/local/host-' . hostname() . '.vim'
|
let s:hostfile=$HOME . '/.vim/local/host-' . hostname() . '.vim'
|
||||||
if filereadable(s:hostfile)
|
if filereadable(s:hostfile)
|
||||||
execute 'source '. s:hostfile
|
execute 'source '. s:hostfile
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue