From b3d099122aff52b24a3357ecfd8f6612e0a6f9c3 Mon Sep 17 00:00:00 2001 From: Dmitry Chumak Date: Thu, 8 Sep 2022 12:13:50 +0300 Subject: [PATCH 1/4] [tmux] pane borders background reset to default --- tmux.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tmux.conf b/tmux.conf index c5bc63c..32a517e 100755 --- a/tmux.conf +++ b/tmux.conf @@ -66,11 +66,11 @@ set -g message-style fg=white,bold,bg=green # highlight current window setw -g window-status-style fg=cyan,bg=colour235 -setw -g window-status-current-style fg=white,bold,bg=red +setw -g window-status-current-style fg=black,bold,bg=cyan # set color of active pane -set -g pane-border-style fg=colour240,bg=black -set -g pane-active-border-style fg=green,bg=black +set -g pane-border-style fg=colour240,bg=default +set -g pane-active-border-style fg=green,bg=default # To copy, left click and drag to highlight text in yellow, # once you release left click yellow text will disappear and will automatically be available in clibboard From b3b907c40819894eeb7f94cd9d1dd1291408464b Mon Sep 17 00:00:00 2001 From: Dmitry Chumak Date: Thu, 8 Sep 2022 12:17:14 +0300 Subject: [PATCH 2/4] [vim] git push/pull commands through a vim internal pane --- vim/vimrc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index b9fdeb4..5dd53ae 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -98,8 +98,12 @@ nnoremap gu :GitGutterUndoHunk " undo git change under the line " Magit plugin config " nnoremap gs :Magit| " git status -nnoremap gp :! git push| " git Push -nnoremap gP :! git pull| " git Pull +function GitPullPush(cmd) + echo system('git '.a:cmd) + " redraw! +endfunction +nnoremap gp :call GitPullPush("push")| " git Push +nnoremap gP :call GitPullPush("pull")| " git Pull " " NERDTree plugin config From 432dd88a1c7ff9c69a5574e5a21d5393681b9381 Mon Sep 17 00:00:00 2001 From: Dmitry Chumak Date: Thu, 8 Sep 2022 12:17:57 +0300 Subject: [PATCH 3/4] [vim] ripgrep disable using .gitignore to ignore grepped files --- vim/vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/vimrc b/vim/vimrc index 5dd53ae..6ae285c 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -123,11 +123,13 @@ let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.8 } } command! -bang -nargs=* Rg call \fzf#vim#grep('rg \ --hidden + \ --no-ignore \ -g !node_modules/ -g !.git/ \ --column --line-number --no-heading --color=always --smart-case '.shellescape(), \1, \fzf#vim#with_preview({'options': '--exact --delimiter : --nth 4..'}), 0) " is for strict search by default and other unknown stuff is to exclude filenames from search results +nnoremap ag :Rg | " searching for word ander cursor nnoremap b :Buffers nnoremap f :Files From ed506ce6c0e954ae85c81cd531be8c8a1cba30d4 Mon Sep 17 00:00:00 2001 From: Dmitry Chumak Date: Thu, 8 Sep 2022 12:18:35 +0300 Subject: [PATCH 4/4] [vim] coc enabled only for list of extensions --- vim/vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 6ae285c..8b84b06 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -155,14 +155,14 @@ let g:ansible_yamlKeyName = 'yamlKey' " CoC plugin settings " let g:coc_global_extensions = ['coc-pyright'] -source ~/.vim/coc.vim function! s:enable_coc_for_type() - let l:filesuffix_whitelist = ['py'] + let l:filesuffix_whitelist = ['py'] if index(l:filesuffix_whitelist, expand('%:e')) == -1 let b:coc_enabled = 0 endif endfunction autocmd BufRead,BufNewFile * call s:enable_coc_for_type() +source ~/.vim/coc.vim " YAML files config