Compare commits
2 Commits
649d7e171b
...
3b1778d228
Author | SHA1 | Date | |
---|---|---|---|
3b1778d228 | |||
9470d585cf |
@ -121,7 +121,7 @@ cmp.setup({
|
|||||||
with_text = true,
|
with_text = true,
|
||||||
maxwidth = 40, -- half max width
|
maxwidth = 40, -- half max width
|
||||||
menu = {
|
menu = {
|
||||||
nvim_ciderlsp = "(ﮧ)",
|
nvim_ciderlsp = "[🤖]",
|
||||||
buffer = "[buffer]",
|
buffer = "[buffer]",
|
||||||
nvim_lsp = "[CiderLSP]",
|
nvim_lsp = "[CiderLSP]",
|
||||||
nvim_lua = "[API]",
|
nvim_lua = "[API]",
|
||||||
@ -184,20 +184,8 @@ end
|
|||||||
|
|
||||||
|
|
||||||
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||||
|
|
||||||
capabilities = require('cmp_nvim_ciderlsp').update_capabilities(capabilities)
|
capabilities = require('cmp_nvim_ciderlsp').update_capabilities(capabilities)
|
||||||
|
|
||||||
-- capabilities.textDocument.codeAction = {
|
|
||||||
-- codeActionLiteralSupport = {
|
|
||||||
-- codeActionKind = {
|
|
||||||
-- valueSet = {
|
|
||||||
-- '', 'quickfix', 'refactor', 'refactor.extract', 'refactor.inline', 'refactor.rewrite', 'source', 'source.organizeImports'
|
|
||||||
-- }
|
|
||||||
-- }
|
|
||||||
-- }
|
|
||||||
-- }
|
|
||||||
-- capabilities.textDocument.publishDiagnostics['versionSupport'] = false
|
|
||||||
|
|
||||||
nvim_lsp.ciderlsp.setup({
|
nvim_lsp.ciderlsp.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
|
1
vim/.vim/plugged/cmp-nvim-ciderlsp
Submodule
1
vim/.vim/plugged/cmp-nvim-ciderlsp
Submodule
Submodule vim/.vim/plugged/cmp-nvim-ciderlsp added at fd918c8dcb
1
vim/.vim/plugged/nvim-lsp-installer
Submodule
1
vim/.vim/plugged/nvim-lsp-installer
Submodule
Submodule vim/.vim/plugged/nvim-lsp-installer added at ae913cb4fd
1
vim/.vim/plugged/registers.nvim
Submodule
1
vim/.vim/plugged/registers.nvim
Submodule
Submodule vim/.vim/plugged/registers.nvim added at 23f9efc71c
1
vim/.vim/plugged/undotree
Submodule
1
vim/.vim/plugged/undotree
Submodule
Submodule vim/.vim/plugged/undotree added at bf76bf2d1a
@ -1,7 +1,5 @@
|
|||||||
source /usr/share/vim/google/glug/bootstrap.vim
|
source /usr/share/vim/google/glug/bootstrap.vim
|
||||||
source /usr/share/vim/google/core.vim
|
source /usr/share/vim/google/core.vim
|
||||||
source /google/data/ro/projects/vigor/vigor.vim
|
|
||||||
" source /usr/share/vim/google/google.vim
|
|
||||||
|
|
||||||
Plug 'vim-scripts/vcscommand.vim'
|
Plug 'vim-scripts/vcscommand.vim'
|
||||||
Plug 'sso://user/chmnchiang/google-comments'
|
Plug 'sso://user/chmnchiang/google-comments'
|
||||||
@ -40,8 +38,7 @@ let g:blazevim_quickfix_autoopen = 1
|
|||||||
Glug buganizer plugin[mappings]
|
Glug buganizer plugin[mappings]
|
||||||
Glug relatedfiles plugin[mappings]
|
Glug relatedfiles plugin[mappings]
|
||||||
Glug g4
|
Glug g4
|
||||||
Glug corpweb
|
"Glug google-csimporter
|
||||||
Glug google-csimporter
|
|
||||||
|
|
||||||
" Update the current file's build deps
|
" Update the current file's build deps
|
||||||
Plug 'junegunn/fzf', { 'do': { -> fzf#install() }, 'commit': '3f75a83' }
|
Plug 'junegunn/fzf', { 'do': { -> fzf#install() }, 'commit': '3f75a83' }
|
||||||
@ -172,7 +169,7 @@ com! -nargs=? -complete=file Blame :call G4Blame(<f-args>)
|
|||||||
" <c-u> removes the visual range because csearch doesn't support ranges.
|
" <c-u> removes the visual range because csearch doesn't support ranges.
|
||||||
" Removes newlines to allow the entire line search using V-LINE mode.
|
" Removes newlines to allow the entire line search using V-LINE mode.
|
||||||
" vnoremap <leader>cs "ny:<c-u>FzfCs "<c-r>=substitute(@n, '\n', '', '')<cr>"<cr>
|
" vnoremap <leader>cs "ny:<c-u>FzfCs "<c-r>=substitute(@n, '\n', '', '')<cr>"<cr>
|
||||||
nnoremap <leader>csi :CsImporter<cr>
|
"
|
||||||
" nnoremap <leader>CS :FzfCs<Space> <C-r><C-w> <cr>
|
" nnoremap <leader>CS :FzfCs<Space> <C-r><C-w> <cr>
|
||||||
|
|
||||||
nnoremap <leader>cc :CritiqueUnresolvedComments<space><cr>
|
nnoremap <leader>cc :CritiqueUnresolvedComments<space><cr>
|
||||||
|
12
vim/.vim/prefs/imp.vim
Normal file
12
vim/.vim/prefs/imp.vim
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
source ~/.vim/prefs/google_comments.vim
|
||||||
|
|
||||||
|
set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/vim-imp
|
||||||
|
set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/imp-csearch
|
||||||
|
|
||||||
|
Glug! glaive
|
||||||
|
Glaive imp plugin[mappings] Suggest[default]=buffer,primp,csearch,prompt Report[default]=popupnotify
|
||||||
|
"
|
||||||
|
" nnoremap <leader>csi :CsImporter<cr>
|
||||||
|
nnoremap <leader>csi :ImpSuggest
|
||||||
|
" nnoremap <leader>ii :ImpSuggest
|
||||||
|
" nnoremap <leader>if :ImpFirst
|
@ -1,53 +1,6 @@
|
|||||||
" --------- MAPPINGS FOR QUICK CONFIG EDITS ---------
|
|
||||||
" mnemonic: (e)dit (v)imrc
|
|
||||||
nmap <leader>ev :tabedit $MYVIMRC<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (t)mux.conf
|
|
||||||
nmap <leader>et :tabedit ~/.tmux.conf<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (g)oogle.vim
|
|
||||||
nmap <leader>eg :tabedit ~/.vim/prefs/google.vim<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (b)ash_profile
|
|
||||||
nmap <leader>eb :tabedit ~/.bash_profile<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (f)tplugin
|
|
||||||
nmap <leader>ef :tabedit ~/.vim/after/ftplugin<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (p)lugins
|
|
||||||
nmap <leader>ep :tabedit ~/.vim/prefs/plugins.vim<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (c)onfigs * opens NERDTree on the prefs dir
|
|
||||||
nmap <leader>ec :tabedit ~/.vim/prefs/<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (p)refs, (i)nit.vim
|
|
||||||
nmap <leader>epi :tabedit ~/.vim/prefs/init.vim<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (p)refs, (l)eader.vim
|
|
||||||
nmap <leader>epl :tabedit ~/.vim/prefs/leader.vim<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (p)refs, (c)oc.vim
|
|
||||||
nmap <leader>epc :tabedit ~/.vim/prefs/coc.vim<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (p)refs, (m)appings.vim
|
|
||||||
nmap <leader>epm :tabedit ~/.vim/prefs/mappings.vim<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (p)refs, (p)lug_prefs.vim
|
|
||||||
nmap <leader>epp :tabedit ~/.vim/prefs/plug_prefs.vim<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (p)refs, (u)i.vim
|
|
||||||
nmap <leader>epu :tabedit ~/.vim/prefs/ui.vim<cr>
|
|
||||||
"
|
|
||||||
" mnemonic: (e)dit (p)refs, (g)olang.vim
|
|
||||||
nmap <leader>epg :tabedit ~/.vim/prefs/google.vim<cr>
|
|
||||||
|
|
||||||
" mnemonic: (e)dit (z)shrc
|
|
||||||
nmap <leader>ez :tabedit ~/.zshrc<cr>
|
|
||||||
"
|
|
||||||
" mnemonic: (i)nsert (l)ambda
|
" mnemonic: (i)nsert (l)ambda
|
||||||
imap <leader>il <C-K>l*
|
imap <leader>il <C-K>l*
|
||||||
|
|
||||||
|
|
||||||
" HEX<->ASCII
|
" HEX<->ASCII
|
||||||
" mnemonic: (h)ex (t)o (a)scii
|
" mnemonic: (h)ex (t)o (a)scii
|
||||||
vnoremap <leader>hta :<c-u>s/\%V\x\x/\=nr2char(printf("%d", "0x".submatch(0)))/g<cr><c-l>`<
|
vnoremap <leader>hta :<c-u>s/\%V\x\x/\=nr2char(printf("%d", "0x".submatch(0)))/g<cr><c-l>`<
|
||||||
@ -180,3 +133,4 @@ vnoremap <leader>c$ :call nerdcommenter#Comment(0,"ToEOL")<CR>
|
|||||||
|
|
||||||
nmap <leader>yf :let @" = expand("%")<cr>
|
nmap <leader>yf :let @" = expand("%")<cr>
|
||||||
nmap <leader>ut :UndotreeToggle<cr>
|
nmap <leader>ut :UndotreeToggle<cr>
|
||||||
|
nmap <leader>e :e %%
|
||||||
|
@ -9,16 +9,6 @@ map <Esc>[B <Down>
|
|||||||
map <Esc>[C <Right>
|
map <Esc>[C <Right>
|
||||||
map <Esc>[D <Left>
|
map <Esc>[D <Left>
|
||||||
|
|
||||||
nnoremap <C-J> <C-W><C-J>
|
|
||||||
nnoremap <C-K> <C-W><C-K>
|
|
||||||
nnoremap <C-L> <C-W><C-L>
|
|
||||||
nnoremap <C-H> <C-W><C-H>
|
|
||||||
|
|
||||||
tnoremap <C-H> <C-\><C-n><C-w>h
|
|
||||||
tnoremap <C-J> <C-\><C-n><C-w>j
|
|
||||||
tnoremap <C-K> <C-\><C-n><C-w>k
|
|
||||||
tnoremap <C-L> <C-\><C-n><C-w>l
|
|
||||||
|
|
||||||
" remove mapping to be used in nerdtree
|
" remove mapping to be used in nerdtree
|
||||||
inoremap <Nul> <C-n>
|
inoremap <Nul> <C-n>
|
||||||
|
|
||||||
@ -37,10 +27,6 @@ vnoremap ; :
|
|||||||
nnoremap J :tabprevious<CR>
|
nnoremap J :tabprevious<CR>
|
||||||
nnoremap K :tabnext<CR>
|
nnoremap K :tabnext<CR>
|
||||||
|
|
||||||
" tab arrangement, Shift-H and Shift-L to move tabs
|
|
||||||
" nnoremap <silent> <lt> :execute 'silent! tabmove ' . (tabpagenr()-2)<CR>
|
|
||||||
" nnoremap <silent> > :execute 'silent! tabmove ' . (tabpagenr()+1)<CR>
|
|
||||||
"
|
|
||||||
" tab opening
|
" tab opening
|
||||||
nnoremap tt :tabedit<Space>
|
nnoremap tt :tabedit<Space>
|
||||||
nnoremap td :tabclose<CR>
|
nnoremap td :tabclose<CR>
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
packadd termdebug
|
packadd termdebug
|
||||||
" packadd lspconfig
|
" MINE
|
||||||
|
Plug 'squk/vim-quantum'
|
||||||
|
Plug 'squk/java-syntax.vim'
|
||||||
|
|
||||||
" LSP
|
" LSP
|
||||||
Plug 'hrsh7th/cmp-buffer'
|
Plug 'hrsh7th/cmp-buffer'
|
||||||
@ -24,6 +26,7 @@ Plug 'sso://user/vintharas/telescope-codesearch.nvim'
|
|||||||
Plug 'ntpeters/vim-better-whitespace' "auto-set tab/space size
|
Plug 'ntpeters/vim-better-whitespace' "auto-set tab/space size
|
||||||
Plug 'junegunn/fzf.vim'
|
Plug 'junegunn/fzf.vim'
|
||||||
Plug 'vim-airline/vim-airline' " ...
|
Plug 'vim-airline/vim-airline' " ...
|
||||||
|
Plug 'vim-airline/vim-airline-themes'
|
||||||
Plug 'nathanaelkane/vim-indent-guides'
|
Plug 'nathanaelkane/vim-indent-guides'
|
||||||
Plug 'Konfekt/vim-scratchpad'
|
Plug 'Konfekt/vim-scratchpad'
|
||||||
Plug 'guns/xterm-color-table.vim'
|
Plug 'guns/xterm-color-table.vim'
|
||||||
@ -69,7 +72,6 @@ Plug 'tiagofumo/vim-nerdtree-syntax-highlight'
|
|||||||
" LANGUAGE PLUGINS
|
" LANGUAGE PLUGINS
|
||||||
Plug 'udalov/kotlin-vim'
|
Plug 'udalov/kotlin-vim'
|
||||||
Plug 'hsanson/vim-android'
|
Plug 'hsanson/vim-android'
|
||||||
Plug 'squk/java-syntax.vim'
|
|
||||||
Plug 'OmniSharp/omnisharp-vim'
|
Plug 'OmniSharp/omnisharp-vim'
|
||||||
Plug 'whatyouhide/vim-tmux-syntax'
|
Plug 'whatyouhide/vim-tmux-syntax'
|
||||||
Plug 'chase/vim-ansible-yaml'
|
Plug 'chase/vim-ansible-yaml'
|
||||||
@ -115,7 +117,6 @@ Plug 'gosukiwi/vim-atom-dark'
|
|||||||
Plug 'jacoborus/tender.vim'
|
Plug 'jacoborus/tender.vim'
|
||||||
Plug 'kristijanhusak/vim-hybrid-material'
|
Plug 'kristijanhusak/vim-hybrid-material'
|
||||||
Plug 'NLKNguyen/papercolor-theme'
|
Plug 'NLKNguyen/papercolor-theme'
|
||||||
Plug 'squk/vim-quantum'
|
|
||||||
Plug 'arcticicestudio/nord-vim'
|
Plug 'arcticicestudio/nord-vim'
|
||||||
Plug 'chase/focuspoint-vim'
|
Plug 'chase/focuspoint-vim'
|
||||||
Plug 'patstockwell/vim-monokai-tasty' " airline
|
Plug 'patstockwell/vim-monokai-tasty' " airline
|
||||||
@ -125,8 +126,3 @@ Plug 'kristiandupont/shades-of-teal'
|
|||||||
Plug 'joshdick/onedark.vim'
|
Plug 'joshdick/onedark.vim'
|
||||||
Plug 'google/vim-colorscheme-primary'
|
Plug 'google/vim-colorscheme-primary'
|
||||||
Plug 'kyoz/purify', { 'rtp': 'vim' }
|
Plug 'kyoz/purify', { 'rtp': 'vim' }
|
||||||
|
|
||||||
" Plug 'google/vim-maktaba'
|
|
||||||
" Plug 'google/vim-glaive'
|
|
||||||
"
|
|
||||||
" call glaive#Install()
|
|
||||||
|
19
vim/.vimrc
19
vim/.vimrc
@ -18,7 +18,6 @@ let &t_AB="\e[48;5;%dm"
|
|||||||
let &t_AF="\e[38;5;%dm"
|
let &t_AF="\e[38;5;%dm"
|
||||||
syntax on
|
syntax on
|
||||||
|
|
||||||
|
|
||||||
set laststatus=2
|
set laststatus=2
|
||||||
set cmdheight=1
|
set cmdheight=1
|
||||||
set ttyfast
|
set ttyfast
|
||||||
@ -87,13 +86,13 @@ call plug#begin('~/.vim/plugged')
|
|||||||
source ~/.vim/prefs/google.vim
|
source ~/.vim/prefs/google.vim
|
||||||
endif
|
endif
|
||||||
|
|
||||||
source ~/.vim/prefs/mappings.vim
|
source ~/.vim/prefs/mappings.vim
|
||||||
source ~/.vim/prefs/leader.vim
|
source ~/.vim/prefs/leader.vim
|
||||||
source ~/.vim/prefs/plug_prefs.vim
|
source ~/.vim/prefs/plug_prefs.vim
|
||||||
source ~/.vim/prefs/ui.vim
|
source ~/.vim/prefs/ui.vim
|
||||||
source ~/.vim/prefs/golang.vim
|
source ~/.vim/prefs/golang.vim
|
||||||
source ~/.vim/prefs/ultisnips.vim
|
source ~/.vim/prefs/ultisnips.vim
|
||||||
source ~/.vim/prefs/ripgrep.vim
|
source ~/.vim/prefs/ripgrep.vim
|
||||||
call plug#end() " required
|
call plug#end() " required
|
||||||
|
|
||||||
" Require CiderLSP and Diagnostics modules
|
" Require CiderLSP and Diagnostics modules
|
||||||
@ -109,9 +108,9 @@ lua << EOF
|
|||||||
require("telescope_config")
|
require("telescope_config")
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
source ~/.vim/prefs/cmp.vim
|
|
||||||
if filereadable(expand("~/use_google"))
|
if filereadable(expand("~/use_google"))
|
||||||
source ~/.vim/prefs/google_comments.vim
|
source ~/.vim/prefs/cmp.vim
|
||||||
|
source ~/.vim/prefs/imp.vim
|
||||||
endif
|
endif
|
||||||
|
|
||||||
filetype plugin on " redundant?
|
filetype plugin on " redundant?
|
||||||
|
Reference in New Issue
Block a user