diff --git a/README.md b/README.md index 9ba1275a..4e0d4dc8 100644 --- a/README.md +++ b/README.md @@ -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` * [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 -* [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-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 diff --git a/install_awesome_vimrc.sh b/install_awesome_vimrc.sh old mode 100644 new mode 100755 diff --git a/install_basic_vimrc.sh b/install_basic_vimrc.sh old mode 100644 new mode 100755 diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index 11d1ed81..1e75a3fb 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -39,6 +39,7 @@ filetype indent on " Set to auto read when a file is changed from the outside set autoread +au FocusGained,BufEnter * checktime " With a map leader it's possible to do extra key combinations " like w saves the current file @@ -79,7 +80,7 @@ endif set ruler " Height of the command bar -set cmdheight=2 +set cmdheight=1 " A buffer becomes hidden when it is abandoned set hid @@ -163,7 +164,7 @@ set ffs=unix,dos,mac """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => 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 nowb set noswapfile diff --git a/vimrcs/extended.vim b/vimrcs/extended.vim index 1c7ab82a..ee8789d5 100644 --- a/vimrcs/extended.vim +++ b/vimrcs/extended.vim @@ -14,9 +14,9 @@ if has("mac") || has("macunix") elseif has("win16") || has("win32") set gfn=IBM\ Plex\ Mono:h14,Source\ Code\ Pro:h12,Bitstream\ Vera\ Sans\ Mono:h11 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") - 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") set gfn=Monospace\ 11 endif diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim index 6842b632..7ee073b8 100644 --- a/vimrcs/plugins_config.vim +++ b/vimrcs/plugins_config.vim @@ -1,6 +1,6 @@ """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " 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${ _(2f"a) } """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " => lightline """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:lightline = { - \ 'colorscheme': 'wombat', - \ } - let g:lightline = { \ 'colorscheme': 'wombat', \ 'active': {