From 37c4e13608c1341a9e662e14365250c5c073b6d9 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sat, 19 Jan 2019 16:34:16 +0100 Subject: [PATCH 01/11] add exit alias --- .zshrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index f28b796..27e3e25 100644 --- a/.zshrc +++ b/.zshrc @@ -28,6 +28,7 @@ export EDITOR='vim' alias ll='ls -l' alias vi='vim' alias la='ls -la' +alias :q='exit' # localcommands if [ -f ~/.dotfiles/.localcommands ] @@ -46,5 +47,5 @@ if _has fzf && _has ag; then fi export FZF_ALT_C_COMMAND='find . -type d' - + export PATH="$PATH:$(ruby -e 'print Gem.user_dir')/bin" From 4549cdbfe8934ac309b84d6982a99c120ed19809 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sat, 19 Jan 2019 16:34:57 +0100 Subject: [PATCH 02/11] add dependencies to readme --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 8a7a0a6..6f55090 100644 --- a/README.md +++ b/README.md @@ -1 +1,16 @@ # My Dotfiles +The collection of my dotfiles + +## Dependencies +Everything should work without any of these depencies but it's not as fun. +- zsh +- vim +- git +- oh-my-zsh +- fzf +- silver_searcher +- powerline-fonts +- tmuxinator + +## Usage +If you have extra setup tasks, you can put them in `.localcommands`. From 98dfe49cf644b9c2ed21255426c4802e445d367c Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 23 Jan 2019 17:31:52 +0100 Subject: [PATCH 03/11] add polyglot config --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 1137de6..4cafc67 100644 --- a/.vimrc +++ b/.vimrc @@ -130,6 +130,8 @@ au BufNewFile,BufRead *.js, *.html, *.css \ set shiftwidth=4 " PLUGIN SETTINGS +" polyglot setup +let g:polyglot_disabled = ["latex"] " nerd tree setup let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree map e :NERDTreeToggle From 9437ae2bc621e86da42cb487886a1bb3a310e6e6 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 23 Jan 2019 17:33:12 +0100 Subject: [PATCH 04/11] disable arrow keys --- .vimrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vimrc b/.vimrc index 4cafc67..8c8d791 100644 --- a/.vimrc +++ b/.vimrc @@ -123,6 +123,12 @@ set foldlevel=99 " remap code folding nnoremap g za +" disable arrow keys +noremap +noremap +noremap +noremap + " html css js indents au BufNewFile,BufRead *.js, *.html, *.css \ set tabstop=4 | From 1e68b31e92e23d415942fdf618df4b954426ff06 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 27 Jan 2019 00:23:56 +0100 Subject: [PATCH 05/11] auto switch between linenumbering --- .vimrc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.vimrc b/.vimrc index 8c8d791..132ea15 100644 --- a/.vimrc +++ b/.vimrc @@ -123,6 +123,14 @@ set foldlevel=99 " remap code folding nnoremap g za +" toggle hybrid number mode +nnoremap h :set rnu! +:augroup numbertoggle +: autocmd! +: autocmd BufEnter,FocusGained,InsertLeave * set relativenumber +: autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber +:augroup END + " disable arrow keys noremap noremap From 46fcb1c086d87a0421fae895036b657f768598e3 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sat, 26 Jan 2019 23:51:53 +0100 Subject: [PATCH 06/11] add option to toggle relative linenumbering --- .vimrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.vimrc b/.vimrc index 132ea15..a8ec406 100644 --- a/.vimrc +++ b/.vimrc @@ -105,12 +105,6 @@ set nowritebackup set splitbelow set splitright -"split navigations -nnoremap j -nnoremap k -nnoremap l -nnoremap h - " tabs nnoremap t :tabnew nnoremap gT From 38255f01fc1798c735ac8fc0aa087a0069a83068 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 31 Mar 2019 19:58:58 +0200 Subject: [PATCH 07/11] remove spell check for markdown files --- .vim/ftplugin/markdown.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/ftplugin/markdown.vim b/.vim/ftplugin/markdown.vim index 37de7e0..b5ebb0c 100644 --- a/.vim/ftplugin/markdown.vim +++ b/.vim/ftplugin/markdown.vim @@ -3,6 +3,6 @@ setlocal colorcolumn=0 setlocal linebreak setlocal number setlocal shiftwidth=4 -setlocal spell setlocal tabstop=4 setlocal wrap +setlocal nospell From 09a10ff7689942115d4f29d977b03cb04ccde904 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Sun, 31 Mar 2019 20:00:43 +0200 Subject: [PATCH 08/11] add :Bclose command --- .vimrc | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/.vimrc b/.vimrc index a8ec406..b6d1e49 100644 --- a/.vimrc +++ b/.vimrc @@ -80,6 +80,7 @@ set scrolloff=1 set wildmenu set term=screen-256color set autoread +set lazyredraw " tabs and line wrap set tabstop=4 @@ -137,6 +138,79 @@ au BufNewFile,BufRead *.js, *.html, *.css \ set softtabstop=4 | \ set shiftwidth=4 +" Delete buffer while keeping window layout (don't close buffer's windows). +" Version 2008-11-18 from http://vim.wikia.com/wiki/VimTip165 +if v:version < 700 || exists('loaded_bclose') || &cp + finish +endif +let loaded_bclose = 1 +if !exists('bclose_multiple') + let bclose_multiple = 1 +endif + +" Display an error message. +function! s:Warn(msg) + echohl ErrorMsg + echomsg a:msg + echohl NONE +endfunction + +" Command ':Bclose' executes ':bd' to delete buffer in current window. +" The window will show the alternate buffer (Ctrl-^) if it exists, +" or the previous buffer (:bp), or a blank buffer if no previous. +" Command ':Bclose!' is the same, but executes ':bd!' (discard changes). +" An optional argument can specify which buffer to close (name or number). +function! s:Bclose(bang, buffer) + if empty(a:buffer) + let btarget = bufnr('%') + elseif a:buffer =~ '^\d\+$' + let btarget = bufnr(str2nr(a:buffer)) + else + let btarget = bufnr(a:buffer) + endif + if btarget < 0 + call s:Warn('No matching buffer for '.a:buffer) + return + endif + if empty(a:bang) && getbufvar(btarget, '&modified') + call s:Warn('No write since last change for buffer '.btarget.' (use :Bclose!)') + return + endif + " Numbers of windows that view target buffer which we will delete. + let wnums = filter(range(1, winnr('$')), 'winbufnr(v:val) == btarget') + if !g:bclose_multiple && len(wnums) > 1 + call s:Warn('Buffer is in multiple windows (use ":let bclose_multiple=1")') + return + endif + let wcurrent = winnr() + for w in wnums + execute w.'wincmd w' + let prevbuf = bufnr('#') + if prevbuf > 0 && buflisted(prevbuf) && prevbuf != btarget + buffer # + else + bprevious + endif + if btarget == bufnr('%') + " Numbers of listed buffers which are not the target to be deleted. + let blisted = filter(range(1, bufnr('$')), 'buflisted(v:val) && v:val != btarget') + " Listed, not target, and not displayed. + let bhidden = filter(copy(blisted), 'bufwinnr(v:val) < 0') + " Take the first buffer, if any (could be more intelligent). + let bjump = (bhidden + blisted + [-1])[0] + if bjump > 0 + execute 'buffer '.bjump + else + execute 'enew'.a:bang + endif + endif + endfor + execute 'bdelete'.a:bang.' '.btarget + execute wcurrent.'wincmd w' +endfunction +command! -bang -complete=buffer -nargs=? Bclose call Bclose(, ) +nnoremap bd :Bclose + " PLUGIN SETTINGS " polyglot setup let g:polyglot_disabled = ["latex"] From 6451c2161a7f038c16e39b4f0d108b90eb107ef8 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 3 Apr 2019 12:50:18 +0200 Subject: [PATCH 09/11] remove promela syntax --- .vimrc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.vimrc b/.vimrc index b6d1e49..bb50f43 100644 --- a/.vimrc +++ b/.vimrc @@ -57,9 +57,6 @@ Plugin 'sheerun/vim-polyglot' " latex Plugin 'lervag/vimtex' -" promela syntax highlighting -Plugin 'vim-scripts/promela.vim' - " All of your Plugins must be added before the following line call vundle#end() " required filetype plugin indent on " required @@ -254,3 +251,4 @@ nmap r :ALEFindReferences nmap b :ALEFix nnoremap l :lnext nnoremap p :lprevious + From 071f1117cc2182891f3f53c24d6c7beb20875f24 Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 3 Apr 2019 14:15:12 +0200 Subject: [PATCH 10/11] clean up airline --- .vimrc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.vimrc b/.vimrc index bb50f43..c8333e7 100644 --- a/.vimrc +++ b/.vimrc @@ -215,12 +215,21 @@ let g:polyglot_disabled = ["latex"] let NERDTreeIgnore=['\.pyc$', '\~$'] "ignore files in NERDTree map e :NERDTreeToggle -" airline setup -let g:airline#extensions#tabline#enabled = 1 -let g:airline#extensions#tabline#formatter = 'unique_tail_improved' +" AIRLINE SETUP +" sections +let g:airline_section_y = "" +let g:airline_section_z = "%l/%L:%c" +let g:airline_section_b = "%{airline#util#wrap(airline#extensions#branch#get_head(),0)}" +" other stuff let g:airline_theme='solarized' let g:airline_solarized_bg='dark' let g:airline_powerline_fonts = 1 +let g:airline_inactive_collapse=1 +let g:airline_skip_empty_sections = 1 +let g:airline#extensions#whitespace#enabled = 0 +let g:airline#extensions#wordcount#enabled = 0 +let g:airline#extensions#keymap#enabled = 0 +set ttimeoutlen=50 " gitgutter setup let g:gitgutter_sign_added = '∙' From cddf1fd6601c23d0cea99e15cac969932442d4db Mon Sep 17 00:00:00 2001 From: Jidbo Date: Wed, 3 Apr 2019 14:25:35 +0200 Subject: [PATCH 11/11] auto reload when writing .vimrc --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index c8333e7..6df8178 100644 --- a/.vimrc +++ b/.vimrc @@ -115,6 +115,9 @@ set foldlevel=99 " remap code folding nnoremap g za +" auto reload .vimrc on write +autocmd BufWritePost .vimrc source % + " toggle hybrid number mode nnoremap h :set rnu! :augroup numbertoggle