From ee4d97d435027ad2fffd19a02ec83a43c53cbbc8 Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Sun, 28 Mar 2021 15:27:18 +0200 Subject: [PATCH] asdf --- .netrwhist | 8 ++++---- init.vim | 47 +++++++++++++++++++++++----------------------- plugins.vim | 6 ++++-- whichkeyConfig.vim | 16 ++++++++++------ 4 files changed, 42 insertions(+), 35 deletions(-) diff --git a/.netrwhist b/.netrwhist index 1e13bf1..4e43bb7 100644 --- a/.netrwhist +++ b/.netrwhist @@ -1,5 +1,8 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhistcnt =4 +let g:netrw_dirhistcnt =7 +let g:netrw_dirhist_7='/home/leon/coding/projects/trup-rs/src/features/ban' +let g:netrw_dirhist_6='/home/leon/coding/projects/trup-rs/migrations' +let g:netrw_dirhist_5='/home/leon/coding/projects/trup-rs/.git' let g:netrw_dirhist_4='/home/leon/a-box-of-gruv/styles' let g:netrw_dirhist_3='/home/leon/tmp/pythonshit' let g:netrw_dirhist_2='/home/leon/dotfiles/.vim' @@ -7,6 +10,3 @@ let g:netrw_dirhist_1='/home/leon/.config/discord' let g:netrw_dirhist_0='/home/leon/coding/projects/eww/src' let g:netrw_dirhist_9='/home/leon/.config/polybar' let g:netrw_dirhist_8='/home/leon/coding/plover-plugins/plover_retro_surround' -let g:netrw_dirhist_7='/home/leon/coding/plover-plugins/plover_retro_surround/plover_retro_surround.egg-info' -let g:netrw_dirhist_6='/home/leon/.config/coc/extensions' -let g:netrw_dirhist_5='/home/leon/.config/elkowar_phocus' diff --git a/init.vim b/init.vim index 64bdc02..09939cc 100644 --- a/init.vim +++ b/init.vim @@ -4,7 +4,7 @@ " \_/ |_|_| |_| |_|_| \___| -set runtimepath^=~/coding/tmp/coc.nvim/ +"set runtimepath^=~/coding/tmp/coc.nvim/ let g:vim_config_root = expand(':p:h') let $VIM_ROOT = g:vim_config_root @@ -217,7 +217,7 @@ let g:signify_sign_add = '▍' let g:signify_sign_delete = '▍' let g:signify_sign_delete_first_line = '▍' let g:signify_sign_change = '▍' -let g:signify_sign_show_text = 0 +"let g:signify_sign_show_text = 0 hi SignifySignDelete cterm=NONE gui=NONE guifg='#fb4934' hi SignifySignChange cterm=NONE gui=NONE guifg='#83a598' @@ -273,30 +273,30 @@ autocmd User AirlineAfterTheme call s:update_highlights() " Barbar --------------------------------------------------------------------------- {{{ -if has('nvim') - let bufferline = get(g:, 'bufferline', {}) - let bufferline.auto_hide = v:false - let bufferline.animation = v:true - let bufferline.icons = v:false +"if has('nvim') + "let bufferline = get(g:, 'bufferline', {}) + "let bufferline.auto_hide = v:false + "let bufferline.animation = v:true + "let bufferline.icons = v:false - let bufferline.icon_separator_active = ' ' - let bufferline.icon_separator_active = ' ' - "let bufferline.icon_separator_inactive = '▎' - "let bufferline.icon_separator_inactive = '▎' - let bufferline.icon_close_tab = '◆' - let bufferline.icon_close_tab_modified = '●' - let bufferline.maximum_padding = 1 + "let bufferline.icon_separator_active = ' ' + "let bufferline.icon_separator_active = ' ' + ""let bufferline.icon_separator_inactive = '▎' + ""let bufferline.icon_separator_inactive = '▎' + "let bufferline.icon_close_tab = '◆' + "let bufferline.icon_close_tab_modified = '●' + "let bufferline.maximum_padding = 1 - hi! BufferVisible guibg='#282828' guifg='#282828' - hi! BufferCurrent guibg='#689d6a' guifg='#282828' - hi! BufferInactive guibg='#3c3836' guifg='#282828' - hi! BufferTabpageFill guibg='#282828' guifg='#282828' - hi! BufferCurrentSign guibg='#689d6a' guifg='#689d6a' + "hi! BufferVisible guibg='#282828' guifg='#282828' + "hi! BufferCurrent guibg='#689d6a' guifg='#282828' + "hi! BufferInactive guibg='#3c3836' guifg='#282828' + "hi! BufferTabpageFill guibg='#282828' guifg='#282828' + "hi! BufferCurrentSign guibg='#689d6a' guifg='#689d6a' - hi! BufferVisibleMod guibg='#282828' guifg='#8ec07c' - hi! BufferCurrentMod guibg='#282828' guifg='#8ec07c' - hi! BufferInactiveMod guibg='#3c3836' guifg='#8ec07c' -endif + "hi! BufferVisibleMod guibg='#282828' guifg='#8ec07c' + "hi! BufferCurrentMod guibg='#282828' guifg='#8ec07c' + "hi! BufferInactiveMod guibg='#3c3836' guifg='#8ec07c' +"endif " }}} @@ -342,6 +342,7 @@ nnoremap ö a " }}} + source $VIM_ROOT/whichkeyConfig.vim source $VIM_ROOT/lsp.vim diff --git a/plugins.vim b/plugins.vim index e1c1a7a..87832d7 100644 --- a/plugins.vim +++ b/plugins.vim @@ -6,6 +6,8 @@ endif call plug#begin('~/.vim/plugged') + + Plug 'tweekmonster/startuptime.vim' Plug 'tpope/vim-repeat' Plug 'junegunn/goyo.vim', {'on': 'Goyo'} @@ -28,7 +30,7 @@ call plug#begin('~/.vim/plugged') " buffer line if has('nvim') - Plug 'romgrk/barbar.nvim' + "Plug 'romgrk/barbar.nvim' endif "Plug 'morhetz/gruvbox' @@ -117,7 +119,7 @@ call plug#begin('~/.vim/plugged') Plug 'mattn/webapi-vim' - "Plug 'neoclide/coc.nvim', {'branch': 'release'} + Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'thyrgle/vim-dyon' "Plug 'mxw/vim-prolog' diff --git a/whichkeyConfig.vim b/whichkeyConfig.vim index 6d0c22a..5f825b4 100644 --- a/whichkeyConfig.vim +++ b/whichkeyConfig.vim @@ -9,8 +9,9 @@ call which_key#register('', "g:which_key_map") "\ 'h' : 'which_key_ignore', 'l' : 'which_key_ignore' , "\ 'h' : ':bprevious', 'l' : ':bnext' , + "\ 'h' : [':BufferPrevious', 'prev buffer'], 'l' : [':BufferNext', 'next buffer'] , let g:which_key_map = { - \ 'h' : [':BufferPrevious', 'prev buffer'], 'l' : [':BufferNext', 'next buffer'] , + \ 'h' : [':bprevious', 'prev buffer'], 'l' : [':bnext', 'next buffer'], \ 'f' : 'which_key_ignore', 's': 'which_key_ignore' , \ 'c' : { 'name': '+comment_out' }, \ 'e' : { 'name': '+emmet' }, @@ -39,8 +40,8 @@ let g:which_key_map['m'] = { \ 'F' : [ '(coc-format-selected)' , 'format selection' ] , \ 'f' : [ '(coc-format)' , 'format file' ] , "\ 'v' : [ ':CocCommand actions.open' , 'apply codeaction' ] , - \ 'v' : [ '(coc-codeaction)' , 'apply codeaction' ] , - \ 'V' : [ '(coc-codeaction)' , 'codeaction current buffer' ] , + \ 'v' : [ '(coc-codeaction-cursor)', 'apply codeaction' ] , + \ 'V' : [ '(coc-codeaction-line)' , 'codeaction current line'] , \ 'e' : [ ':CocList diagnostics' , 'list all errors' ] , \ 'L' : [ '(coc-diagnostic-next)' , 'go to next error' ] , \ 'H' : [ '(coc-diagnostic-prev)' , 'go to prev error' ] , @@ -77,11 +78,14 @@ let g:which_key_map['v'] = { \ } " :bwipeout! bdelete! + "\ 'b' : ['BufferPick' , 'select open buffer' ] , + "\ 'c' : ['BufferClose', 'close open buffer' ] , + "\ 'w' : ['BufferWipeout', 'wipeout open buffer' ] , let g:which_key_map['b'] = { \ 'name': '+buffers', - \ 'b' : ['BufferPick' , 'select open buffer' ] , - \ 'c' : ['BufferClose', 'close open buffer' ] , - \ 'w' : ['BufferWipeout', 'wipeout open buffer' ] , + \ 'b' : [':Buffers' , 'select open buffer' ] , + \ 'c' : [':bdelete!', 'close open buffer' ] , + \ 'w' : [':bwipeout!', 'wipeout open buffer' ] , \ } let g:which_key_map['x'] = {