From 55c61159c3523261993c22edeac428977f8475fa Mon Sep 17 00:00:00 2001 From: Guillermo Kuster Date: Wed, 7 Jul 2021 00:12:42 -0400 Subject: [PATCH] Preparing everything to move from Tmux + Vimux to Kitty + mykitten + --- sources_non_forked/nerdtree-git-plugin | 1 - sources_non_forked/vim-devicons | 1 - .../vim-nerdtree-syntax-highlight | 1 - sources_non_forked/vim-vroom | 1 - vimrcs/basic.vim | 19 ++-- vimrcs/plugins_config.vim | 87 ++++++++++--------- 6 files changed, 59 insertions(+), 51 deletions(-) delete mode 160000 sources_non_forked/nerdtree-git-plugin delete mode 160000 sources_non_forked/vim-devicons delete mode 160000 sources_non_forked/vim-nerdtree-syntax-highlight delete mode 160000 sources_non_forked/vim-vroom diff --git a/sources_non_forked/nerdtree-git-plugin b/sources_non_forked/nerdtree-git-plugin deleted file mode 160000 index 9e33a3f..0000000 --- a/sources_non_forked/nerdtree-git-plugin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9e33a3fe8aa90f5ece2439f3b1b3a98fe7e35f85 diff --git a/sources_non_forked/vim-devicons b/sources_non_forked/vim-devicons deleted file mode 160000 index 383159d..0000000 --- a/sources_non_forked/vim-devicons +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 383159d338024f09e4d56585a9301958b6fefad6 diff --git a/sources_non_forked/vim-nerdtree-syntax-highlight b/sources_non_forked/vim-nerdtree-syntax-highlight deleted file mode 160000 index 1acc12a..0000000 --- a/sources_non_forked/vim-nerdtree-syntax-highlight +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1acc12aa7f773ede38538293332905f1ba3fea6a diff --git a/sources_non_forked/vim-vroom b/sources_non_forked/vim-vroom deleted file mode 160000 index 50028af..0000000 --- a/sources_non_forked/vim-vroom +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 50028aff43ac516a9e038d2a9675c21891d5fb19 diff --git a/vimrcs/basic.vim b/vimrcs/basic.vim index af31043..dcae8f1 100644 --- a/vimrcs/basic.vim +++ b/vimrcs/basic.vim @@ -110,24 +110,35 @@ set ttyfast " Don't redraw while executing macros (good performance config) set lazyredraw +<<<<<<< HEAD <<<<<<< HEAD " set cursorline ======= >>>>>>> wip +======= +" set cursorline + +>>>>>>> Preparing everything to move from Tmux + Vimux to Kitty + mykitten + " This selects the default regexp engine. |two-engines| " The possible values are: " 0 automatic selection " 1 old engine " 2 NFA engine <<<<<<< HEAD +<<<<<<< HEAD +======= +>>>>>>> Preparing everything to move from Tmux + Vimux to Kitty + mykitten + " set regexpengine=0 " Faster redraw for ruby files " autocmd FileType ruby setlocal regexpengine=1 +<<<<<<< HEAD ======= set regexpengine=1 >>>>>>> wip +======= +>>>>>>> Preparing everything to move from Tmux + Vimux to Kitty + mykitten + " For regular expressions turn magic on set magic @@ -470,14 +481,6 @@ function! VisualSelection(direction, extra_filter) range let @" = l:saved_reg endfunction -<<<<<<< HEAD -======= -function! CopyFile() - let new_file_name = input('New file name: ', expand('%:p'), 'file') - exec ":saveas " . new_file_name -endfunction - ->>>>>>> wip " Don't close window, when deleting a buffer command! Bclose call BufcloseCloseIt() function! BufcloseCloseIt() diff --git a/vimrcs/plugins_config.vim b/vimrcs/plugins_config.vim index 7e1cc7a..246452c 100644 --- a/vimrcs/plugins_config.vim +++ b/vimrcs/plugins_config.vim @@ -3,10 +3,8 @@ """""""""""""""""""""""""""""" call plug#begin('~/.vim-environment/sources_non_forked') - Plug 'scrooloose/nerdtree' Plug 'drewtempelmeyer/palenight.vim' - Plug 'tiagofumo/vim-nerdtree-syntax-highlight' - Plug 'ryanoasis/vim-devicons' + Plug 'kassio/neoterm' Plug 'junegunn/fzf.vim' Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'airblade/vim-gitgutter' @@ -18,31 +16,32 @@ call plug#begin('~/.vim-environment/sources_non_forked') Plug 'tpope/vim-surround' Plug 'mg979/vim-visual-multi', {'branch': 'master'} Plug 'tpope/vim-fugitive' - Plug 'skalnik/vim-vroom' - Plug 'benmills/vimux' + Plug 'vim-test/vim-test' Plug 'tpope/vim-rails' Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } Plug 'junegunn/goyo.vim' + Plug 'ayu-theme/ayu-vim' call plug#end() -"""""""""""""""""""""""""""""" -" => vim-nerdtree-syntax-highlight -"""""""""""""""""""""""""""""" +" ############################################# +" Vim-test +" ############################################# + +let test#strategy = "kitty" -let NERDTreeHighlightCursorline = 0 -let g:NERDTreeLimitedSyntax = 1 -let g:NERDTreeSyntaxEnabledExactMatches = ['node_modules', 'favicon.ico'] +let test#ruby#bundle_exec = 1 +let test#ruby#use_binstubs = 0 -let g:WebDevIconsDisableDefaultFolderSymbolColorFromNERDTreeDir = 1 -let g:WebDevIconsDisableDefaultFileSymbolColorFromNERDTreeFile = 1 +" these "Ctrl mappings" work well when Caps Lock is mapped to Ctrl +nmap l :TestNearest +nmap f :TestFile +nmap a :TestSuite +nmap . :TestLast +nmap v :TestVisit -let g:NERDTreeExtensionHighlightColor = {} " this line is needed to avoid error -let g:NERDTreeExtensionHighlightColor['md']='31B53E' -let g:WebDevIconsDefaultFolderSymbolColor='F5C06F' " sets the color for folders that did not match any rule -let g:WebDevIconsDefaultFileSymbolColor='689FB6' " sets the color for files that did not match any rule """"""""""""""""""""""""""""""" "" => bufExplorer plugin @@ -81,7 +80,17 @@ nmap gy (coc-type-definition) nmap gi (coc-implementation) "" Prettier configuration -command! -nargs=0 Prettier :CocCommand prettier.formatFile +" command! -nargs=0 Prettier :CocCommand prettier.formatFile + + + +""""""""""""""""""""""""""""""" +"" => Coc-explorer +""""""""""""""""""""""""""""""" + +nnoremap e :CocCommand explorer + + """"""""""""""""""""""""""""""" "" => Fzf @@ -161,19 +170,19 @@ command! -bang -nargs=+ -complete=dir Rag call AgRaw(, {'options': '--de """""""""""""""""""""""""""""" " => NERDTree """""""""""""""""""""""""""""" -let g:NERDTreeWinPos = "right" -let NERDTreeShowHidden=0 -let NERDTreeIgnore = ['\.pyc$', '__pycache__'] -let g:NERDTreeWinSize=35 -map nn :NERDTreeToggle -map nb :NERDTreeFromBookmark -map nf :NERDTreeFind +" let g:NERDTreeWinPos = "right" +" let NERDTreeShowHidden=0 +" let NERDTreeIgnore = ['\.pyc$', '__pycache__'] +" let g:NERDTreeWinSize=35 +" map nn :NERDTreeToggle +" map nb :NERDTreeFromBookmark +" map nf :NERDTreeFind " Avoid open files in NERDTree pane nnoremap j (expand('%') =~ 'NERD_tree' ? "\\" : '').":Files\" -" Close vim if nerdtree is the only window left -autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif +" " Close vim if nerdtree is the only window left +" autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif """""""""""""""""""""""""""""" @@ -251,25 +260,25 @@ let g:VM_maps["Select Cursor Up"] = '' """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" "" => Vimux () """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -nmap :VimuxPromptCommand -nmap :VimuxRunCommand("clear") -nmap . :VimuxRunLastCommand -nmap q :VimuxInterruptRunner +"nmap :VimuxPromptCommand +"nmap :VimuxRunCommand("clear") +"nmap . :VimuxRunLastCommand +"nmap q :VimuxInterruptRunner -"Keep consistency with vim-vroom mappings -nmap a :VimuxRunCommand("clear;bundle exec rspec --color") +""Keep consistency with vim-vroom mappings +"nmap a :VimuxRunCommand("clear;bundle exec rspec --color") """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" "" => Vim-vroom (Ruby test vimux integration) """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -let g:vroom_use_vimux = 1 -let g:vroom_clear_screen = 1 -let g:vroom_write_all = 1 +" let g:vroom_use_vimux = 1 +" let g:vroom_clear_screen = 1 +" let g:vroom_write_all = 1 -silent! map f :VroomRunTestFile -silent! map l :VroomRunNearestTest -silent! map . :VroomRunLastTest +" silent! map f :VroomRunTestFile +" silent! map l :VroomRunNearestTest +" silent! map . :VroomRunLastTest """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""