From e79633362e148ea85809f1668a953d241f2362c7 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Wed, 16 Oct 2024 10:30:44 -0700 Subject: [PATCH] clean up vimrc --- dot_config/alacritty/alacritty.toml.tmpl | 3 +- dot_vim/nvim.lua | 2 +- dot_vimrc | 620 +------------------------------ dot_yarnrc | 2 +- 4 files changed, 24 insertions(+), 603 deletions(-) diff --git a/dot_config/alacritty/alacritty.toml.tmpl b/dot_config/alacritty/alacritty.toml.tmpl index e11bc79..baaf28c 100644 --- a/dot_config/alacritty/alacritty.toml.tmpl +++ b/dot_config/alacritty/alacritty.toml.tmpl @@ -95,7 +95,8 @@ key = "P" mode = "Vi|~Search" [[keyboard.bindings]] -action = "ToggleFullscreen" +action = "ToggleMaximized" +#action = "ToggleFullscreen" key = "Return" mods = "Alt" diff --git a/dot_vim/nvim.lua b/dot_vim/nvim.lua index 4185b4e..e856eb6 100644 --- a/dot_vim/nvim.lua +++ b/dot_vim/nvim.lua @@ -159,7 +159,7 @@ nvim_lsp.pyright.setup({ --}) nvim_lsp.clangd.setup { on_attach = on_attach, capabilities = default_capabilities } -nvim_lsp.tsserver.setup { +nvim_lsp.ts_ls.setup { cmd = { "/home/barak/.yarn/bin/typescript-language-server", "--stdio" } } nvim_lsp.vuels.setup { diff --git a/dot_vimrc b/dot_vimrc index 6119f49..2bc7ef4 100644 --- a/dot_vimrc +++ b/dot_vimrc @@ -73,35 +73,9 @@ set t_ut= let g:loaded_python_provider = 0 let $RUST_SRC_PATH="/usr/src/rust/src/" -"let g:ft_ignore_pat = '.org' -" - -if exists('veonim') - let g:vscode_extensions = [ - \'ms-python.python', - \'ms-vscode.go', - \] - set guifont=Droid\ Sans\ Mono\ Dotted:h20 -" set linespace=10 -endif - -if exists('g:neovide') - let g:neovide_floating_blur_amount_x = 2.0 - let g:neovide_floating_blur_amount_y = 2.0 - let g:neovide_transparency = 0.95 - let g:neovide_scroll_animation_length = 0.1 - let g:neovide_cursor_animation_length = 0.05 - let g:neovide_cursor_trail_size = 0.5 -endif - - -" * Polyglot - -let g:tex_flavor = 'latex' -let g:polyglot_disabled = ['latex'] +" Disable the powerline plugin from standard Vim installs let g:powerline_loaded = 1 - " Required: set runtimepath+=$HOME/.vim/bundle/repos/github.com/Shougo/dein.vim @@ -116,20 +90,10 @@ Plug 'skywind3000/asyncrun.vim' Plug 'barakmich/vim-code-dark' " Plugins that I almost never use -"Plug 'vim-scripts/DrawIt' -"Plug 'vim-scripts/EasyGrep' -Plug 'chrisbra/NrrwRgn' -"Plug 'mattn/calendar-vim' -"Plug 'rstacruz/sparkup' -"Plug 'tristen/vim-sparkup' -"Plug 'tpope/vim-fireplace', {'for': 'clojure'} -""Plug 'terryma/vim-multiple-cursors' -"Plug 'ambv/black' Plug 'kana/vim-textobj-user' " Plugins I wish I used more -"Plug 'hsitz/VimOrganizer' Plug 'jceb/vim-orgmode' Plug 'tpope/vim-speeddating' @@ -142,59 +106,25 @@ Plug 'bps/vim-textobj-python' " Plugins I NEED Plug 'scrooloose/nerdcommenter' -Plug 'sjbach/lusty' -"Plug 'w0rp/ale' -"Plug 'airblade/vim-gitgutter' +"Plug 'sjbach/lusty' Plug 'mhinz/vim-signify' -"Plug 'vim-airline/vim-airline' -"Plug 'vim-airline/vim-airline-themes' Plug 'nvim-lualine/lualine.nvim' Plug 'linrongbin16/lsp-progress.nvim' -"Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } -"Plug 'junegunn/fzf.vim' Plug 'airblade/vim-rooter' -"Plug 'bling/vim-bufferline' Plug 'majutsushi/tagbar' -"Plug 'SirVer/ultisnips' Plug 'dcampos/nvim-snippy' Plug 'dcampos/cmp-snippy' Plug 'rafamadriz/friendly-snippets' Plug 'honza/vim-snippets' -"Plug 'fatih/vim-go' Plug 'tpope/vim-abolish' -"Plug 'sheerun/vim-polyglot' -Plug 'Shougo/denite.nvim' -"Plug 'plytophogy/vim-virtualenv' -"Plug 'ervandew/supertab' -"Plug 'ncm2/ncm2' -"Plug 'roxma/nvim-yarp' - - -" Plugins I NEEDED -"Plug 'scrooloose/nerdtree' -"Plug 'scrooloose/syntastic' -"Plug 'Valloric/YouCompleteMe' -"Plug 'vim-scripts/fish-syntax' -"Plug 'kchmck/vim-coffee-script' -"Plug 'rodjek/vim-puppet' -"Plug 'JuliaLang/julia-vim' -"Plug 'rust-lang/rust.vim' -"Plug 'hashivim/vim-terraform' -"Plug 'HerringtonDarkholme/yats.vim' -"Plug 'kien/ctrlp.vim' -"Plug 'farseer90718/vim-taskwarrior' -"Plug 't-yuki/vim-go-coverlay' " Plugins for syntax Plug 'lunaru/vim-less' Plug 'hylang/vim-hy', {'for': 'hy'} Plug 'jneen/ragel.vim' Plug 'NoahTheDuke/vim-just' -"Plug 'mhartington/nvim-typescript' -"Plug 'leafgarland/typescript-vim' Plug 'leafOfTree/vim-svelte-plugin' -"Plug 'posva/vim-vue' Plug 'Shougo/context_filetype.vim' "Plug 'idris-hackers/idris-vim', {'for': 'idris'} Plug 'fedorenchik/AnsiEsc' @@ -203,30 +133,12 @@ Plug 'zchee/vim-goasm' Plug 'cappyzawa/starlark.vim' " Plugins that autocomplete -"Plug 'Shougo/deoplete.nvim' -"Plug 'zchee/deoplete-clang' -"Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}} -"Plug 'zchee/deoplete-jedi' -"Plug 'davidhalter/jedi-vim' -"Plug 'eagletmt/neco-ghc', {'for': 'haskell'} -"Plug 'eagletmt/ghcmod-vim', {'for': 'haskell'} -"Plug 'racer-rust/vim-racer', {'for': 'rust'} -"Plug 'autozimu/LanguageClient-neovim', { - "\ 'branch': 'next', - "\ 'do': 'bash install.sh', - "\ } -"Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' } -"Plug 'neoclide/coc.nvim', {'branch': 'release'} -"Plug 'romainl/vim-qf' Plug 'neovim/nvim-lspconfig' Plug 'nvim-lua/lsp_extensions.nvim' Plug 'hrsh7th/cmp-nvim-lsp' Plug 'hrsh7th/cmp-buffer' Plug 'hrsh7th/cmp-path' -"Plug 'hrsh7th/cmp-cmdline' Plug 'hrsh7th/nvim-cmp' -"Plug 'hrsh7th/nvim-compe' -"Plug 'nvim-lua/completion-nvim' Plug 'onsails/lspkind-nvim' Plug 'nvim-lua/popup.nvim' @@ -235,7 +147,6 @@ Plug 'nvim-telescope/telescope.nvim' Plug 'sindrets/diffview.nvim' Plug 'kyazdani42/nvim-web-devicons' " for file icons -"Plug 'kyazdani42/nvim-tree.lua' Plug 'ray-x/lsp_signature.nvim' Plug 'ray-x/go.nvim' @@ -246,10 +157,6 @@ Plug 'stevanmilic/nvim-lspimport' Plug 'folke/trouble.nvim' Plug 'creativenull/efmls-configs-nvim', { 'tag': 'v1.*' } -" Plugins that do specific things -"Plug 'Shougo/vimproc.vim' -"Plug 'Shougo/vimfiler.vim' - Plug 'roobert/hoversplit.nvim' Plug 'tamago324/lir.nvim' @@ -258,8 +165,6 @@ Plug 'nvim-treesitter/playground' Plug 'nvim-treesitter/nvim-treesitter-textobjects' -"Plug 'ggandor/lightspeed.nvim' -"Plug 'justinmk/vim-sneak' Plug 'ggandor/leap.nvim' Plug 'ggandor/flit.nvim' Plug 'simrat39/rust-tools.nvim' @@ -267,23 +172,17 @@ Plug 'simrat39/rust-tools.nvim' Plug 'Shougo/unite.vim' " TODO: Look into Coqtail, same author Plug 'whonore/coquille', {'branch': 'pathogen-bundle', 'for': 'coq'} -"Plug 'dhruvasagar/vim-zoom' + Plug 'gabrielelana/vim-markdown' Plug 'lervag/vimtex' Plug 'Shougo/echodoc.vim' -"Plug 'python-rope/ropevim' Plug 'windwp/nvim-autopairs' Plug 'danymat/neogen' -"Plug 'David-Kunz/gen.nvim' -"Plug 'nomnivore/ollama.nvim' Plug 'stevearc/dressing.nvim' Plug 'MunifTanjim/nui.nvim' Plug 'zbirenbaum/copilot.lua' Plug 'yetone/avante.nvim', {'branch': 'main', 'do': 'make'} -" Unclear -"Plug 'ncm2/float-preview.nvim' -Plug 'lambdalisue/gina.vim' Plug 'edolphin-ydf/goimpl.nvim' call plug#end() @@ -291,15 +190,13 @@ call plug#end() filetype plugin indent on syntax enable -" enable ncm2 for all buffers -"autocmd BufEnter * call ncm2#enable_for_buffer() - - -" **** Configure LSP +" Configure Plugins in Lua luafile $HOME/.vim/nvim.lua +" **** Configure LSP + " Code navigation shortcuts nnoremap gd lua vim.lsp.buf.definition() nnoremap gi lua require('telescope.builtin').lsp_implementations({initial_mode = "normal"}) @@ -354,54 +251,20 @@ let g:completion_sorting = 'length' " **** End LSP - - -"let g:qf_auto_open_quickfix = 1 -"let g:qf_auto_open_loclist = 0 - -"nmap (qf_qf_previous) -"nmap (qf_qf_next) -"nmap ge (qf_qf_toggle) - -"" Sources -"source ~/.vim/supertab.vim -"source ~/.vim/charm.vim -"source ~/.vim/plugin/AppleT.vim -runtime macros/matchit.vim - -" Completion features (TODO: Add to filetype.vim) -autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete -autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags -"autocmd FileType python set omnifunc=pythoncomplete#Complete -"autocmd FileType python call SuperTabSetCompletionType("") - -" Set filetype for VimOrganizer -"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org -"au BufEnter *.org call org#SetOrgFileType() - -command! OrgCapture :call org#CaptureBuffer() -command! OrgCaptureFile :call org#OpenCaptureFile() - " Cull trailing whitespace for all files. autocmd BufWritePre * :call AutoTrimWhitespace() " Set syntax and highlighting syntax on -" baraknew is my own colorscheme. I used to use slate or dante. -"colorscheme baraknew + "let g:codedark_conservative = 1 let g:codedark_transparent=1 let g:codedark_italics=1 colorscheme codedark -"colorscheme slate -"colorscheme dante " Turn on the cursorline (highlight on line under cursor) but only for the -" window and buffer you're currently in. A handy trick, I'm trying out as of -" 2013-04-12 but the jury is still out. -" -" 2022-07-24 -- It's essential and I got a laugh reading this 9 years later. +" window and buffer you're currently in. autocmd BufEnter * setlocal cursorline autocmd WinEnter * setlocal cursorline autocmd WinLeave * setlocal nocursorline @@ -410,102 +273,9 @@ setlocal cursorline " ** PLUGIN CONFIGURATION ** -" * SuperTab -let g:SuperTabDefaultCompletionType = "" - -" Change the source rank -"call deoplete#custom#option('sources', { - "\ 'python': ['LanguageClient'], - "\ 'cpp': ['LanguageClient'], - "\}) -"call deoplete#custom#source('buffer', 'rank', 1) -"let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-6.0/lib/libclang.so' -"let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-6.0/lib/clang' -let g:deoplete#enable_at_startup = 1 -"let g:deoplete#sources = {} -"let g:deoplete#sources.scala = ['buffer', 'tags', 'omni'] -"let g:deoplete#omni#input_patterns = {} -"let g:deoplete#omni#input_patterns.scala = ['[^. *\t0-9]\.\w*',': [A-Z]\w', '[\[\t\( ][A-Za-z]\w*'] " * Vim general/Unknown -let python_highlight_all = 1 let g:Tb_MaxSize=0 let g:Tb_MapCTabSwitchBufs = 1 -let g:UseGooglePythonSettings = 0 - -" * sneak.vim -"let g:sneak#label = 1 -"map f Sneak_f -"map F Sneak_F -"map t Sneak_t -"map T Sneak_T - -" * Jedi -let g:jedi#goto_command = "gd" -"let g:jedi#completions_enabled = 0 - -" * Eclim -let g:EclimCompletionMethod = 'omnifunc' - -" * Syntastic -let g:syntastic_python_checkers = ['python', 'pylint'] -let g:syntastic_go_checkers=['go', 'govet', 'govetshadow', 'golintc'] -let g:syntastic_always_populate_loc_list = 1 -let g:syntastic_auto_loc_list = 2 -let g:syntastic_loc_list_height = 10 -" E111 = Spaces should be multiples of 4. I use 2. -" -" * Polyglot -let g:polyglot_disabled = ['latex'] - -" * ALE -let g:airline#extensions#ale#enabled = 1 -let g:ale_set_highlights = 0 - -" * LanguageServer -let g:LanguageClient_serverCommands = { - \ 'python': ['pyls'], - \ 'cpp': ['ccls'], - \ 'go': ['gopls'], - \ } -let g:LanguageClient_diagnosticsDisplay = { - \1: {'name': 'Error', 'texthl': 'ALEError', 'signText': 'E>', 'signTexthl': 'ALEErrorSign',}, - \2: {"name": "Warning", "texthl": "ALEWarning", "signText": "W>", "signTexthl": "ALEWarningSign",}, - \3: {"name": "Information", "texthl": "ALEInfo", "signText": "i-", "signTexthl": "ALEInfoSign",}, - \4: {"name": "Hint", "texthl": "ALEInfo", "signText": "--", "signTexthl": "ALEInfoSign",}, -\} -"nmap gd (lcn-definition) -"nmap K (lcn-hover) -"nmap m (lcn-menu) - -" * Configure browser for haskell_doc.vim -let g:haddock_browser = "open" -let g:haddock_browser_callformat = "%s %s" - -" * Lusty plugins -let g:LustyExplorerSuppressRubyWarning = 1 -let g:LustyJugglerSuppressRubyWarning = 1 -let g:LustyJugglerShowKeys = 'a' - -" * Buftabs -let g:buftabs_only_basename = 1 -"let g:buftabs_in_statusline=1 - -" Bufferline -let g:bufferline_echo = 0 -let g:bufferline_modified = '+' -let g:bufferline_show_bufnr = 1 -let g:bufferline_rotate = 1 - -" * NERDTree -"let g:NERDChristmasTree = 1 -"let g:NERDChristmasTree = 1 -let g:NERDTreeQuitOnOpen = 1 -let g:NERDTreeWinPos = "right" -let g:NERDTreeWinSize = 40 -let g:NERDTreeDirArrows=0 - -let g:NERDTreeMarkBookmarks = 0 -let g:NERDTreeMinimalUI = 1 " * Signify let g:signify_realtime = 1 @@ -515,64 +285,12 @@ let g:signify_sign_changedelete = g:signify_sign_change let g:signify_sign_show_count = 0 let g:signify_priority = 5 -" * Nvim Tree -let g:nvim_tree_add_trailing = 1 -let g:nvim_tree_side = 'right' -let g:nvim_tree_width = 40 -let g:nvim_tree_quit_on_open = 1 -let g:nvim_tree_disable_window_picker = 1 -let g:nvim_tree_root_folder_modifier = ':p:.' - " * Tagbar plugin settings let g:tagbar_width = 40 let g:tagbar_autofocus = 1 let g:tagbar_autoclose = 1 let g:tagbar_compact = 1 -" * Taglist plugin settings (deprecated) -let Tlist_GainFocus_On_ToggleOpen = 1 -let Tlist_Use_Right_Window = 1 -let Tlist_Inc_Winwidth = 0 -let Tlist_File_Fold_Auto_Close = 1 -let Tlist_WinWidth = 40 -let Tlist_Show_One_File = 0 - -" * ConqueTerm -let g:ConqueTerm_CWInsert = 1 -let g:ConqueTerm_InsertOnEnter = 0 -let g:ConqueTerm_SendVisKey = 'ss' - -" * YouCompleteMe -let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py' -let g:ycm_confirm_extra_conf = 0 -let g:ycm_key_invoke_completion = "" -let g:ycm_use_ultisnips_completer = 1 -"let g:ycm_add_preview_to_completeopt = 1 -"let g:ycm_autoclose_preview_window_after_completion = 1 - -" * UltiSnips -let g:UltiSnipsSnippetDirectories=["UltiSnips", "usnips"] -let g:UltiSnipsExpandTrigger="," -"let g:UltiSnipsJumpForwardTrigger="," -let g:UltiSnipsJumpBackwardTrigger="" - -" * MinBufExplorer -"let g:miniBufExplMapWindowNavVim = 1 -"let g:miniBufExplMapWindowNavArrows = 1 -"let g:miniBufExplMapCTabSwitchBufs = 1 -"let g:miniBufExplModSelTarget = 1 -"let g:miniBufExplForceSyntaxEnable = 1 - -" Markdown -"let g:markdown_enable_folding = 1 -let g:markdown_enable_mappings = 1 -let g:markdown_enable_spell_checking = 0 -let g:markdown_enable_input_abbreviations = 0 - -" * CommandT -let g:CommandTMaxFiles = 1000 -let g:CommandTMaxDepth = 7 - " * vim-rooter let g:rooter_cd_cmd="lcd" let g:rooter_manual_only = 1 @@ -583,78 +301,6 @@ let g:rg_command = ' \ rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --color "always" \ -g "!{.git,node_modules,vendor}/*" ' -"\ -g "*.{js,json,php,md,styl,jade,html,config,py,cpp,c,go,hs,rb,conf}" - -"command! -bang -nargs=* RipGrep call fzf#vim#grep(g:rg_command .shellescape(), 1, 0) -"command! -bang -nargs=* RipGrepCword call fzf#vim#grep(g:rg_command . "-q " . expand(''), 1, 0) - -"command! -bang -nargs=* RgRoot call fzf#vim#grep("rg --column --line-number --no-heading --color=always --smart-case " . shellescape(), 1, {"dir": FindRootDirectory()}) - -"let g:fzf_buffers_jump = 1 -" Empty value to disable preview window altogether -"let g:fzf_preview_window = '' - -" * VimOrganizer -" default Tag list. Will be changed in near future so -" that these are defined by config lines in each .org -" file itself, but now these are where you can change things: -" let g:org_todo_setup='TODO | DONE' -" while g:org_tag_setup is itself a string -"let g:org_tag_setup='{@home(h) @work(w) @tennisclub(t)} \n {easy(e) hard(d)} \n {computer(c) phone(p)}' -"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org -"au BufEnter *.org call org#SetOrgFileType() - -" * Airline -set noshowmode -let g:airline_section_c = '%{StatuslineGit()}' -let g:airline#extensions#branch#enabled = 1 -let g:airline#extensions#syntastic#enabled = 1 -let g:airline#extensions#tagbar#enabled = 1 -let g:airline_theme="murmur" -let g:airline_left_sep = '' -let g:airline_right_sep = '' -let g:airline#extensions#syntastic#enabled = 1 -let g:airline#extensions#hunks#non_zero_only = 1 -let g:airline#extensions#whitespace#enabled = 0 -let g:airline_mode_map = { - \ '__' : '-', - \ 'n' : 'N', - \ 'i' : 'I', - \ 'R' : 'R', - \ 'c' : 'C', - \ 'v' : 'V', - \ 'V' : 'V', - \ '' : 'V', - \ 's' : 'S', - \ 'S' : 'S', - \ '' : 'S', - \ } - - -" * CtrlP -let g:ctrlp_map = ',t' -let g:ctrlp_cmd = 'CtrlP' -let g:ctrlp_working_path_mode = 'ra' -let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:15' - -" * Echodoc -let g:echodoc_enable_at_startup = 1 -"let g:echodoc#type = 'floating' -"let g:echodoc#type = 'floating' -"highlight link EchoDocFloat Pmenu - -" * Vim-Go -let g:go_fmt_command = "goimports" -"let g:go_auto_type_info = 1 -let g:go_updatetime = 300 -let g:go_bin_path = $HOME . "/.go/bin" -"let g:go_def_mode = 'gopls' -"let g:go_info_mode = 'gopls' - -let g:go_highlight_functions = 1 -let g:go_highlight_function_calls = 1 -"let g:go_highlight_variable_declarations = 1 -"let g:go_highlight_variable_assignments = 1 " ** STATUSLINE ** set laststatus=2 @@ -692,9 +338,6 @@ command Filepath :echo expand('%:p') command SaveSession :mksession! ~/.vim_last_session command LoadSession :source ~/.vim_last_session -" This is a quick way to edit a persistent scratch buffer for me... -command ScratchOpen :e scp://barak@barakmich.com//home/barak/notes/scratch - " Sudo-make-me-a-sandwich write. For when I forget to be root. "command Wdammit :w !sudo tee > /dev/null % command Wdammit :w suda://% @@ -762,13 +405,6 @@ function! GoCoverlayToggle(forced) endfunction -" Toggle GoCoverlay -au FileType go nmap c :GoCoverlayT - -" Coquille -au FileType coq nmap a :CoqToCursor -au FileType coq imap a :CoqToCursor - " Make the Quickfix window respond well to commands (for instance, q to close, " Enter to select, etc). In tandem with the above. augroup QFixToggle @@ -779,37 +415,6 @@ augroup QFixToggle augroup END -" Execute a command that pipes output to window. Captures output into a new, -" appropriately titled, buffer. -function! s:ExecuteInShellOutput(command) - let command = join(map(split(a:command), 'expand(v:val)')) - let winnr = bufwinnr('^' . command . '$') - silent! execute winnr < 0 ? 'botright new ' . fnameescape(command) : winnr . 'wincmd w' - setlocal buftype=nowrite bufhidden=wipe nobuflisted noswapfile wrap number - echo 'Executing ' . command . '...' - silent! execute 'silent %!'. command -" uncomment this if you want the new buffer to try to grow to accommodate the output - "silent! execute 'resize ' . line('$') - silent! redraw - silent! execute 'au BufUnload execute bufwinnr(' . bufnr('#') . ') . ''wincmd w''' - silent! execute 'nnoremap r :call ExecuteInShell(''' . command . ''')' - echo 'Execution of ' . command . ' complete.' -endfunction - -" Same as above, doesn't capture output -function! s:ExecuteInShell(command) - let command = join(map(split(a:command), 'expand(v:val)')) - silent! execute 'silent !'. command - redraw! - echo 'Execution of ' . command . ' complete.' -endfunction - -command! -complete=shellcmd -nargs=+ Shell call s:ExecuteInShellOutput() -command! -complete=shellcmd -nargs=+ Exec call s:ExecuteInShell() -command! -nargs=* Make call s:ExecuteInShellOutput('make '.) -command! -nargs=* PTW call s:ExecuteInShell('ptw post --client=vim "'..'"') -command! -nargs=* CaptureNote :AsyncRun -silent capture --viewing %:p 2>&1 > /dev/null - " Highlight all instances of word under cursor, when idle. " Useful when studying strange source code. " Type z/ to toggle highlighting on/off. @@ -845,122 +450,37 @@ function AutoTrimWhitespace() endfunction -function! StatuslineGit() - let l:root = finddir('.git/..', expand('%:p:h').';') - return expand('%:p:s!'. l:root . '!/!') -endfunction - -function InstallEverything() - GoUpdateBinaries - BlackUpgrade -endfunction - -command CocReinstall :CocInstall coc-json coc-pyright coc-rust-analyzer coc-snippets coc-svelte coc-tsserver coc-ultisnips - - -autocmd FileType defx call s:defx_my_settings() -function! s:defx_my_settings() abort - " Define mappings - nnoremap - \ line('.') == 1 ? defx#do_action('cd', ['..']) : defx#do_action('open') - nnoremap c - \ defx#do_action('copy') - nnoremap m - \ defx#do_action('move') - nnoremap p - \ defx#do_action('paste') - nnoremap l - \ defx#do_action('open') - nnoremap E - \ defx#do_action('open', 'vsplit') - nnoremap P - \ defx#do_action('preview') - nnoremap o - \ defx#do_action('open_tree', 'toggle') - nnoremap K - \ defx#do_action('new_directory') - nnoremap N - \ defx#do_action('new_file') - nnoremap M - \ defx#do_action('new_multiple_files') - nnoremap C - \ defx#do_action('toggle_columns', - \ 'mark:indent:icon:filename:type:size:time') - nnoremap S - \ defx#do_action('toggle_sort', 'time') - nnoremap d - \ defx#do_action('remove') - nnoremap r - \ defx#do_action('rename') - nnoremap ! - \ defx#do_action('execute_command') - nnoremap x - \ defx#do_action('execute_system') - nnoremap yy - \ defx#do_action('yank_path') - nnoremap . - \ defx#do_action('toggle_ignored_files') - nnoremap ; - \ defx#do_action('repeat') - nnoremap h - \ defx#do_action('cd', ['..']) - nnoremap ~ - \ defx#do_action('cd') - nnoremap q - \ defx#do_action('quit') - nnoremap - \ defx#do_action('toggle_select') . 'j' - nnoremap * - \ defx#do_action('toggle_select_all') - nnoremap j - \ line('.') == line('$') ? 'gg' : 'j' - nnoremap k - \ line('.') == 1 ? 'G' : 'k' - nnoremap - \ defx#do_action('redraw') - nnoremap - \ defx#do_action('print') - nnoremap cd - \ defx#do_action('change_vim_cwd') -endfunction - " ** KEY REMAPPINGS ** " -" I used to use tabs, but then I took an arrow to the knee. -" Tabs in vim suck because they aren't what you want. Use tabbar. -"nnoremap gc :tabnew -"nnoremap gK :tabclose -"nnoremap gn gt -"nnoremap gp gT +" +" Toggle GoCoverlay +au FileType go nmap c :GoCoverlayT + +" Coquille +au FileType coq nmap a :CoqToCursor +au FileType coq imap a :CoqToCursor " I don't know how I came up with gt for opening the tree, but it stuck. -"nmap gt :NERDTreeToggle -"nmap gt :VimFilerExplorer -winwidth=40 -toggle -direction=rightbelow -parent -status -force-hide -"nmap gt :VimFiler -status -auto-cd -parent -force-quit -"nmap gt :Defx `escape(expand('%:p:h'), ' :')` -search=`expand('%:p')` -columns=icons:indent:filename:type nmap gt :edit . -""nnoremap gt :NvimTreeToggle -" The same for the TagList, useful for large C files. -"nmap gb :TlistToggle nmap gb :TagbarToggle "nnoremap gx :Kwbd " :Kwbd (defined below) really kills a buffer dead, and closes the window. " gK is similar. nnoremap gc :Kwbd -"nnoremap gc :bdelete -"nnoremap gK :bdelete! " I use gn/gp to cycle through open tabs/buffers nnoremap gn :bn nnoremap gp :bp nnoremap gz :pclose + " The single most handy way to get around a file. Cursor over a word, and then " type g* -- you'll go to the next instance of that word in the file. Make it " easier to reach by calling it gw (go-word) instead of hidden away. nnoremap gw g* " Make shift-p like p except, put the line above instead of below. nmap P op + " Line-based movement is cute, but it's tricky for files with lines that wrap. " Attune more to what you see on the screen instead of where the lines actually " are. @@ -985,26 +505,6 @@ xnoremap $ inoremap ^ inoremap $ -" Dealing with split windows is a pain. Make it less of a pain, by making -" Ctrl-direction appropriate. -"nnoremap j -"nnoremap k -"nnoremap l -"nnoremap h -""nnoremap w -""nnoremap W -"inoremap j -"inoremap k -"inoremap l -"inoremap h - -"if has('nvim') - "tnoremap - "tnoremap j - "tnoremap k - "tnoremap l - "tnoremap h -"endif " Make it easier to clear highlighting, with no functionality penalty nnoremap :noh @@ -1018,111 +518,31 @@ imap inoremap jj " Leader key functions -" See quickfix. -"nnoremap ff :LFix -" See quickfix. -nnoremap ss :SyntasticSetLoclist " Next quickfix. nnoremap fn :lnext " Prev quickfix. nnoremap fp :lprev -"nnoremap aa :Denite -mode=normal -buffer-name=search-buffer grep -nnoremap ac :Denite -resume -buffer-name=search-buffer grep -"nnoremap aw :DeniteCursorWord -buffer-name=search-buffer grep " -nnoremap nn :CaptureNote -call denite#custom#map('insert', '', '') -"call denite#custom#var('grep', 'command', ['rg']) -"call denite#custom#var('grep', 'default_opts', - "\ ['--no-heading', '--color', 'never', '--smart-case']) -"call denite#custom#var('grep', 'recursive_opts', []) -"call denite#custom#var('grep', 'pattern_opt', []) -"call denite#custom#var('grep', 'separator', ['--']) -"call denite#custom#var('grep', 'final_opts', []) -"call denite#custom#option('search-buffer', 'highlight_matched_char', 'deniteMatchedChar') -call denite#custom#var('grep', { - \ 'command': ['rg'], - \ 'default_opts': ['-i', '--vimgrep', '--no-heading'], - \ 'recursive_opts': [], - \ 'pattern_opt': ['--regexp'], - \ 'separator': ['--'], - \ 'final_opts': [], - \ }) -"nnoremap g :Denite -buffer-name=search-buffer grep -"nnoremap aa :RipGrep! -"nnoremap aa :RgRoot! -"nnoremap aw :RgRoot! -"nnoremap :Files! `git rev-parse --show-toplevel` -"nnoremap :GFiles nnoremap lua require('telescope.builtin').git_files{} nnoremap ag lua require('telescope.builtin').live_grep{ word_match = "-w", only_sort_text = true, cwd = vim.fn.systemlist("git rev-parse --show-toplevel")[1], search = ''} nnoremap aw lua require('telescope.builtin').grep_string{ word_match = "-w", only_sort_text = true, cwd = vim.fn.systemlist("git rev-parse --show-toplevel")[1]} nnoremap q lua require('telescope.builtin').quickfix{} nnoremap ff lua require('telescope.builtin').quickfix{} +nnoremap o lua require('telescope.builtin').buffers{initial_mode = "insert"} +nnoremap lua require('telescope.builtin').buffers{prompt_prefix = " "} " For C++ -- A is a great plugin which allows you to jump from the c file to the " header and vice-versa. Mneumonic here is headerheader. nnoremap hh :A -" CommandT is useful, but if I'm juggling lots of buffers, limit it to another -" one I have open (instead of standard t). -"nnoremap o :Buffers -nnoremap o lua require('telescope.builtin').buffers{initial_mode = "insert"} -nnoremap lua require('telescope.builtin').buffers{prompt_prefix = " "} -"nnoremap j -"nnoremap p :PTW -nnoremap p :LustyJugglePrevious -nnoremap jd :YcmCompleter GoToDefinitionElseDeclaration nnoremap mm :w:make! " ** EXTRA INCLUDES ** " -let s:extrarc = expand($HOME . '/.vimrc_google') +let s:extrarc = expand($HOME . '/.vimrc_work') if filereadable(s:extrarc) exec ':so ' . s:extrarc endif -" ** SEE ALSO ** -" filetype.vim - -"call remote#host#RegisterPlugin('python3', '/home/barak/.vim/bundle/deoplete.nvim/rplugin/python3/deoplete', [ - "\ {'sync': v:true, 'name': '_deoplete', 'type': 'function', 'opts': {}}, - "\ ]) -" -if !empty($VIRTUAL_ENV) -" let g:python_host_prog = $VIRTUAL_ENV . '/bin/python' -" let g:python3_host_prog = $VIRUTAL_ENV . '3/bin/python' -endif - -autocmd FileType denite call s:denite_my_settings() -function! s:denite_my_settings() abort - nnoremap - \ denite#do_map('do_action') - "nnoremap d - "\ denite#do_map('do_action', 'delete') - "nnoremap p - "\ denite#do_map('do_action', 'preview') - nnoremap q - \ denite#do_map('quit') - nnoremap i - \ denite#do_map('open_filter_buffer') - nnoremap - \ denite#do_map('toggle_select').'j' -endfunction - -map :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" - -function! Syn() - for id in synstack(line("."), col(".")) - echo synIDattr(id, "name") - endfor -endfunction -map command! -nargs=0 Syn call Syn() " Final hi links for TreeSitter - hi link @type.rust TSCSecondaryTypeParam - -"let s:gptool_temp = expand($HOME . '/src/gptool/bindings.vim') -"if filereadable(s:gptool_temp) - "exec ':so ' . s:gptool_temp -"endif diff --git a/dot_yarnrc b/dot_yarnrc index ff3638e..79d0f61 100644 --- a/dot_yarnrc +++ b/dot_yarnrc @@ -2,5 +2,5 @@ # yarn lockfile v1 -lastUpdateCheck 1711242871592 +lastUpdateCheck 1723662140748 prefix "/home/barak/.yarn"