From 26874d5207d53ddf139dfc4b00e94ab13f3a1530 Mon Sep 17 00:00:00 2001 From: Felix Wittwer Date: Wed, 17 Nov 2021 12:38:07 +0100 Subject: [PATCH] Modify vim keybinds, add default git branch --- tycho/.gitconfig | 2 ++ tycho/.vimrc | 15 ++++++++++----- tycho/terminal/alacritty.yml | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/tycho/.gitconfig b/tycho/.gitconfig index e493751..5f14643 100644 --- a/tycho/.gitconfig +++ b/tycho/.gitconfig @@ -24,3 +24,5 @@ commit-decoration-style = bold yellow box ul file-style = bold yellow ul file-decoration-style = none +[init] + defaultBranch = main diff --git a/tycho/.vimrc b/tycho/.vimrc index 8ed848d..636d9d8 100644 --- a/tycho/.vimrc +++ b/tycho/.vimrc @@ -31,7 +31,7 @@ Plug 'airblade/vim-gitgutter' Plug 'justinmk/vim-sneak' Plug 'lervag/vimtex' Plug 'editorconfig/editorconfig-vim' -" Plug 'LnL7/vim-nix' +Plug 'LnL7/vim-nix' Plug 'preservim/nerdtree' " Plugin outside ~/.vim/plugged with post-update hook @@ -45,8 +45,8 @@ Plug 'dense-analysis/ale' call plug#end() " open fzf files in new tab instead of new buffer -command! -bang -nargs=? -complete=dir Files - \ call fzf#vim#files(, {'sink': 'tabedit', 'options': ['--info=inline', '--preview', '~/.vim/plugged/fzf.vim/bin/preview.sh {}']}, 0) +"command! -bang -nargs=? -complete=dir Files + "\ call fzf#vim#files(, {'sink': 'tabedit', 'options': ['--info=inline', '--preview', '~/.vim/plugged/fzf.vim/bin/preview.sh {}']}, 0) set laststatus=2 let g:airline#extensions#tabline#enabled = 1 @@ -73,9 +73,12 @@ au BufRead,BufNewFile *.ohuao setfiletype json " nnoremap _ " nnoremap \| " nnoremap \| -map :tabp -map :tabn +map h :tabp +map l :tabn +map :bprevious +map :bnext map f :Files +map bl :Buffers " fix auto-completion set wildmenu " show a completion menu @@ -86,6 +89,8 @@ set wildignore=*.o,*~,*.pyc,*.aux,*.bbl,*.blg,*-blx.bib,*.log,*.out,*.run.xml, " automatically reload files changed on disk but not in buffer set autoread +" hide buffers on switch +set hidden " tex configuration let g:tex_flavor='latex' diff --git a/tycho/terminal/alacritty.yml b/tycho/terminal/alacritty.yml index 5664da4..7f0309e 100644 --- a/tycho/terminal/alacritty.yml +++ b/tycho/terminal/alacritty.yml @@ -376,7 +376,7 @@ mouse: # If this is `true`, the cursor is temporarily hidden when typing. hide_when_typing: false - url: + hints: # URL launcher # # This program is executed when clicking on a text which is recognized as a URL.