From 62b221f123e8742056227397302208ac8b301445 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 25 Jan 2018 00:12:14 +0100 Subject: [PATCH 01/33] use hack as font --- Xresources | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Xresources b/Xresources index b0a266d..c4bdc64 100644 --- a/Xresources +++ b/Xresources @@ -21,19 +21,19 @@ URxvt*lineSpace: 0 URxvt*skipBuiltinGlyphs: true ! Fonts -URxvt*font: xft:Fira Mono:style=Regular:size=11, \ +URxvt*font: xft:Hack:style=Regular:size=11, \ xft:Droid Sans Fallback:style=Regular, \ xft:Droid Sans Japanese:style=Regular, \ xft:unifont:style=Medium -URxvt*boldFont: xft:Fira Mono:style=Bold:size=11, \ +URxvt*boldFont: xft:Hack:style=Bold:size=11, \ xft:Droid Sans Fallback:style=Regular, \ xft:Droid Sans Japanese:style=Regular, \ xft:unifont:style=Medium -URxvt*italicFont: xft:Fira Mono:style=Regular:size=11, \ +URxvt*italicFont: xft:Hack:style=Regular:size=11, \ xft:Droid Sans Fallback:style=Regular, \ xft:Droid Sans Japanese:style=Regular, \ xft:unifont:style=Medium -URxvt*boldItalicFont: xft:Fira Mono:style=Bold:size=11, \ +URxvt*boldItalicFont: xft:Hack:style=Bold:size=11, \ xft:Droid Sans Fallback:style=Regular, \ xft:Droid Sans Japanese:style=Regular, \ xft:unifont:style=Medium From fbba438385eee8289c6edadb5a6aec7a8d7bf2ed Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 25 Jan 2018 00:13:49 +0100 Subject: [PATCH 02/33] remove unused stuff --- xinitrc | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/xinitrc b/xinitrc index 8836673..2816430 100755 --- a/xinitrc +++ b/xinitrc @@ -11,27 +11,15 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then unset f fi -pulseaudio --start eval $(gpg-agent -s --enable-ssh-support --daemon --write-env-file $HOME/.gpg-agent-info) xrdb $HOME/.Xresources -# add additional fonts -xset +fp /usr/share/fonts/local -xset fp rehash - - -echo $1 > ~/.xinitrc-arg - case $1 in xterm) exec xterm ;; herbstluftwm) # default is herbstluftwm - xbindkeys -n & - urxvtd & - udiskie --tray & - systemctl --user start xautolock exec herbstluftwm --locked ;; *) From b74d76a012bc69f812a3fbea549eb80d4c5865e9 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 25 Jan 2018 00:14:05 +0100 Subject: [PATCH 03/33] add fzf to zshrc --- zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zshrc b/zshrc index 7a6e378..de04291 100644 --- a/zshrc +++ b/zshrc @@ -44,3 +44,5 @@ _load_settings "$HOME/.zsh/configs" # aliases [[ -f ~/.aliases ]] && source ~/.aliases + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh From c658d08928811fa1562076141953bb765d5d8b33 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 26 Jan 2018 00:28:32 +0100 Subject: [PATCH 04/33] remove stuff set by vim-sensible anyways --- vimrc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vimrc b/vimrc index c1efe4d..436896b 100644 --- a/vimrc +++ b/vimrc @@ -66,8 +66,6 @@ call plug#end() " }}} " Basics {{{ -set nocompatible - set hidden set ttyfast set synmaxcol=512 @@ -184,9 +182,6 @@ nnoremap e :e "" fast saving nnoremap w :update -"" remove hightlighting -nnoremap :nohls - "" access copy buffer noremap x "+ From 907b73843576615507c3bda06b3b2948ee40404a Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 26 Jan 2018 00:29:15 +0100 Subject: [PATCH 05/33] no need to set the background --- vimrc | 1 - 1 file changed, 1 deletion(-) diff --git a/vimrc b/vimrc index 436896b..63bbeac 100644 --- a/vimrc +++ b/vimrc @@ -149,7 +149,6 @@ set undoreload=10000 " Visual Setting {{{ " -set background=dark set cursorline colorscheme gruvbox From f95fead2b844dc1a33c45672c17b75de295eed54 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 26 Jan 2018 00:29:44 +0100 Subject: [PATCH 06/33] not using relative numbers lately --- vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/vimrc b/vimrc index 63bbeac..fffe112 100644 --- a/vimrc +++ b/vimrc @@ -153,9 +153,6 @@ set cursorline colorscheme gruvbox set number -if exists('+relativenumber') - set relativenumber -endif " }}} " GUI Settings {{{ From e78a2785cc4974c68b6f8b841ef645a66c0d02b0 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 26 Jan 2018 00:30:06 +0100 Subject: [PATCH 07/33] add missing autocmd! --- vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vimrc b/vimrc index fffe112..3f1aa94 100644 --- a/vimrc +++ b/vimrc @@ -352,6 +352,7 @@ augroup END "" Python augroup python + autocmd! autocmd FileType python set noexpandtab augroup END From 80a3f0016a5920960333473ba402117faff2b1d9 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 26 Jan 2018 00:30:54 +0100 Subject: [PATCH 08/33] change tab settings --- vimrc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vimrc b/vimrc index 3f1aa94..b5b26ad 100644 --- a/vimrc +++ b/vimrc @@ -116,16 +116,19 @@ set secure " Text Formatting {{{ set list + set breakindent set showbreak=↳ -set tabstop=4 -set softtabstop=4 -set shiftwidth=4 -set expandtab set textwidth=79 set colorcolumn=80 set nojoinspaces + +set tabstop=8 +set softtabstop=4 +set shiftwidth=4 +set expandtab + " }}} " Folding {{{ From 75470a3346cf2f0b26afc86fec11415b9d94319a Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:21:50 +0100 Subject: [PATCH 09/33] remove indentguides, not really using it --- vimrc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vimrc b/vimrc index b5b26ad..8244f67 100644 --- a/vimrc +++ b/vimrc @@ -21,8 +21,6 @@ Plug 'maralla/completor.vim', { 'do': 'make js'} Plug 'ludovicchabant/vim-gutentags' -Plug 'nathanaelkane/vim-indent-guides' - Plug 'SirVer/ultisnips' Plug 'honza/vim-snippets' @@ -310,9 +308,6 @@ nnoremap j ]e vnoremap k [egv vnoremap j ]egv -"" Indent Guides -nnoremap g :IndentGuidesToggle - "" Ultisnips let g:UltiSnipsExpandTrigger="" let g:UltiSnipsJumpForwardTrigger="" From 98e3db9e042a4594471626912729a075c33ad352 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:22:13 +0100 Subject: [PATCH 10/33] remove unused toggle states --- vimrc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vimrc b/vimrc index 8244f67..d86ed90 100644 --- a/vimrc +++ b/vimrc @@ -221,13 +221,8 @@ noremap sa zg noremap s? z= "" toggle states -nnoremap hh :set invhlsearch -nnoremap ll :set invlist nnoremap pp :set invpaste -nnoremap nn :set invnumber -nnoremap ii :set invrelativenumber - "" 0: Run the visually selected code in node and replace it with the output vnoremap 0 :!node From d4ba7d7988338d5676358cab6e3ad2af7326e7bf Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:23:01 +0100 Subject: [PATCH 11/33] configure vim-grepper --- vimrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vimrc b/vimrc index d86ed90..1b55610 100644 --- a/vimrc +++ b/vimrc @@ -252,6 +252,12 @@ iab xnow =strftime("%Y-%m-%d %H:%M") let g:EditorConfig_core_mode = 'python_external' let g:EditorConfig_exclude_patterns = ['fugitive://.*'] +"" vim-grepper +nnoremap g :Grepper -tool rg + +let g:grepper = {} +let g:grepper.tools = ['rg', 'git', 'ag', 'grep'] + "" gutentags let g:gutentags_cache_dir="~/.tags" From ed970da6cb433bd4777f35feff4f6f50e15bd844 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:31:54 +0100 Subject: [PATCH 12/33] clean header --- vimrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vimrc b/vimrc index 1b55610..d36ccee 100644 --- a/vimrc +++ b/vimrc @@ -1,6 +1,5 @@ " vim: set fenc=utf-8 ft=vim fdm=marker fmr={{{,}}}: -" file: ~/.vimrc -" author: Thomas Ruoff (with the help of a myriad others) +" author: Thomas Ruoff " Plugins {{{ call plug#begin('~/.vim/plugged') From 5e2ca2af5f647255d4c96f3124cc7b3881c34821 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:35:32 +0100 Subject: [PATCH 13/33] not used in ages, removing --- vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/vimrc b/vimrc index d36ccee..9b08a28 100644 --- a/vimrc +++ b/vimrc @@ -222,9 +222,6 @@ noremap s? z= "" toggle states nnoremap pp :set invpaste -"" 0: Run the visually selected code in node and replace it with the output -vnoremap 0 :!node - " debugging, use leader-DD to start, do a slow action, then leader-DQ to " finish. Your output will be in profile.log nnoremap DD :exe ":profile start profile.log":exe ":profile func *":exe ":profile file *" From d0f5b7dfdc31431729e4902de7d9e90fbf0cbfd9 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:39:09 +0100 Subject: [PATCH 14/33] repeat in visual mode? get out of here --- vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/vimrc b/vimrc index 9b08a28..f99888f 100644 --- a/vimrc +++ b/vimrc @@ -199,9 +199,6 @@ noremap bd :bd vnoremap > >gv vnoremap < - "" Visually select the text that was last edited/pasted nnoremap gV `[v`] From 07a188d8f30f94798eed74210fd4e62b87487273 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:42:37 +0100 Subject: [PATCH 15/33] fix comment position --- vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vimrc b/vimrc index f99888f..e8e0f87 100644 --- a/vimrc +++ b/vimrc @@ -329,9 +329,9 @@ let g:jsx_ext_required = 0 " Autocmd Rules {{{ -"" do syntax highlight syncing from start augroup general autocmd! + "" do syntax highlight syncing from start autocmd BufEnter * :syntax sync fromstart autocmd FileType netrw setl bufhidden=delete augroup END From 695fc84e0a234705cd596d2f8912feca35c1db69 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:43:19 +0100 Subject: [PATCH 16/33] polyglot should cover my ass --- vimrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vimrc b/vimrc index e8e0f87..32845d3 100644 --- a/vimrc +++ b/vimrc @@ -342,12 +342,6 @@ augroup text autocmd FileType text,markdown,mail,tex set wrap wm=2 nocindent spell augroup END -"" Python -augroup python - autocmd! - autocmd FileType python set noexpandtab -augroup END - "" JavaScript augroup web autocmd! From 2c1308a4d7ace514acfa9d43e04d4ecb98257b9c Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:44:15 +0100 Subject: [PATCH 17/33] erm, not sure when and why I put this in here :s --- vimrc | 1 - 1 file changed, 1 deletion(-) diff --git a/vimrc b/vimrc index 32845d3..21aa0ee 100644 --- a/vimrc +++ b/vimrc @@ -346,7 +346,6 @@ augroup END augroup web autocmd! autocmd FileType javascript map r :TernRename - autocmd BufRead,BufNewFile *.json set ft=json autocmd BufRead,BufNewFile *.template set filetype=html.mustache syntax=mustache augroup END From 687e81de3a9b8eca655fb4c16261ca30fbe482ac Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 00:47:29 +0100 Subject: [PATCH 18/33] add vim cheetsheet --- vim/cheetsheet.md | 22 ++++++++++++++++++++++ vimrc | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 vim/cheetsheet.md diff --git a/vim/cheetsheet.md b/vim/cheetsheet.md new file mode 100644 index 0000000..b943f16 --- /dev/null +++ b/vim/cheetsheet.md @@ -0,0 +1,22 @@ +# VIM CHEETSHEET + +Generel stuff that I need to get into my muscle memory. + +## surround +* `cs"'` - changes surrouding " to ' + +## Grepper + +* `g` - kick off +* without entering anything, takes word under the cursor + +## GitGutter + +* `]c`, `[c` - jump to next/prev hunk (*c*hange) +* `hs` - stage hunk +* `hu` - undo hunk + +## Debugging + +* `DD` - start profiling +* `DP` - pause profiling, output in `profile.log` diff --git a/vimrc b/vimrc index 21aa0ee..bfb2a21 100644 --- a/vimrc +++ b/vimrc @@ -208,6 +208,9 @@ nnoremap r :%s#\<=expand("")\># "" fast editing of the .vimrc nnoremap ev :e $MYVIMRC +"" cheetsheet +nnoremap ec :e ~/.vim/cheetsheet.md + "" turn on spell checking noremap spl :setlocal spell! "" spell checking shortcuts From b9b11aa465a93538935fbf04aa87ead753e8337e Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:15:30 +0100 Subject: [PATCH 19/33] remove search pulse, regular highlight is enough --- vimrc | 2 -- 1 file changed, 2 deletions(-) diff --git a/vimrc b/vimrc index bfb2a21..3c92360 100644 --- a/vimrc +++ b/vimrc @@ -30,8 +30,6 @@ Plug 'tpope/vim-rhubarb' Plug 'rhysd/conflict-marker.vim' Plug 'airblade/vim-gitgutter' -Plug 'inside/vim-search-pulse' - Plug 'itchyny/lightline.vim' Plug 'morhetz/gruvbox' From d5ec26cde9c6858e3c8d9e5b6fcc5d5613eef7f5 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:28:51 +0100 Subject: [PATCH 20/33] order plugins --- vimrc | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/vimrc b/vimrc index 3c92360..353775f 100644 --- a/vimrc +++ b/vimrc @@ -5,51 +5,55 @@ call plug#begin('~/.vim/plugged') Plug 'tpope/vim-sensible' +Plug 'tpope/vim-unimpaired' +Plug 'tpope/vim-surround' -Plug 'vim-scripts/L9' -Plug 'vim-scripts/unimpaired.vim' -Plug 'vim-scripts/surround.vim' -Plug 'vim-scripts/Align' -Plug 'Raimondi/delimitMate' +" Plug 'Raimondi/delimitMate' +" project config Plug 'editorconfig/editorconfig-vim' - Plug 'tpope/vim-projectionist' -Plug 'maralla/completor.vim', { 'do': 'make js'} - +" navigating in project +Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +Plug 'junegunn/fzf.vim' +Plug 'mhinz/vim-grepper' Plug 'ludovicchabant/vim-gutentags' -Plug 'SirVer/ultisnips' -Plug 'honza/vim-snippets' - +" linting Plug 'w0rp/ale' +" navigation +Plug 'christoomey/vim-tmux-navigator' + +" completion +Plug 'maralla/completor.vim', { 'do': 'make js'} + +" git related Plug 'tpope/vim-fugitive' Plug 'tpope/vim-rhubarb' Plug 'rhysd/conflict-marker.vim' Plug 'airblade/vim-gitgutter' +" appearence Plug 'itchyny/lightline.vim' - Plug 'morhetz/gruvbox' +" filetypes +Plug 'sheerun/vim-polyglot' +Plug 'SirVer/ultisnips' +Plug 'honza/vim-snippets' + +" javascript Plug 'pangloss/vim-javascript' Plug 'marijnh/tern_for_vim', { 'do': 'npm install' } Plug 'mxw/vim-jsx' +" previews Plug 'suan/vim-instant-markdown', { 'for': 'markdown' } Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } -Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } -Plug 'junegunn/fzf.vim' - -Plug 'mhinz/vim-grepper' - -Plug 'sheerun/vim-polyglot' - -Plug 'christoomey/vim-tmux-navigator' - +" debug Plug 'tweekmonster/startuptime.vim' " Investigate on custom text object, seems really usefull From b7675e253820903ce9f772312fb499dd22bdd049 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:29:23 +0100 Subject: [PATCH 21/33] well, I have unimpared for that --- vimrc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/vimrc b/vimrc index 353775f..0415352 100644 --- a/vimrc +++ b/vimrc @@ -189,11 +189,6 @@ nnoremap nnoremap nnoremap -"" open next,prev buffer, cycle -noremap . :bn -noremap m :bp -noremap : :b# - "" delete buffer noremap bd :bd From 7a6a725b723f6a2e6fbfce25b7ae277da8187d73 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:33:23 +0100 Subject: [PATCH 22/33] deleting as unused lately --- vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/vimrc b/vimrc index 0415352..478bc68 100644 --- a/vimrc +++ b/vimrc @@ -180,9 +180,6 @@ nnoremap e :e "" fast saving nnoremap w :update -"" access copy buffer -noremap x "+ - "" fast window switching nnoremap nnoremap From ed5e4066d84c874c8346bcfebf01474f2b2dfd3b Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:37:31 +0100 Subject: [PATCH 23/33] builtin commands are fine aswell --- vimrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/vimrc b/vimrc index 478bc68..42e428f 100644 --- a/vimrc +++ b/vimrc @@ -180,12 +180,6 @@ nnoremap e :e "" fast saving nnoremap w :update -"" fast window switching -nnoremap -nnoremap -nnoremap -nnoremap - "" delete buffer noremap bd :bd From acaeeb824ba54db8e0b16e85ce5bb0b74933a3a8 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:42:47 +0100 Subject: [PATCH 24/33] using builtin stuff nowadays --- vimrc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/vimrc b/vimrc index 42e428f..4246279 100644 --- a/vimrc +++ b/vimrc @@ -199,14 +199,6 @@ nnoremap ev :e $MYVIMRC "" cheetsheet nnoremap ec :e ~/.vim/cheetsheet.md -"" turn on spell checking -noremap spl :setlocal spell! -"" spell checking shortcuts -noremap sn ]s -noremap sp [s -noremap sa zg -noremap s? z= - "" toggle states nnoremap pp :set invpaste From 144fbaa1288a6a2caad9232c73a972416c5502c6 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:44:04 +0100 Subject: [PATCH 25/33] ehm, no minibufexplorer anymore --- vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/vimrc b/vimrc index 4246279..577e23a 100644 --- a/vimrc +++ b/vimrc @@ -257,9 +257,6 @@ nnoremap hf :History nnoremap hc :History nnoremap h/ :History -"" minibufexpl -map t :MBEToggle - "" ale nmap (ale_previous_wrap) nmap (ale_next_wrap) From 269a380f262c0c83e195d9d76c63d3a57b0b1fe2 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:44:55 +0100 Subject: [PATCH 26/33] remove superfluous empty line --- vimrc | 1 - 1 file changed, 1 deletion(-) diff --git a/vimrc b/vimrc index 577e23a..ffb0ecb 100644 --- a/vimrc +++ b/vimrc @@ -235,7 +235,6 @@ let g:grepper = {} let g:grepper.tools = ['rg', 'git', 'ag', 'grep'] "" gutentags - let g:gutentags_cache_dir="~/.tags" let g:gutentags_file_list_command = { \ 'markers': { From 0b443c85143666a5529d882a0b6581225952b3c1 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 15:45:54 +0100 Subject: [PATCH 27/33] add buffer mappings and windown navigation --- vim/cheetsheet.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vim/cheetsheet.md b/vim/cheetsheet.md index b943f16..d5a86a8 100644 --- a/vim/cheetsheet.md +++ b/vim/cheetsheet.md @@ -2,6 +2,14 @@ Generel stuff that I need to get into my muscle memory. +* `CTRL-W [hjkl]` - switch to window left, above, below, right + +## unimpared +* `]b` - :bnext +* `[b` - :bprevious +* `]B` - :bfirst +* `[B` - :blast + ## surround * `cs"'` - changes surrouding " to ' From 86cf85c1835cf7f23502ecc1b9acc20591952af3 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 23:37:10 +0100 Subject: [PATCH 28/33] remove conflict-marker, unimpared is again enough --- vimrc | 1 - 1 file changed, 1 deletion(-) diff --git a/vimrc b/vimrc index ffb0ecb..06b2a1c 100644 --- a/vimrc +++ b/vimrc @@ -32,7 +32,6 @@ Plug 'maralla/completor.vim', { 'do': 'make js'} " git related Plug 'tpope/vim-fugitive' Plug 'tpope/vim-rhubarb' -Plug 'rhysd/conflict-marker.vim' Plug 'airblade/vim-gitgutter' " appearence From 0b4b63978418c9c13041aa137408c2d6e6ad0cd8 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Sat, 27 Jan 2018 23:44:59 +0100 Subject: [PATCH 29/33] again unimpares covers my ass --- vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/vimrc b/vimrc index 06b2a1c..b7136d8 100644 --- a/vimrc +++ b/vimrc @@ -198,9 +198,6 @@ nnoremap ev :e $MYVIMRC "" cheetsheet nnoremap ec :e ~/.vim/cheetsheet.md -"" toggle states -nnoremap pp :set invpaste - " debugging, use leader-DD to start, do a slow action, then leader-DQ to " finish. Your output will be in profile.log nnoremap DD :exe ":profile start profile.log":exe ":profile func *":exe ":profile file *" From 07e12d28ff07262be7db001371203fdb4bcafdb1 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Tue, 6 Feb 2018 22:37:37 +0100 Subject: [PATCH 30/33] finally figured out yanking on all oses --- vim/cheetsheet.md | 13 +++++++++++++ vimrc | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/vim/cheetsheet.md b/vim/cheetsheet.md index d5a86a8..1b133f0 100644 --- a/vim/cheetsheet.md +++ b/vim/cheetsheet.md @@ -4,6 +4,19 @@ Generel stuff that I need to get into my muscle memory. * `CTRL-W [hjkl]` - switch to window left, above, below, right +## yanking +* `"ay` - replace content of register 'a' +* `"Ay` - append to content of register 'a' +* `y` - will put stuff in the default register `""` and `"0` +* `d` - will put stuff just in the default register `""` - so `"0p` will still + paste the last yank +* `3yy` - yank next three lines +* `CTRL-r +` - paste register '+' in insert mode +* `"*` - linux the PRIMARY clipboard, system clipboard on other operating + systems +* `"+` - the system clipboard on all operating systems + + ## unimpared * `]b` - :bnext * `[b` - :bprevious diff --git a/vimrc b/vimrc index b7136d8..02b1a95 100644 --- a/vimrc +++ b/vimrc @@ -80,6 +80,10 @@ set wildignore+=*.swp,*.bak,*.jpg,*.gif,*.png,*.git, set splitright set splitbelow +" yank delete change and put operations go by default in `"+` register +" so in the systems clipboard accessable by CTRL-V on all OS types +set clipboard=unnamedplus + " set ignorecase set infercase set smartcase From e5e8c952fb139453458eb208c32630c352f91a72 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Tue, 6 Feb 2018 22:47:30 +0100 Subject: [PATCH 31/33] use C instead of CTRL in cheetsheet --- vim/cheetsheet.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/cheetsheet.md b/vim/cheetsheet.md index 1b133f0..2ddfef0 100644 --- a/vim/cheetsheet.md +++ b/vim/cheetsheet.md @@ -2,7 +2,7 @@ Generel stuff that I need to get into my muscle memory. -* `CTRL-W [hjkl]` - switch to window left, above, below, right +* `C-W [hjkl]` - switch to window left, above, below, right ## yanking * `"ay` - replace content of register 'a' @@ -11,7 +11,7 @@ Generel stuff that I need to get into my muscle memory. * `d` - will put stuff just in the default register `""` - so `"0p` will still paste the last yank * `3yy` - yank next three lines -* `CTRL-r +` - paste register '+' in insert mode +* `C-r +` - paste register '+' in insert mode * `"*` - linux the PRIMARY clipboard, system clipboard on other operating systems * `"+` - the system clipboard on all operating systems From 79a18b64f33a03d70c1bac746fbb07b8c77e50fa Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Tue, 6 Feb 2018 22:48:20 +0100 Subject: [PATCH 32/33] remove tmux-navigator plugin, C-L clashes with vim-sensibles highlight clearing --- vimrc | 3 --- 1 file changed, 3 deletions(-) diff --git a/vimrc b/vimrc index 02b1a95..1597dc3 100644 --- a/vimrc +++ b/vimrc @@ -23,9 +23,6 @@ Plug 'ludovicchabant/vim-gutentags' " linting Plug 'w0rp/ale' -" navigation -Plug 'christoomey/vim-tmux-navigator' - " completion Plug 'maralla/completor.vim', { 'do': 'make js'} From a1304cec05a45377edf45169e376f587ced0dc49 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Tue, 6 Feb 2018 22:48:31 +0100 Subject: [PATCH 33/33] add highlight clearing --- vim/cheetsheet.md | 1 + 1 file changed, 1 insertion(+) diff --git a/vim/cheetsheet.md b/vim/cheetsheet.md index 2ddfef0..a65d7e2 100644 --- a/vim/cheetsheet.md +++ b/vim/cheetsheet.md @@ -3,6 +3,7 @@ Generel stuff that I need to get into my muscle memory. * `C-W [hjkl]` - switch to window left, above, below, right +* `C-L` - clear highlight ## yanking * `"ay` - replace content of register 'a'