diff options
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | general/settings.vim | 1 | ||||
| -rw-r--r-- | init.vim | 5 | ||||
| -rw-r--r-- | lua/plug-colorizer.lua | 2 | ||||
| -rw-r--r-- | plug-config/fugitive.vim | 0 | ||||
| -rw-r--r-- | plug-config/fzf.vim | 6 | ||||
| -rw-r--r-- | plug-config/gv.vim | 0 | ||||
| -rw-r--r-- | plug-config/ranger.vim | 4 | ||||
| -rw-r--r-- | plug-config/signify.vim | 22 | ||||
| -rw-r--r-- | themes/airline.vim | 3 | ||||
| -rw-r--r-- | vim-plug/plugins.vim | 5 |
11 files changed, 44 insertions, 5 deletions
@@ -88,3 +88,4 @@ Explainations and installation instrucion can be found on my blog - spectre, or async task/run - setup custom paths - install script envsubst is your friend +- add better whitespace pluginand a toggle, video about clean code maybe diff --git a/general/settings.vim b/general/settings.vim index 2c7637bc..737584c6 100644 --- a/general/settings.vim +++ b/general/settings.vim @@ -40,6 +40,7 @@ if !exists('g:vscode') set formatoptions-=cro " Stop newline continution of comments set clipboard=unnamedplus " Copy paste between vim and everything else set incsearch + " set mmp=1300 " set autochdir " Your working directory will always be the same as your working directory " set foldcolumn=2 " Folding abilities @@ -21,7 +21,7 @@ else source $HOME/.config/nvim/themes/syntax.vim source $HOME/.config/nvim/themes/onedark.vim source $HOME/.config/nvim/themes/airline.vim - source $HOME/.config/nvim/plug-config/rnvimr.vim + source $HOME/.config/nvim/plug-config/ranger.vim source $HOME/.config/nvim/plug-config/fzf.vim source $HOME/.config/nvim/plug-config/commentary.vim source $HOME/.config/nvim/plug-config/rainbow.vim @@ -29,5 +29,8 @@ else source $HOME/.config/nvim/plug-config/sneak.vim source $HOME/.config/nvim/plug-config/quickscope.vim source $HOME/.config/nvim/plug-config/start-screen.vim + source $HOME/.config/nvim/plug-config/signify.vim + source $HOME/.config/nvim/plug-config/fugitive.vim + source $HOME/.config/nvim/plug-config/gv.vim luafile $HOME/.config/nvim/lua/plug-colorizer.lua endif diff --git a/lua/plug-colorizer.lua b/lua/plug-colorizer.lua index f365160d..f1c565fc 100644 --- a/lua/plug-colorizer.lua +++ b/lua/plug-colorizer.lua @@ -11,3 +11,5 @@ require'colorizer'.setup( css_fn = true; -- Enable all CSS *functions*: rgb_fn, hsl_fn }) + + diff --git a/plug-config/fugitive.vim b/plug-config/fugitive.vim new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/plug-config/fugitive.vim diff --git a/plug-config/fzf.vim b/plug-config/fzf.vim index f25f49a7..0e95a46f 100644 --- a/plug-config/fzf.vim +++ b/plug-config/fzf.vim @@ -22,8 +22,8 @@ let g:fzf_tags_command = 'ctags -R' let g:fzf_layout = {'up':'~90%', 'window': { 'width': 0.8, 'height': 0.8,'yoffset':0.5,'xoffset': 0.5, 'highlight': 'Todo', 'border': 'sharp' } } let $FZF_DEFAULT_OPTS = '--layout=reverse --info=inline' -let $FZF_DEFAULT_COMMAND="rg --files --hidden" - +let $FZF_DEFAULT_COMMAND="rg --files --hidden --glob '!.git/**'" +"-g '!{node_modules,.git}' " Customize fzf colors to match your color scheme let g:fzf_colors = @@ -49,7 +49,7 @@ command! -bang -nargs=? -complete=dir Files " Get text in files with Rg command! -bang -nargs=* Rg \ call fzf#vim#grep( - \ 'rg --column --line-number --no-heading --color=always --smart-case '.shellescape(<q-args>), 1, + \ "rg --column --line-number --no-heading --color=always --smart-case --glob '!.git/**' ".shellescape(<q-args>), 1, \ fzf#vim#with_preview(), <bang>0) " Ripgrep advanced diff --git a/plug-config/gv.vim b/plug-config/gv.vim new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/plug-config/gv.vim diff --git a/plug-config/ranger.vim b/plug-config/ranger.vim new file mode 100644 index 00000000..dc953ae8 --- /dev/null +++ b/plug-config/ranger.vim @@ -0,0 +1,4 @@ +let g:ranger_replace_netrw = 1 "// open ranger when vim open a directory +"let g:NERDTreeHijackNetrw = 0 // add this line if you use NERDTree +let g:ranger_map_keys = 0 +map <leader>r :Ranger<CR> diff --git a/plug-config/signify.vim b/plug-config/signify.vim new file mode 100644 index 00000000..08211b83 --- /dev/null +++ b/plug-config/signify.vim @@ -0,0 +1,22 @@ +" Change these if you want +let g:signify_sign_add = '+' +let g:signify_sign_delete = '_' +let g:signify_sign_delete_first_line = '‾' +let g:signify_sign_change = '~' + +" I find the numbers disctracting +let g:signify_sign_show_count = 0 +let g:signify_sign_show_text = 1 + + +" Jump though hunks +nmap <leader>gj <plug>(signify-next-hunk) +nmap <leader>gk <plug>(signify-prev-hunk) +nmap <leader>gJ 9999<leader>gj +nmap <leader>gK 9999<leader>gk + + +" If you like colors instead +" highlight SignifySignAdd ctermbg=green guibg=#00ff00 +" highlight SignifySignDelete ctermfg=black ctermbg=red guifg=#ffffff guibg=#ff0000 +" highlight SignifySignChange ctermfg=black ctermbg=yellow guifg=#000000 guibg=#ffff00 diff --git a/themes/airline.vim b/themes/airline.vim index a3b26dca..3709ec40 100644 --- a/themes/airline.vim +++ b/themes/airline.vim @@ -11,6 +11,9 @@ let g:airline_left_sep = '' let g:airline_right_sep = '' let g:airline_right_alt_sep = '' +let g:airline#extensions#tabline#formatter = 'unique_tail' + + " Switch to your current theme let g:airline_theme = 'onedark' diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index 1658d3e2..951775de 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -44,13 +44,16 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' " Ranger - Plug 'kevinhwang91/rnvimr', {'do': 'make sync'} + Plug 'francoiscabrol/ranger.vim' + Plug 'rbgrouleff/bclose.vim' + " Plug 'kevinhwang91/rnvimr', {'do': 'make sync'} " FZF Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' " Git Plug 'mhinz/vim-signify' Plug 'tpope/vim-fugitive' + Plug 'tpope/vim-rhubarb' Plug 'junegunn/gv.vim' " Terminal Plug 'voldikss/vim-floaterm' |