From 921096431f563f7e84a40dc63c0aeffe30f14e58 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Tue, 17 Jan 2017 22:42:09 +0100 Subject: [PATCH 01/11] update --- base16-shell | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base16-shell b/base16-shell index 8643aca..471707c 160000 --- a/base16-shell +++ b/base16-shell @@ -1 +1 @@ -Subproject commit 8643aca554eef66a20c1227bc2d41b60ba69eee8 +Subproject commit 471707c20e48ea9554c06f1d910c91bd71693459 From 4ea86a2923d63c896b46286527945f1f51637b22 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 25 Jan 2017 22:20:58 +0100 Subject: [PATCH 02/11] add more perl magic to urxvt --- Xresources | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Xresources b/Xresources index 261ba2e..1768663 100644 --- a/Xresources +++ b/Xresources @@ -45,10 +45,6 @@ URxvt*boldItalicFont: xft:DejaVu Sans Mono:style=Book:size=10, \ xft:Droid Sans Japanese:style=Regular, \ xft:unifont:style=Medium ! Font size -URxvt*keysym.C-Up: perl:font-size:increase -URxvt*keysym.C-Down: perl:font-size:decrease -URxvt*keysym.C-S-Up: perl:font-size:incglobal -URxvt*keysym.C-S-Down: perl:font-size:decglobal ! Scrollbar URxvt*scrollStyle: rxvt @@ -56,9 +52,18 @@ URxvt*scrollBar: true URxvt*scrollBar_right: true ! Perl extensions -URxvt*perl-ext-common: default,matcher,font-size -URxvt*url-launcher: xdg-open -URxvt*matcher.button: 1 +URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,matcher,font-size +URxvt.url-select.launcher: xdg-open +URxvt.url-select.underline: true +URxvt.matcher.button: 1 +URxvt.keysym.M-u: perl:url-select:select_next +URxvt.keysym.M-Escape: perl:keyboard-select:activate +URxvt.keysym.M-s: perl:keyboard-select:search +URxvt.keysym.C-Up: perl:font-size:increase +URxvt.keysym.C-Down: perl:font-size:decrease +URxvt.keysym.C-S-Up: perl:font-size:incglobal +URxvt.keysym.C-S-Down: perl:font-size:decglobal + ! Cursor URxvt*cursorBlink: true From b686402c6c15dd5737e625e098a4382ebb7ac4e0 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 25 Jan 2017 23:09:40 +0100 Subject: [PATCH 03/11] fix clipboard issues with urxvt, also sync primary and clipboard --- Xresources | 2 +- vimrc | 7 +------ xinitrc | 5 +++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Xresources b/Xresources index 1768663..a1576f2 100644 --- a/Xresources +++ b/Xresources @@ -52,7 +52,7 @@ URxvt*scrollBar: true URxvt*scrollBar_right: true ! Perl extensions -URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,matcher,font-size +URxvt.perl-ext-common: default,selection-to-clipboard,url-select,keyboard-select,matcher,font-size URxvt.url-select.launcher: xdg-open URxvt.url-select.underline: true URxvt.matcher.button: 1 diff --git a/vimrc b/vimrc index e28500f..f5e3bd6 100644 --- a/vimrc +++ b/vimrc @@ -88,12 +88,7 @@ let g:netrw_liststyle=3 " Use tree style directory listing. set background=dark set path+=** -" Writes to the unnamed register also writes to the * and + registers. This -" makes it easy to interact with the system clipboard -set clipboard^=unnamed -if has ('unnamedplus') - set clipboard^=unnamedplus -endif +set clipboard^=unnamedplus " }}} diff --git a/xinitrc b/xinitrc index 04af3f3..eb8f33c 100755 --- a/xinitrc +++ b/xinitrc @@ -20,6 +20,11 @@ xrdb $HOME/.Xresources xset +fp /usr/share/fonts/local xset fp rehash +# sync primary and secondary clipboard +autocutsel -fork & +autocutsel -selection PRIMARY -fork & + + echo $1 > ~/.xinitrc-arg case $1 in From 8568294d3a62d624abb1746d9b7b73cf2c524068 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 25 Jan 2017 23:12:46 +0100 Subject: [PATCH 04/11] backup and swap files annoy the shit out of me --- vimrc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vimrc b/vimrc index f5e3bd6..9cf33bc 100644 --- a/vimrc +++ b/vimrc @@ -62,9 +62,8 @@ set hidden set ttyfast set synmaxcol=512 " Limit syntax highlighting to 512 characters per line set modeline " Use file-specific settings, if available. -set backup " Make backup files. -set backupdir=~/.vim/backup " Backup directory. -set directory=~/.vim/tmp " Directory for swap files. +set nobackup " Make backup files. +set noswapfile set mouse=a " Mouse support everywhere. set mousehide " Auto-hide cursor while typing. set wildmode=list:longest,full " Make completion more like zsh. From c5975a7d07fc0cf0e042f963b50df0d751714b1d Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 8 Dec 2016 13:53:35 +0100 Subject: [PATCH 05/11] using BS in snippets was buggy, reconfigure bindings --- vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vimrc b/vimrc index 9cf33bc..5993b62 100644 --- a/vimrc +++ b/vimrc @@ -303,8 +303,8 @@ nnoremap g :IndentGuidesToggle "" Ultisnips let g:UltiSnipsExpandTrigger="" -let g:UltiSnipsJumpForwardTrigger="" -let g:UltiSnipsJumpBackwardTrigger="" +let g:UltiSnipsJumpForwardTrigger="" +let g:UltiSnipsJumpBackwardTrigger="" " Tex From b9809425dd0d30e714d6ca65c4ceb50355498336 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 18 Jan 2017 08:28:38 +0100 Subject: [PATCH 06/11] add git last alias --- gitconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/gitconfig b/gitconfig index 4a60dcc..ad18dfa 100644 --- a/gitconfig +++ b/gitconfig @@ -20,6 +20,7 @@ diffstat = diff --stat -r lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative fix = "!f() { ${EDITOR} $(git diff --name-only | uniq ); }; f" + last = "!l() { ${EDITOR} $(git diff-tree --no-commit-id --name-only -r HEAD ); }; l" [merge] tool = bc3 [mergetool] From 171f8cf23e665febf2bea49580f00c7b06199977 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 18 Jan 2017 08:29:13 +0100 Subject: [PATCH 07/11] add minibufexplorer --- vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vimrc b/vimrc index 5993b62..ffd0ba6 100644 --- a/vimrc +++ b/vimrc @@ -23,6 +23,8 @@ Plug 'ludovicchabant/vim-gutentags' Plug 'nathanaelkane/vim-indent-guides' +Plug 'fholgado/minibufexpl.vim' + Plug 'SirVer/ultisnips' Plug 'honza/vim-snippets' @@ -256,6 +258,9 @@ vnoremap a y:Ag " nnoremap A :Ag nnoremap c :Commits +"" minibufexpl +map t :MBEToggle + "" syntastic let g:syntastic_always_populate_loc_list = 1 let g:syntastic_auto_loc_list = 0 From 230c10b90eb2446d75848345191043ab29eec85f Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 18 Jan 2017 08:29:31 +0100 Subject: [PATCH 08/11] no backups --- base16-shell | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base16-shell b/base16-shell index 471707c..8643aca 160000 --- a/base16-shell +++ b/base16-shell @@ -1 +1 @@ -Subproject commit 471707c20e48ea9554c06f1d910c91bd71693459 +Subproject commit 8643aca554eef66a20c1227bc2d41b60ba69eee8 From 78c682da2ebdda1c51962141f2c55bfd8a2cbee4 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Wed, 18 Jan 2017 08:30:08 +0100 Subject: [PATCH 09/11] increase folderlevelstart to 10, 3 is annoying --- vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrc b/vimrc index ffd0ba6..2615ba3 100644 --- a/vimrc +++ b/vimrc @@ -115,7 +115,7 @@ set formatoptions+=j " Delete comment character when joining commente " Folding {{{ set foldmethod=indent -set foldlevelstart=3 +set foldlevelstart=10 " }}} " Diff settings {{{ From 0fe74141e7be0d0177e777f64cc94523fcbb0526 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Tue, 31 Jan 2017 18:15:41 +0100 Subject: [PATCH 10/11] get rid of preview window after insertion --- vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vimrc b/vimrc index 2615ba3..02c97b2 100644 --- a/vimrc +++ b/vimrc @@ -238,6 +238,9 @@ iab xnow =strftime("%Y-%m-%d %H:%M") " Plugin Configuration {{{ +"" youcompleteme +let g:ycm_autoclose_preview_window_after_insertion = 1 + "" gutentags let g:gutentags_cache_dir="~/.tags" From c7b5b7cf6ffc664fc577b5a48af40388ffdcbaa4 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Tue, 31 Jan 2017 18:34:56 +0100 Subject: [PATCH 11/11] that is why I do not find stuff in the history :) --- zshrc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zshrc b/zshrc index 506f6e2..7bb4a63 100644 --- a/zshrc +++ b/zshrc @@ -1,11 +1,11 @@ source ~/.dotfiles/zplug/init.zsh -zplug "lib/spectrum.zsh", from:oh-my-zsh -zplug "lib/directories.zsh", from:oh-my-zsh -zplug "lib/grep.zsh", from:oh-my-zsh -zplug "lib/history.zsh", from:oh-my-zsh -zplug "lib/misc.zsh", from:oh-my-zsh +zplug "lib/spectrum", from:oh-my-zsh +zplug "lib/directories", from:oh-my-zsh +zplug "lib/grep", from:oh-my-zsh +zplug "lib/history", from:oh-my-zsh +zplug "lib/misc", from:oh-my-zsh zplug "plugins/common-aliases", from:oh-my-zsh zplug "plugins/frontend-search", from:oh-my-zsh