Merge branch 'master' of github.com:amix/vimrc
This commit is contained in:
commit
f33d38b90c
6 changed files with 7 additions and 10 deletions
|
@ -97,7 +97,7 @@ I recommend reading the docs of these plugins to understand them better. Each pl
|
||||||
* [open_file_under_cursor.vim](https://github.com/amix/open_file_under_cursor.vim): Open file under cursor when pressing `gf`
|
* [open_file_under_cursor.vim](https://github.com/amix/open_file_under_cursor.vim): Open file under cursor when pressing `gf`
|
||||||
* [pathogen.vim](https://github.com/tpope/vim-pathogen): Manage your vim runtimepath
|
* [pathogen.vim](https://github.com/tpope/vim-pathogen): Manage your vim runtimepath
|
||||||
* [snipmate.vim](https://github.com/garbas/vim-snipmate): snipmate.vim aims to be a concise vim script that implements some of TextMate's snippets features in Vim
|
* [snipmate.vim](https://github.com/garbas/vim-snipmate): snipmate.vim aims to be a concise vim script that implements some of TextMate's snippets features in Vim
|
||||||
* [ale](https://github.com/w0rp/ale): Syntax and lint checking for vim (async)
|
* [ale](https://github.com/w0rp/ale): Syntax and lint checking for vim (ALE requires NeoVim >= 0.2.0 or Vim 8 with +timers +job +channel)
|
||||||
* [vim-commentary](https://github.com/tpope/vim-commentary): Comment stuff out. Use `gcc` to comment out a line (takes a count), `gc` to comment out the target of a motion. `gcu` uncomments a set of adjacent commented lines.
|
* [vim-commentary](https://github.com/tpope/vim-commentary): Comment stuff out. Use `gcc` to comment out a line (takes a count), `gc` to comment out the target of a motion. `gcu` uncomments a set of adjacent commented lines.
|
||||||
* [vim-expand-region](https://github.com/terryma/vim-expand-region): Allows you to visually select increasingly larger regions of text using the same key combination
|
* [vim-expand-region](https://github.com/terryma/vim-expand-region): Allows you to visually select increasingly larger regions of text using the same key combination
|
||||||
* [vim-fugitive](https://github.com/tpope/vim-fugitive): A Git wrapper so awesome, it should be illegal
|
* [vim-fugitive](https://github.com/tpope/vim-fugitive): A Git wrapper so awesome, it should be illegal
|
||||||
|
|
0
install_awesome_vimrc.sh
Normal file → Executable file
0
install_awesome_vimrc.sh
Normal file → Executable file
0
install_basic_vimrc.sh
Normal file → Executable file
0
install_basic_vimrc.sh
Normal file → Executable file
|
@ -39,6 +39,7 @@ filetype indent on
|
||||||
|
|
||||||
" Set to auto read when a file is changed from the outside
|
" Set to auto read when a file is changed from the outside
|
||||||
set autoread
|
set autoread
|
||||||
|
au FocusGained,BufEnter * checktime
|
||||||
|
|
||||||
" With a map leader it's possible to do extra key combinations
|
" With a map leader it's possible to do extra key combinations
|
||||||
" like <leader>w saves the current file
|
" like <leader>w saves the current file
|
||||||
|
@ -79,7 +80,7 @@ endif
|
||||||
set ruler
|
set ruler
|
||||||
|
|
||||||
" Height of the command bar
|
" Height of the command bar
|
||||||
set cmdheight=2
|
set cmdheight=1
|
||||||
|
|
||||||
" A buffer becomes hidden when it is abandoned
|
" A buffer becomes hidden when it is abandoned
|
||||||
set hid
|
set hid
|
||||||
|
@ -163,7 +164,7 @@ set ffs=unix,dos,mac
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
" => Files, backups and undo
|
" => Files, backups and undo
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
" Turn backup off, since most stuff is in SVN, git et.c anyway...
|
" Turn backup off, since most stuff is in SVN, git etc. anyway...
|
||||||
set nobackup
|
set nobackup
|
||||||
set nowb
|
set nowb
|
||||||
set noswapfile
|
set noswapfile
|
||||||
|
|
|
@ -14,9 +14,9 @@ if has("mac") || has("macunix")
|
||||||
elseif has("win16") || has("win32")
|
elseif has("win16") || has("win32")
|
||||||
set gfn=IBM\ Plex\ Mono:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
|
set gfn=IBM\ Plex\ Mono:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11
|
||||||
elseif has("gui_gtk2")
|
elseif has("gui_gtk2")
|
||||||
set gfn=IBM\ Plex\ Mono:h14,:Hack\ 14,Source\ Code\ Pro\ 12,Bitstream\ Vera\ Sans\ Mono\ 11
|
set gfn=IBM\ Plex\ Mono\ 14,:Hack\ 14,Source\ Code\ Pro\ 12,Bitstream\ Vera\ Sans\ Mono\ 11
|
||||||
elseif has("linux")
|
elseif has("linux")
|
||||||
set gfn=IBM\ Plex\ Mono:h14,:Hack\ 14,Source\ Code\ Pro\ 12,Bitstream\ Vera\ Sans\ Mono\ 11
|
set gfn=IBM\ Plex\ Mono\ 14,:Hack\ 14,Source\ Code\ Pro\ 12,Bitstream\ Vera\ Sans\ Mono\ 11
|
||||||
elseif has("unix")
|
elseif has("unix")
|
||||||
set gfn=Monospace\ 11
|
set gfn=Monospace\ 11
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
" Important:
|
" Important:
|
||||||
" This requries that you install https://github.com/amix/vimrc !
|
" This requires that you install https://github.com/amix/vimrc !
|
||||||
"
|
"
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
|
|
||||||
|
@ -113,10 +113,6 @@ au FileType mako vmap Si S"i${ _(<esc>2f"a) }<esc>
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
" => lightline
|
" => lightline
|
||||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||||
let g:lightline = {
|
|
||||||
\ 'colorscheme': 'wombat',
|
|
||||||
\ }
|
|
||||||
|
|
||||||
let g:lightline = {
|
let g:lightline = {
|
||||||
\ 'colorscheme': 'wombat',
|
\ 'colorscheme': 'wombat',
|
||||||
\ 'active': {
|
\ 'active': {
|
||||||
|
|
Loading…
Reference in a new issue