Skip to content

Commit

Permalink
Preparing everything to move from Tmux + Vimux to Kitty + mykitten +
Browse files Browse the repository at this point in the history
  • Loading branch information
Guillermo Kuster committed Jul 13, 2021
1 parent 19995b4 commit 55c6115
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 51 deletions.
1 change: 0 additions & 1 deletion sources_non_forked/nerdtree-git-plugin
Submodule nerdtree-git-plugin deleted from 9e33a3
1 change: 0 additions & 1 deletion sources_non_forked/vim-devicons
Submodule vim-devicons deleted from 383159
1 change: 0 additions & 1 deletion sources_non_forked/vim-nerdtree-syntax-highlight
Submodule vim-nerdtree-syntax-highlight deleted from 1acc12
1 change: 0 additions & 1 deletion sources_non_forked/vim-vroom
Submodule vim-vroom deleted from 50028a
19 changes: 11 additions & 8 deletions vimrcs/basic.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <SID>BufcloseCloseIt()
function! <SID>BufcloseCloseIt()
Expand Down
87 changes: 48 additions & 39 deletions vimrcs/plugins_config.vim
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 <silent> <space>l :TestNearest<CR>
nmap <silent> <space>f :TestFile<CR>
nmap <silent> <space>a :TestSuite<CR>
nmap <silent> <space>. :TestLast<CR>
nmap <silent> <space>v :TestVisit<CR>
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
Expand Down Expand Up @@ -81,7 +80,17 @@ nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
"" Prettier configuration
command! -nargs=0 Prettier :CocCommand prettier.formatFile
" command! -nargs=0 Prettier :CocCommand prettier.formatFile



"""""""""""""""""""""""""""""""
"" => Coc-explorer
"""""""""""""""""""""""""""""""

nnoremap <space>e :CocCommand explorer<CR>


"""""""""""""""""""""""""""""""
"" => Fzf
Expand Down Expand Up @@ -161,19 +170,19 @@ command! -bang -nargs=+ -complete=dir Rag call AgRaw(<q-args>, {'options': '--de
""""""""""""""""""""""""""""""
" => NERDTree
""""""""""""""""""""""""""""""
let g:NERDTreeWinPos = "right"
let NERDTreeShowHidden=0
let NERDTreeIgnore = ['\.pyc$', '__pycache__']
let g:NERDTreeWinSize=35
map <leader>nn :NERDTreeToggle<cr>
map <leader>nb :NERDTreeFromBookmark
map <leader>nf :NERDTreeFind<cr>
" let g:NERDTreeWinPos = "right"
" let NERDTreeShowHidden=0
" let NERDTreeIgnore = ['\.pyc$', '__pycache__']
" let g:NERDTreeWinSize=35
" map <leader>nn :NERDTreeToggle<cr>
" map <leader>nb :NERDTreeFromBookmark
" map <leader>nf :NERDTreeFind<cr>

" Avoid open files in NERDTree pane
nnoremap <silent> <expr> <Leader>j (expand('%') =~ 'NERD_tree' ? "\<c-w>\<c-w>" : '').":Files\<cr>"
" 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


""""""""""""""""""""""""""""""
Expand Down Expand Up @@ -251,25 +260,25 @@ let g:VM_maps["Select Cursor Up"] = '<M-k>'
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"" => Vimux ()
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
nmap <space><space> :VimuxPromptCommand<CR>
nmap <C-space> :VimuxRunCommand("clear")<CR>
nmap <space>. :VimuxRunLastCommand<CR>
nmap <space>q :VimuxInterruptRunner<CR>
"nmap <space><space> :VimuxPromptCommand<CR>
"nmap <C-space> :VimuxRunCommand("clear")<CR>
"nmap <space>. :VimuxRunLastCommand<CR>
"nmap <space>q :VimuxInterruptRunner<CR>

"Keep consistency with vim-vroom mappings
nmap <space>a :VimuxRunCommand("clear;bundle exec rspec --color")<CR>
""Keep consistency with vim-vroom mappings
"nmap <space>a :VimuxRunCommand("clear;bundle exec rspec --color")<CR>


""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
"" => 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 <unique> <space>f :VroomRunTestFile<CR>
silent! map <unique> <space>l :VroomRunNearestTest<CR>
silent! map <unique> <space>. :VroomRunLastTest<CR>
" silent! map <unique> <space>f :VroomRunTestFile<CR>
" silent! map <unique> <space>l :VroomRunNearestTest<CR>
" silent! map <unique> <space>. :VroomRunLastTest<CR>


""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
Expand Down

0 comments on commit 55c6115

Please sign in to comment.