This commit is contained in:
Henrik Bakken
2020-10-14 17:16:35 +02:00
parent 37876cc3ce
commit 936a6d24c9
2 changed files with 31 additions and 34 deletions
+25 -28
View File
@@ -22,7 +22,7 @@ Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'}
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
Plug 'antoinemadec/coc-fzf', {'branch': 'release'} Plug 'antoinemadec/coc-fzf', {'branch': 'release'}
Plug 'liuchengxu/vista.vim' " tags explorer "Plug 'liuchengxu/vista.vim' " tags explorer
Plug 'sheerun/vim-polyglot' " language syntax Plug 'sheerun/vim-polyglot' " language syntax
" git " git
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
@@ -136,6 +136,7 @@ set shiftwidth=4
set expandtab set expandtab
" other " other
set autochdir
set lazyredraw set lazyredraw
set updatetime=300 set updatetime=300
set timeoutlen=500 set timeoutlen=500
@@ -158,7 +159,7 @@ nnoremap Q <nop>
vnoremap v <Esc> vnoremap v <Esc>
nmap <esc><esc> :noh<cr> nmap <esc><esc> :noh<cr>
nmap <leader>R :so ~/.config/nvim/init.vim<cr> nmap <leader>R :so ~/.config/nvim/init.vim<cr>
nmap <leader>E :tabe ~/.config/nvim/init.vim<cr> nmap <leader>E :tabe ~/OneDrive/dotfiles/nvim/init.vim<cr>
" nerdcommenter: '<leader>c ', '<leader>cl' aligned and '<leader>cu>' remove " nerdcommenter: '<leader>c ', '<leader>cl' aligned and '<leader>cu>' remove
" vim-surround: visual 'SA' to wrap in A. Surround 'csAB' to change from A to B, 'dsA' to remove A. Word 'ysiwA' to wrap with A " vim-surround: visual 'SA' to wrap in A. Surround 'csAB' to change from A to B, 'dsA' to remove A. Word 'ysiwA' to wrap with A
@@ -213,14 +214,9 @@ let g:asterisk#keeppos=1
" ***************************** " *****************************
" CURSOR " CURSOR
" indenting " stay visual when indenting
"nnoremap <Tab> >>_ vnoremap <Tab> >gv
"nnoremap <S-Tab> <<_ vnoremap <S-Tab> <gv
"vnoremap <Tab> >gv
"vnoremap <S-Tab> <gv
" Move start and end of line
noremap H _
noremap L $
" insert mode movement " insert mode movement
inoremap <C-h> <Left> inoremap <C-h> <Left>
inoremap <C-j> <Down> inoremap <C-j> <Down>
@@ -259,7 +255,8 @@ nnoremap <C-l> <C-w>>
nmap <C-n> :cn<cr> nmap <C-n> :cn<cr>
nmap <C-m> :cp<cr> nmap <C-m> :cp<cr>
" close buffer " close buffer
nmap <M-d> :bd<cr> nmap <M-d> :b#<bar>bd#<cr>
nmap <M-D> :b#<bar>bd!#<cr>
" ***************************** " *****************************
" MARKDOWN " MARKDOWN
@@ -269,7 +266,6 @@ let g:vim_markdown_conceal=0
let g:vim_markdown_conceal_code_blocks=0 let g:vim_markdown_conceal_code_blocks=0
let g:vim_markdown_math=1 let g:vim_markdown_math=1
let g:vim_markdown_folding_disabled=0 let g:vim_markdown_folding_disabled=0
let g:vim_markdown_math=0
" markdown preview " markdown preview
let g:mkdp_auto_start=0 " auto start on moving into let g:mkdp_auto_start=0 " auto start on moving into
let g:mkdp_auto_close=0 " auto close on moving away let g:mkdp_auto_close=0 " auto close on moving away
@@ -288,32 +284,33 @@ let g:mkdp_preview_options={
" GIT " GIT
" vim-fugitive " vim-fugitive
" g? for fugitive help. :Gdiff, :Gblame, :Gstats '=' expand, '-' add/reset changes, :Gcommit % to commit current file with messag " g? for fugitive help. :Gdiff, :Gblame, :Gstats '=' expand, '-' add/reset changes, :Gcommit % to commit current file with messag
nmap <leader>gg :vertical Gstatus<cr>:vertical resize 60<cr> nmap <C-g> :vertical Git<cr>:vertical resize 60<cr>
" fzf " fzf
map <leader>gc :Commits<cr> nmap <silent> <M-g> :GFiles?<cr>
map <leader>gf :BCommits<cr> nmap <silent> <M-c> :Commits<cr>
nmap <silent> <M-C> :BCommits<cr>
" coc git " coc git
nmap <leader>gn <Plug>(coc-git-nextchunk) nmap <leader>i <Plug>(coc-git-chunkinfo)
nmap <leader>gp <Plug>(coc-git-prevchunk) nmap <leader>n <Plug>(coc-git-prevchunk)
nmap <leader>g<cr> <Plug>(coc-git-chunkinfo) nmap <leader>m <Plug>(coc-git-nextchunk)
nmap <leader>gs :CocCommand git.chunkStage<cr> nmap <leader>s :CocCommand git.chunkStage<cr>
vmap <leader>gs :CocCommand git.chunkStage<cr> vmap <leader>s :CocCommand git.chunkStage<cr>
nmap <leader>gX :CocCommand git.chunkUndo<cr> nmap <leader>x :CocCommand git.chunkUndo<cr>
vmap <leader>gX :CocCommand git.chunkUndo<cr> vmap <leader>x :CocCommand git.chunkUndo<cr>
" ***************************** " *****************************
" EXPLORERS " EXPLORERS
" vista and coc-explorer " vista and coc-explorer
map <C-g> :Vista!!<cr>
map <C-f> :CocCommand explorer<cr> map <C-f> :CocCommand explorer<cr>
let g:vista_default_executive = 'ctags' "map <C-v> :Vista!!<cr>
let g:vista_fzf_preview = ['right:50%'] "let g:vista_default_executive = 'ctags'
"let g:vista_fzf_preview = ['right:50%']
" ***************************** " *****************************
" POPUPS " POPUPS
command! -bang -nargs=* Ag call fzf#vim#ag(<q-args>, {'options': '--delimiter : --nth 4..'}, <bang>0)
nmap <M-w> :Ag<cr> nmap <M-w> :Ag<cr>
nmap <silent> <M-z> :CocFzfList<cr> nmap <silent> <M-x> :CocFzfList<cr>
nmap <silent> <M-g> :CocFzfList symbols<cr>
nmap <silent> <M-v> :CocFzfList symbols --kind Variable<cr> nmap <silent> <M-v> :CocFzfList symbols --kind Variable<cr>
nmap <silent> <M-u> :CocFzfList symbols --kind Function<cr> nmap <silent> <M-u> :CocFzfList symbols --kind Function<cr>
nmap <silent> <M-r> :History<cr> nmap <silent> <M-r> :History<cr>
@@ -321,7 +318,7 @@ nmap <silent> <M-e> :History/<cr>
nmap <silent> <M-f> :GFiles<cr> nmap <silent> <M-f> :GFiles<cr>
nmap <silent> <M-F> :Files<cr> nmap <silent> <M-F> :Files<cr>
nmap <silent> <M-b> :Buffers<cr> nmap <silent> <M-b> :Buffers<cr>
map <silent> <M-c> :Colors<cr> map <silent> <M-z> :Colors<cr>
map <silent> <M-y> :Filetypes<cr> map <silent> <M-y> :Filetypes<cr>
let g:fzf_preview_command='bat --color=always --plain {-1}' " Installed bat let g:fzf_preview_command='bat --color=always --plain {-1}' " Installed bat
let g:fzf_preview_grep_cmd='rg --smart-case --line-number --no-heading --color=never' let g:fzf_preview_grep_cmd='rg --smart-case --line-number --no-heading --color=never'
+6 -6
View File
@@ -57,8 +57,7 @@ unbind -a
bind ? list-keys bind ? list-keys
bind d detach-client bind d detach-client
bind D choose-client bind D choose-client
bind : command-prompt bind ø command-prompt
bind Enter command-prompt
#bind \ show-messages #bind \ show-messages
# Copy mode # Copy mode
@@ -71,9 +70,6 @@ bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xclip -i -f -selection
bind -T copy-mode-vi r send-keys -X rectangle-toggle bind -T copy-mode-vi r send-keys -X rectangle-toggle
bind -T copy-mode-vi Escape send-keys -X cancel bind -T copy-mode-vi Escape send-keys -X cancel
# Refresh client
bind R refresh-client \; display-message "Refresh already"
# Rename window # Rename window
bind , command-prompt "rename-window %%" bind , command-prompt "rename-window %%"
@@ -84,7 +80,7 @@ bind t clock-mode
bind i display-panes bind i display-panes
# Config Reloads # Config Reloads
bind r source-file ~/.tmux.conf \; display-message "Config reloaded" bind r source-file ~/.tmux.conf \; refresh-client \; display-message "Config reloaded"
# resize controls # resize controls
bind -r h resize-pane -L 2 \; display-message "Resize left" bind -r h resize-pane -L 2 \; display-message "Resize left"
@@ -98,10 +94,14 @@ bind -n M-o resize-pane -Z
# split panes using | and -, make sure they open in the same path # split panes using | and -, make sure they open in the same path
bind | split-window -h -c "#{pane_current_path}" bind | split-window -h -c "#{pane_current_path}"
bind - split-window -v -c "#{pane_current_path}" bind - split-window -v -c "#{pane_current_path}"
bind § split-window -fh -c "#{pane_current_path}"
bind _ split-window -fv -c "#{pane_current_path}"
# Change layouts # Change layouts
bind o rotate-window bind o rotate-window
bind Space next-layout bind Space next-layout
bind M-- select-layout even-horizontal
bind M-| select-layout even-vertical
bind K swap-pane -d -t "{up-of}" bind K swap-pane -d -t "{up-of}"
bind J swap-pane -d -t "{down-of}" bind J swap-pane -d -t "{down-of}"
bind H swap-pane -d -t "{left-of}" bind H swap-pane -d -t "{left-of}"