Add ripgrep/fzy and fix jry@jry-thinkpad/jry@gnu distinction
This commit is contained in:
parent
1619646611
commit
ff37449dcb
32
init.vim
32
init.vim
@ -89,6 +89,8 @@
|
|||||||
" Plug 'jhawthorn/fzy' " Install this systemwide (or configure a manual
|
" Plug 'jhawthorn/fzy' " Install this systemwide (or configure a manual
|
||||||
" location. See below)
|
" location. See below)
|
||||||
Plug 'srstevenson/vim-picker'
|
Plug 'srstevenson/vim-picker'
|
||||||
|
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
|
||||||
|
Plug 'junegunn/fzf.vim'
|
||||||
|
|
||||||
" line indentation guides
|
" line indentation guides
|
||||||
Plug 'Yggdroot/indentLine'
|
Plug 'Yggdroot/indentLine'
|
||||||
@ -170,13 +172,14 @@
|
|||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" Custom JIX modules
|
" Custom JIX modules
|
||||||
if $USER =~ "^jry$"
|
if $USER =~ "^jry$" && $HOSTNAME =~ "gnu"
|
||||||
let g:loaded_jix_jump = 1 " don't load
|
let g:loaded_jix_jump = 1 " don't load
|
||||||
" let g:loaded_jix_neomake = 1 " load
|
" let g:loaded_jix_neomake = 1 " load
|
||||||
let g:loaded_jix_open_url = 1 " don't load
|
let g:loaded_jix_open_url = 1 " don't load
|
||||||
let g:loaded_jix_perltidy = 1 " don't load
|
let g:loaded_jix_perltidy = 1 " don't load
|
||||||
let g:loaded_jix_skeletons = 1 " don't load
|
let g:loaded_jix_skeletons = 1 " don't load
|
||||||
let g:loaded_jix_vimtest = 1 " don't load
|
let g:loaded_jix_vimtest = 1 " don't load
|
||||||
|
" let g:loaded_jix_shell = 1 " load
|
||||||
|
|
||||||
Plug '~/dev-utils/conf/vim'
|
Plug '~/dev-utils/conf/vim'
|
||||||
end
|
end
|
||||||
@ -425,7 +428,7 @@ endif
|
|||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" JIX Notes {{{
|
" JIX Notes {{{
|
||||||
if $USER =~ "^jry$"
|
if $USER =~ "^jry$" && $HOSTNAME =~ "gnu"
|
||||||
command! NOTE exec "botright 80 vs " . glob('~/') . 'Notes/Notes' . (FugitiveHead() != "" ? '_'.FugitiveHead() : '')
|
command! NOTE exec "botright 80 vs " . glob('~/') . 'Notes/Notes' . (FugitiveHead() != "" ? '_'.FugitiveHead() : '')
|
||||||
end
|
end
|
||||||
" }}}
|
" }}}
|
||||||
@ -434,7 +437,7 @@ endif
|
|||||||
" TODO: Figure out fuzzy finding on windows
|
" TODO: Figure out fuzzy finding on windows
|
||||||
if !(has('win32') || has('win64'))
|
if !(has('win32') || has('win64'))
|
||||||
" TODO: Check if the below works, so this note can be erased
|
" TODO: Check if the below works, so this note can be erased
|
||||||
if $USER =~ "^jry$"
|
if $USER =~ "^jry$" && $HOSTNAME =~ "gnu"
|
||||||
let g:picker_selector_executable = '/home/jry/.fzy/fzy'
|
let g:picker_selector_executable = '/home/jry/.fzy/fzy'
|
||||||
" let g:picker_custom_find_executable = 'find'
|
" let g:picker_custom_find_executable = 'find'
|
||||||
" nnoremap ¬ :PickerEdit ~/jobxx/<cr>
|
" nnoremap ¬ :PickerEdit ~/jobxx/<cr>
|
||||||
@ -552,20 +555,13 @@ endif
|
|||||||
let g:neomake_haskell_enabled_makers = ['hlint']
|
let g:neomake_haskell_enabled_makers = ['hlint']
|
||||||
" let g:neomake_haskell_enabled_makers = ['hlint', 'ghcmod', 'hdevtools', 'liquid']
|
" let g:neomake_haskell_enabled_makers = ['hlint', 'ghcmod', 'hdevtools', 'liquid']
|
||||||
|
|
||||||
" " Configure HTML at JI
|
" Configure HTML at JI
|
||||||
" if $USER =~ '^jry$'
|
if $USER =~ '^jry$' && $HOSTNAME =~ "^gnu$"
|
||||||
" let g:neomake_html_enabled_makers = [] " disable because at work different html files are stiched together
|
let g:neomake_html_enabled_makers = [] " disable because at work different html files are stiched together
|
||||||
" endif
|
endif
|
||||||
|
|
||||||
" " Configure javascript at JI
|
|
||||||
" if $USER =~ "^jry$"
|
|
||||||
" let g:neomake_eslint_args = [
|
|
||||||
" \ '--rulesdir=/home/jry/jobxx/t/lib/ESLint'
|
|
||||||
" \ ]
|
|
||||||
" endif
|
|
||||||
|
|
||||||
" Configure python at JI
|
" Configure python at JI
|
||||||
if $USER =~ "^jry$"
|
if $USER =~ "^jry$" && $HOSTNAME =~ "^gnu$"
|
||||||
let g:neomake_python_enabled_makers = [] " disable python checking, since it checks for python2, but in production it is python3
|
let g:neomake_python_enabled_makers = [] " disable python checking, since it checks for python2, but in production it is python3
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -991,3 +987,9 @@ augroup MarkdownKeyBinds
|
|||||||
autocmd!
|
autocmd!
|
||||||
autocmd FileType markdown nmap <Leader>lt :call GenerateMarkdownTOC()<CR>
|
autocmd FileType markdown nmap <Leader>lt :call GenerateMarkdownTOC()<CR>
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
|
" Use ripgrep for vim grepping
|
||||||
|
if executable("rg")
|
||||||
|
set grepprg=rg\ --vimgrep\ --smart-case\ --hidden
|
||||||
|
set grepformat=%f:%l:%c:%m
|
||||||
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user