From 85d2bb3eaca19b05d88bb1ff62196b9f76fb3593 Mon Sep 17 00:00:00 2001 From: Rahsheen Porter Date: Tue, 18 Jan 2022 08:27:08 -0500 Subject: [PATCH 1/3] update init.vim --- .config/nvim/init.vim | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 709f7cfa..21039fe6 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -30,9 +30,23 @@ nnoremap k gk noremap :GFiles noremap pf :Files nnoremap C :Colors -nnoremap :Buffers +nnoremap B :Buffers nnoremap fl :Lines -nnoremap m :History +noremap m :History +noremap / :Rg + +" Use fuzzy completion relative filepaths across directory +imap fzf#vim#complete#path('git ls-files $(git rev-parse --show-toplevel)') + +" Better command history with q: +command! CmdHist call fzf#vim#command_history({'right': '40'}) +nnoremap q: :CmdHist + +" Better search history +command! QHist call fzf#vim#search_history({'right': '40'}) +nnoremap q/ :QHist + +command! -bang -nargs=* Ack call fzf#vim#ag(, {'down': '40%', 'options': --no-color'}) inoremap nnoremap From c55035e0f2c571542eae73b131c608df6f8b0f5f Mon Sep 17 00:00:00 2001 From: Rahsheen Porter Date: Mon, 24 Jan 2022 12:55:54 -0500 Subject: [PATCH 2/3] add fzf checkout --- .config/nvim/init.vim | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 21039fe6..06725445 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -65,6 +65,7 @@ Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' +Plug 'stsewd/fzf-checkout.vim' Plug 'leafgarland/typescript-vim' Plug 'airblade/vim-gitgutter' Plug 'neoclide/coc.nvim', {'branch': 'release'} @@ -107,6 +108,7 @@ let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy'] nmap gs :G nmap gh :diffget //3 nmap gu :diffget //2 +nnoremap gc :GCheckout " Copy to system clipboard vnoremap y "*y From 0bc180e0f3cb9f4a80fd5021997fb2ee0a1f19a3 Mon Sep 17 00:00:00 2001 From: Rahsheen Porter Date: Wed, 11 May 2022 08:52:19 -0400 Subject: [PATCH 3/3] add rhubarb and such --- .config/nvim/coc-settings.json | 3 ++- .config/nvim/init.vim | 1 + .config/nvim/plugin/coc.vim | 2 ++ .local/bin/tmux-sessionizer | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index 4b34873d..9351c655 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -10,8 +10,9 @@ ], "eslint.autoFixOnSave": true, "diagnostic.checkCurrentLine": true, + "codeLens.enabled": true, "solargraph.autoformat": true, "solargraph.formatting": true, "solargraph.hover": true, - "solargraph.diagnostics": true, + "solargraph.diagnostics": true } diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 06725445..ef5481a8 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -70,6 +70,7 @@ Plug 'leafgarland/typescript-vim' Plug 'airblade/vim-gitgutter' Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'github/copilot.vim' +Plug 'tpope/vim-rhubarb' " Initialize plugin system call plug#end() diff --git a/.config/nvim/plugin/coc.vim b/.config/nvim/plugin/coc.vim index 3d1a5c94..0a72ef83 100644 --- a/.config/nvim/plugin/coc.vim +++ b/.config/nvim/plugin/coc.vim @@ -22,6 +22,7 @@ endif inoremap pumvisible() ? coc#_select_confirm() \: "\u\\=coc#on_enter()\" +inoremap pumvisible() ? "\" : "\u\" " Use `[g` and `]g` to navigate diagnostics " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. nmap [g (coc-diagnostic-prev) @@ -110,3 +111,4 @@ let g:coc_global_extensions = [ \'coc-json', \'coc-git' \] + diff --git a/.local/bin/tmux-sessionizer b/.local/bin/tmux-sessionizer index 461772d3..39193ed3 100755 --- a/.local/bin/tmux-sessionizer +++ b/.local/bin/tmux-sessionizer @@ -3,7 +3,7 @@ if [[ $# -eq 1 ]]; then selected=$1 else - selected=$(find ~/ ~/Development -mindepth 1 -maxdepth 1 -type d | fzf) + selected=$(find ~/.config ~/Development ~/Development/keeps-next ~/Development/keeps-frontend -mindepth 1 -maxdepth 1 -type d | fzf) fi if [[ -z $selected ]]; then