git integration

This commit is contained in:
Chris 2020-05-03 12:18:38 -04:00
parent 2957a2a6c0
commit d45e2094d5
11 changed files with 44 additions and 5 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -11,3 +11,5 @@ require'colorizer'.setup(
css_fn = true; -- Enable all CSS *functions*: rgb_fn, hsl_fn
})

0
plug-config/fugitive.vim Normal file
View file

View file

@ -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

0
plug-config/gv.vim Normal file
View file

4
plug-config/ranger.vim Normal file
View file

@ -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>

22
plug-config/signify.vim Normal file
View file

@ -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

View file

@ -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'

View file

@ -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'