mirror of
https://github.com/amix/vimrc
synced 2024-12-24 02:43:08 +00:00
Merge branch 'master' of github.com:amix/vimrc
This commit is contained in:
commit
2c130b90b5
7 changed files with 21 additions and 36 deletions
|
@ -23,9 +23,9 @@ The awesome version includes a lot of great plugins, configurations and color sc
|
|||
To install for multiple users, the repository needs to be cloned to a location accessible for all the intended users.
|
||||
|
||||
git clone --depth=1 https://github.com/amix/vimrc.git /opt/vim_runtime
|
||||
sh ~/.vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime user0 user1 user2
|
||||
# to install for all users with home directories
|
||||
sh ~/.vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime --all
|
||||
sh /opt/vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime user0 user1 user2
|
||||
# to install for all users with home directories, note that root will not be included
|
||||
sh /opt/vim_runtime/install_awesome_parameterized.sh /opt/vim_runtime --all
|
||||
|
||||
Naturally, `/opt/vim_runtime` can be any directory, as long as all the users specified have read access.
|
||||
|
||||
|
@ -172,7 +172,6 @@ Map `<Space>` to `/` (search) and `<Ctrl>+<Space>` to `?` (backwards search):
|
|||
|
||||
map <space> /
|
||||
map <C-space> ?
|
||||
map <silent> <leader><cr> :noh<cr>
|
||||
|
||||
Disable highlights when you press `<leader><cr>`:
|
||||
|
||||
|
@ -202,7 +201,7 @@ Useful mappings for managing tabs:
|
|||
|
||||
" Opens a new tab with the current buffer's path
|
||||
" Super useful when editing files in the same directory
|
||||
map <leader>te :tabedit <C-r>=expand("%:p:h")<cr>/
|
||||
map <leader>te :tabedit <C-r>=escape(expand("%:p:h"), " ")<cr>/
|
||||
|
||||
Switch [CWD](http://vim.wikia.com/wiki/Set_working_directory_to_the_current_file) to the directory of the open buffer:
|
||||
|
||||
|
|
|
@ -205,18 +205,11 @@ if &background=='light'
|
|||
" NOTE THIS IS IN THE WARM SECTION
|
||||
if v:version >= 700
|
||||
if has('spell')
|
||||
if 0
|
||||
" ctermsp is not supported in Vim7, we ignore it.
|
||||
hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=130
|
||||
hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=25
|
||||
hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=133
|
||||
hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=23
|
||||
else
|
||||
hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=NONE
|
||||
hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=NONE
|
||||
hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=NONE
|
||||
hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=NONE
|
||||
endif
|
||||
" ctermsp is not supported in Vim7, we ignore it.
|
||||
hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=130
|
||||
hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=25
|
||||
hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=133
|
||||
hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=23
|
||||
endif
|
||||
hi Pmenu ctermfg=fg ctermbg=182
|
||||
hi PmenuSel ctermfg=255 ctermbg=95 cterm=NONE
|
||||
|
@ -540,17 +533,10 @@ elseif &background=='dark'
|
|||
if v:version >= 700
|
||||
if has('spell')
|
||||
" the ctermsp= is not supported in Vim 7 we simply ignored
|
||||
if 0
|
||||
hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=209
|
||||
hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=69
|
||||
hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=219
|
||||
hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=153
|
||||
else
|
||||
hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=NONE
|
||||
hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=NONE
|
||||
hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=NONE
|
||||
hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=NONE
|
||||
endif
|
||||
hi SpellBad cterm=undercurl ctermbg=NONE ctermfg=209
|
||||
hi SpellCap cterm=undercurl ctermbg=NONE ctermfg=69
|
||||
hi SpellRare cterm=undercurl ctermbg=NONE ctermfg=219
|
||||
hi SpellLocal cterm=undercurl ctermbg=NONE ctermfg=153
|
||||
endif
|
||||
|
||||
hi Pmenu ctermfg=White ctermbg=DarkGrey
|
||||
|
|
|
@ -13,7 +13,7 @@ function! ale_linters#powershell#psscriptanalyzer#GetExecutable(buffer) abort
|
|||
return ale#Var(a:buffer, 'powershell_psscriptanalyzer_executable')
|
||||
endfunction
|
||||
|
||||
" Run Invoke-ScriptAnalyzer and output each linting message as 4 seperate lines
|
||||
" Run Invoke-ScriptAnalyzer and output each linting message as 4 separate lines
|
||||
" for each parsing
|
||||
function! ale_linters#powershell#psscriptanalyzer#GetCommand(buffer) abort
|
||||
let l:exclude_option = ale#Var(
|
||||
|
|
|
@ -1940,7 +1940,7 @@ syn keyword ngxDirectiveThirdParty srcache_default_expire
|
|||
syn keyword ngxDirectiveThirdParty srcache_max_expire
|
||||
|
||||
" SSSD Info Module <https://github.com/veruu/ngx_sssd_info>
|
||||
" Retrives additional attributes from SSSD for current authentizated user
|
||||
" Retrieves additional attributes from SSSD for current authentizated user
|
||||
syn keyword ngxDirectiveThirdParty sssd_info
|
||||
syn keyword ngxDirectiveThirdParty sssd_info_output_to
|
||||
syn keyword ngxDirectiveThirdParty sssd_info_groups
|
||||
|
|
|
@ -2,7 +2,7 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
diff-lcs (1.2.5)
|
||||
rake (10.4.2)
|
||||
rake (12.3.3)
|
||||
rspec (3.4.0)
|
||||
rspec-core (~> 3.4.0)
|
||||
rspec-expectations (~> 3.4.0)
|
||||
|
|
|
@ -231,17 +231,17 @@ 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>t<leader> :tabnext<cr>
|
||||
|
||||
" Let 'tl' toggle between this and the last accessed tab
|
||||
let g:lasttab = 1
|
||||
nmap <Leader>tl :exe "tabn ".g:lasttab<CR>
|
||||
nmap <leader>tl :exe "tabn ".g:lasttab<CR>
|
||||
au TabLeave * let g:lasttab = tabpagenr()
|
||||
|
||||
|
||||
" Opens a new tab with the current buffer's path
|
||||
" Super useful when editing files in the same directory
|
||||
map <leader>te :tabedit <C-r>=expand("%:p:h")<cr>/
|
||||
map <leader>te :tabedit <C-r>=escape(expand("%:p:h"), " ")<cr>/
|
||||
|
||||
" Switch CWD to the directory of the open buffer
|
||||
map <leader>cd :cd %:p:h<cr>:pwd<cr>
|
||||
|
|
|
@ -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 !
|
||||
"
|
||||
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
|
||||
|
||||
|
@ -170,7 +170,7 @@ func! DeleteTillSlash()
|
|||
endfunc
|
||||
|
||||
func! CurrentFileDir(cmd)
|
||||
return a:cmd . " " . expand("%:p:h") . "/"
|
||||
return a:cmd . " " . escape(expand("%:p:h"), " ") . "/"
|
||||
endfunc
|
||||
|
||||
"=================================================================================
|
||||
|
|
Loading…
Reference in a new issue