Merge branch 'master' of github.com:amix/vimrc
This commit is contained in:
Amir
commit
83980d8f24
2 changed files with 17 additions and 17 deletions
|
|
@ -17,13 +17,13 @@ from os import path
|
|||
# --- Globals ----------------------------------------------
|
||||
PLUGINS = """
|
||||
auto-pairs https://github.com/jiangmiao/auto-pairs
|
||||
ale https://github.com/w0rp/ale
|
||||
ale https://github.com/dense-analysis/ale
|
||||
vim-yankstack https://github.com/maxbrunsfeld/vim-yankstack
|
||||
ack.vim https://github.com/mileszs/ack.vim
|
||||
bufexplorer https://github.com/jlanzarotta/bufexplorer
|
||||
ctrlp.vim https://github.com/ctrlpvim/ctrlp.vim
|
||||
mayansmoke https://github.com/vim-scripts/mayansmoke
|
||||
nerdtree https://github.com/scrooloose/nerdtree
|
||||
nerdtree https://github.com/preservim/nerdtree
|
||||
nginx.vim https://github.com/chr4/nginx.vim
|
||||
open_file_under_cursor.vim https://github.com/amix/open_file_under_cursor.vim
|
||||
tlib https://github.com/tomtom/tlib_vim
|
||||
|
|
@ -51,7 +51,7 @@ vim-flake8 https://github.com/nvie/vim-flake8
|
|||
vim-pug https://github.com/digitaltoad/vim-pug
|
||||
lightline.vim https://github.com/itchyny/lightline.vim
|
||||
lightline-ale https://github.com/maximbaz/lightline-ale
|
||||
vim-abolish https://github.com/tpope/tpope-vim-abolish
|
||||
vim-abolish https://github.com/tpope/vim-abolish
|
||||
rust.vim https://github.com/rust-lang/rust.vim
|
||||
vim-markdown https://github.com/plasticboy/vim-markdown
|
||||
vim-gist https://github.com/mattn/vim-gist
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" Maintainer:
|
||||
" Maintainer:
|
||||
" Amir Salihefendic — @amix3k
|
||||
"
|
||||
" Awesome_version:
|
||||
|
|
@ -48,7 +48,7 @@ let mapleader = ","
|
|||
" Fast saving
|
||||
nmap <leader>w :w!<cr>
|
||||
|
||||
" :W sudo saves the file
|
||||
" :W sudo saves the file
|
||||
" (useful for handling the permission-denied error)
|
||||
command! W execute 'w !sudo tee % > /dev/null' <bar> edit!
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ command! W execute 'w !sudo tee % > /dev/null' <bar> edit!
|
|||
set so=7
|
||||
|
||||
" Avoid garbled characters in Chinese language windows OS
|
||||
let $LANG='en'
|
||||
let $LANG='en'
|
||||
set langmenu=en
|
||||
source $VIMRUNTIME/delmenu.vim
|
||||
source $VIMRUNTIME/menu.vim
|
||||
|
|
@ -76,7 +76,7 @@ else
|
|||
set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/.DS_Store
|
||||
endif
|
||||
|
||||
"Always show current position
|
||||
" Always show current position
|
||||
set ruler
|
||||
|
||||
" Height of the command bar
|
||||
|
|
@ -92,23 +92,24 @@ set whichwrap+=<,>,h,l
|
|||
" Ignore case when searching
|
||||
set ignorecase
|
||||
|
||||
" When searching try to be smart about cases
|
||||
" When searching try to be smart about cases
|
||||
set smartcase
|
||||
|
||||
" Highlight search results
|
||||
set hlsearch
|
||||
|
||||
" Makes search act like search in modern browsers
|
||||
set incsearch
|
||||
set incsearch
|
||||
|
||||
" Don't redraw while executing macros (good performance config)
|
||||
set lazyredraw
|
||||
set lazyredraw
|
||||
|
||||
" For regular expressions turn magic on
|
||||
set magic
|
||||
|
||||
" Show matching brackets when text indicator is over them
|
||||
set showmatch
|
||||
set showmatch
|
||||
|
||||
" How many tenths of a second to blink when matching brackets
|
||||
set mat=2
|
||||
|
||||
|
|
@ -123,7 +124,6 @@ if has("gui_macvim")
|
|||
autocmd GUIEnter * set vb t_vb=
|
||||
endif
|
||||
|
||||
|
||||
" Add a bit extra margin to the left
|
||||
set foldcolumn=1
|
||||
|
||||
|
|
@ -132,7 +132,7 @@ set foldcolumn=1
|
|||
" => Colors and Fonts
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
" Enable syntax highlighting
|
||||
syntax enable
|
||||
syntax enable
|
||||
|
||||
" Enable 256 colors palette in Gnome Terminal
|
||||
if $COLORTERM == 'gnome-terminal'
|
||||
|
|
@ -230,8 +230,8 @@ map <leader>h :bprevious<cr>
|
|||
map <leader>tn :tabnew<cr>
|
||||
map <leader>to :tabonly<cr>
|
||||
map <leader>tc :tabclose<cr>
|
||||
map <leader>tm :tabmove
|
||||
map <leader>t<leader> :tabnext
|
||||
map <leader>tm :tabmove
|
||||
map <leader>t<leader> :tabnext
|
||||
|
||||
" Let 'tl' toggle between this and the last accessed tab
|
||||
let g:lasttab = 1
|
||||
|
|
@ -246,7 +246,7 @@ map <leader>te :tabedit <C-r>=expand("%:p:h")<cr>/
|
|||
" Switch CWD to the directory of the open buffer
|
||||
map <leader>cd :cd %:p:h<cr>:pwd<cr>
|
||||
|
||||
" Specify the behavior when switching between buffers
|
||||
" Specify the behavior when switching between buffers
|
||||
try
|
||||
set switchbuf=useopen,usetab,newtab
|
||||
set stal=2
|
||||
|
|
@ -363,7 +363,7 @@ endfunction
|
|||
|
||||
function! CmdLine(str)
|
||||
call feedkeys(":" . a:str)
|
||||
endfunction
|
||||
endfunction
|
||||
|
||||
function! VisualSelection(direction, extra_filter) range
|
||||
let l:saved_reg = @"
|
||||
|
|
|
|||
Loading…
Reference in a new issue