From 20d1640a18de788ab6288c965804811053ae9b10 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 22 Nov 2017 21:24:54 +0100 Subject: [PATCH 01/82] Fixed sorting, so fixed updating --- .bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bashrc b/.bashrc index 7657dba..26ce71c 100644 --- a/.bashrc +++ b/.bashrc @@ -171,7 +171,7 @@ if [ -e ~/.ssh/config.d ]; then #if find ~/.ssh/config.d -mindepth 1 -print -quit | grep -q .; then # Do we have config files in that directory? if find ~/.ssh/config.d -print -quit | grep -q .; then - newestconfig=$(find ~/.ssh/config.d/* -printf '@T+ %p\n' | sort -r | head -n1 | awk '{print $2}') + newestconfig=$(find ~/.ssh/config.d/* -printf '%Tc %p\n' | sort -r | head -n1 | awk '{print $3}') if [ "$newestconfig" -nt ~/.ssh/config ]; then # We found a config that's newer than the generated config file, re-generate [ -e ~/.ssh/config ] && mv ~/.ssh/config ~/.ssh/config.bak.$(date -Ins) From 870fdd108a0783a496d757c3af2db96d4face72f Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 5 Dec 2017 16:39:57 +0100 Subject: [PATCH 02/82] Just do clean ascii --- .vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index 14eb6f2..5b0153f 100644 --- a/.vimrc +++ b/.vimrc @@ -205,8 +205,8 @@ let g:ale_python_pylint_options="--max-line-length=120 -d C0103,C0111" " Show errors or warnings in the statusline let g:airline#extensions#ale#enabled = 1 " UI -let g:ale_sign_error = '✗' -let g:ale_sign_warning = '⚠' +let g:ale_sign_error = 'x' +let g:ale_sign_warning = '>' " Handy Markdown stuff From a3a8b77502daa46d2a9208830b6f3c32c707978a Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 6 Dec 2017 10:27:38 +0100 Subject: [PATCH 03/82] Some clarifying comments --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 5b0153f..2b2e1b5 100644 --- a/.vimrc +++ b/.vimrc @@ -148,6 +148,8 @@ set complete+=kspell " Also, vim-nox-py2 might be needed Plugin 'davidhalter/jedi-vim' "let g:jedi#force_py_version = 2 +" YouCompleteMe interpreter version (should be the same as what YCM was +" compiled with): let g:ycm_server_python_interpreter = '/usr/bin/python' " code-completion engine @@ -159,6 +161,7 @@ Plugin 'Valloric/YouCompleteMe' " Code checker. For python, install flake8 or pylint, preferably in the " virtualenv. For Django support, install pylint-django +"Disabled, using ALE instead (see below); the settings here are not needed "Plugin 'vim-syntastic/syntastic' set statusline+=%#warningmsg# set statusline+=%{SyntasticStatuslineFlag()} From ad850550e66614ae3cec0f8f46a4fc74dae0d4e1 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 6 Dec 2017 11:16:16 +0100 Subject: [PATCH 04/82] More modern config line --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 2b2e1b5..dc1b25e 100644 --- a/.vimrc +++ b/.vimrc @@ -204,7 +204,7 @@ let g:ale_fixers = {} " Python specific settings let g:ale_fixers.python = ['isort'] " No silly 80-char line limit. Sorry pep-8. Also, Django support. Disable 'invalid name', 'missing docstring' -let g:ale_python_pylint_options="--max-line-length=120 -d C0103,C0111" +let g:ale_python_pylint_options="--max-line-length=120 --load-plugins pylint_django --disable=invalid-name,missing-docstring" " Show errors or warnings in the statusline let g:airline#extensions#ale#enabled = 1 " UI From c76be8f5b7da93695f8414cef620d1e8da8443d8 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 6 Dec 2017 15:25:05 +0100 Subject: [PATCH 05/82] Disable the Django plugin for now, breaks projects where it's not installed --- .vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index dc1b25e..e31b2ed 100644 --- a/.vimrc +++ b/.vimrc @@ -204,7 +204,8 @@ let g:ale_fixers = {} " Python specific settings let g:ale_fixers.python = ['isort'] " No silly 80-char line limit. Sorry pep-8. Also, Django support. Disable 'invalid name', 'missing docstring' -let g:ale_python_pylint_options="--max-line-length=120 --load-plugins pylint_django --disable=invalid-name,missing-docstring" +"let g:ale_python_pylint_options="--max-line-length=120 --load-plugins pylint_django --disable=invalid-name,missing-docstring" +let g:ale_python_pylint_options="--max-line-length=120 --disable=invalid-name,missing-docstring" " Show errors or warnings in the statusline let g:airline#extensions#ale#enabled = 1 " UI From 3edd8363599303b3b0c64a08dfa87f08d53d5b60 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 6 Dec 2017 16:32:05 +0100 Subject: [PATCH 06/82] Improved Django handling, pylint still does not seem to work though --- .vimrc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index e31b2ed..d32c5c3 100644 --- a/.vimrc +++ b/.vimrc @@ -159,6 +159,9 @@ let g:ycm_server_python_interpreter = '/usr/bin/python' " ./install.py # For C-style languages: ./install.py --clang-completer Plugin 'Valloric/YouCompleteMe' +" Improved Django handling +Plugin 'tweekmonster/django-plus' + " Code checker. For python, install flake8 or pylint, preferably in the " virtualenv. For Django support, install pylint-django "Disabled, using ALE instead (see below); the settings here are not needed @@ -204,8 +207,11 @@ let g:ale_fixers = {} " Python specific settings let g:ale_fixers.python = ['isort'] " No silly 80-char line limit. Sorry pep-8. Also, Django support. Disable 'invalid name', 'missing docstring' -"let g:ale_python_pylint_options="--max-line-length=120 --load-plugins pylint_django --disable=invalid-name,missing-docstring" -let g:ale_python_pylint_options="--max-line-length=120 --disable=invalid-name,missing-docstring" +if exists('b:is_django') + let g:ale_python_pylint_options="--max-line-length=120 --load-plugins pylint_django --disable=invalid-name,missing-docstring" +else + let g:ale_python_pylint_options="--max-line-length=120 --disable=invalid-name,missing-docstring" +endif " Show errors or warnings in the statusline let g:airline#extensions#ale#enabled = 1 " UI From c20ef403d331369b713b98c80f72c51877ce49ea Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 6 Dec 2017 21:09:46 +0100 Subject: [PATCH 07/82] More logical location of the config --- .vimrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vimrc b/.vimrc index d32c5c3..dc94b23 100644 --- a/.vimrc +++ b/.vimrc @@ -148,9 +148,6 @@ set complete+=kspell " Also, vim-nox-py2 might be needed Plugin 'davidhalter/jedi-vim' "let g:jedi#force_py_version = 2 -" YouCompleteMe interpreter version (should be the same as what YCM was -" compiled with): -let g:ycm_server_python_interpreter = '/usr/bin/python' " code-completion engine " sudo apt-get install build-essential cmake @@ -158,6 +155,9 @@ let g:ycm_server_python_interpreter = '/usr/bin/python' " cd ~/.vim/bundle/YouCompleteMe " ./install.py # For C-style languages: ./install.py --clang-completer Plugin 'Valloric/YouCompleteMe' +" YouCompleteMe interpreter version (should be the same as what YCM was +" compiled with): +let g:ycm_server_python_interpreter = '/usr/bin/python' " Improved Django handling Plugin 'tweekmonster/django-plus' From d3d9026d88da26dcbdbc14c750b39fd300890793 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 6 Dec 2017 21:32:17 +0100 Subject: [PATCH 08/82] Added missing part of plugin name --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index dc94b23..7be7f0c 100644 --- a/.vimrc +++ b/.vimrc @@ -160,7 +160,7 @@ Plugin 'Valloric/YouCompleteMe' let g:ycm_server_python_interpreter = '/usr/bin/python' " Improved Django handling -Plugin 'tweekmonster/django-plus' +Plugin 'tweekmonster/django-plus.vim' " Code checker. For python, install flake8 or pylint, preferably in the " virtualenv. For Django support, install pylint-django From 8f8a9090794b43ae998902f8a4eed303e8504ccb Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 8 Dec 2017 13:59:07 +0100 Subject: [PATCH 09/82] Hardcode on Python 2 for the moment, let's see if that fixes timeouts --- .vimrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 7be7f0c..122680a 100644 --- a/.vimrc +++ b/.vimrc @@ -157,7 +157,8 @@ Plugin 'davidhalter/jedi-vim' Plugin 'Valloric/YouCompleteMe' " YouCompleteMe interpreter version (should be the same as what YCM was " compiled with): -let g:ycm_server_python_interpreter = '/usr/bin/python' +"let g:ycm_server_python_interpreter = '/usr/bin/python' +let g:ycm_server_python_interpreter = 'python2' " Improved Django handling Plugin 'tweekmonster/django-plus.vim' From fc5d5766ab146e55593cc4e00dcebff3493f0c97 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 11 Dec 2017 10:17:24 +0100 Subject: [PATCH 10/82] Explicit python interpreter for YCM --- .vimrc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 122680a..a9b63fb 100644 --- a/.vimrc +++ b/.vimrc @@ -158,7 +158,10 @@ Plugin 'Valloric/YouCompleteMe' " YouCompleteMe interpreter version (should be the same as what YCM was " compiled with): "let g:ycm_server_python_interpreter = '/usr/bin/python' -let g:ycm_server_python_interpreter = 'python2' +let g:ycm_server_python_interpreter = '/usr/bin/python2' +" Debug stuff +"let g:ycm_server_keep_logfiles = 1 +"let g:ycm_server_log_level = 'debug' " Improved Django handling Plugin 'tweekmonster/django-plus.vim' From 4d43abbbeabdae626bad1fcb3def7179f4cf3aa2 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 23 Dec 2017 15:41:58 +0100 Subject: [PATCH 11/82] Python 3 all the things --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index a9b63fb..ab0a147 100644 --- a/.vimrc +++ b/.vimrc @@ -158,7 +158,7 @@ Plugin 'Valloric/YouCompleteMe' " YouCompleteMe interpreter version (should be the same as what YCM was " compiled with): "let g:ycm_server_python_interpreter = '/usr/bin/python' -let g:ycm_server_python_interpreter = '/usr/bin/python2' +let g:ycm_server_python_interpreter = '/usr/bin/python3' " Debug stuff "let g:ycm_server_keep_logfiles = 1 "let g:ycm_server_log_level = 'debug' From 66192e1a8633c568211e34b58d4a6d79d1516ae2 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 2 Jan 2018 09:15:29 +0100 Subject: [PATCH 12/82] It's 2018 --- bin/sanomanotes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sanomanotes b/bin/sanomanotes index 2d3e95f..7894d98 100755 --- a/bin/sanomanotes +++ b/bin/sanomanotes @@ -2,4 +2,4 @@ cd ~/mydocs/work/sanoma git pull #vim -c ":vsp planning_2015.todo" notes_2015.md notes_2014.md -vim -c "set nofoldenable" planning_2017.todo cs_notes.md cs_howtos.md dcp_notes.md dcp_howtos.md +vim -c "set nofoldenable" planning_2018.todo cs_notes.md cs_howtos.md dcp_notes.md dcp_howtos.md planning_2017.todo From 1162f2cb2399b45d70a2a26d9cab3692eea8f461 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 2 Jan 2018 11:09:29 +0100 Subject: [PATCH 13/82] Highlight matching square brackets --- .vim/syntax/todo.vim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim index 379d42d..31e98a0 100644 --- a/.vim/syntax/todo.vim +++ b/.vim/syntax/todo.vim @@ -81,6 +81,9 @@ syntax match todoStatusQuestion "\v^\? " syntax match todoStatusQuestion "\v \? " highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff +" Highlight matching brackets (for example a timeslot) +syntax match brack /[\[\]]/ | hi brack ctermfg=DarkMagenta + highlight link todoStatusDone PreProc highlight link todoStatusDoing PreProc highlight link todoStatusTodo PreProc From d668726052b2a81d4983223be3d6c52ee5e1b2ac Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 2 Jan 2018 12:43:53 +0100 Subject: [PATCH 14/82] Highlight a 'timeslot': [-] --- .vim/syntax/todo.vim | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim index 31e98a0..844f11c 100644 --- a/.vim/syntax/todo.vim +++ b/.vim/syntax/todo.vim @@ -82,7 +82,10 @@ syntax match todoStatusQuestion "\v \? " highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff " Highlight matching brackets (for example a timeslot) -syntax match brack /[\[\]]/ | hi brack ctermfg=DarkMagenta +"syntax match brack /[\[\]]/ | hi brack ctermfg=DarkMagenta + +syntax match timeslot "\v\[.*-.*\] " +highlight timeslot ctermfg=Magenta highlight link todoStatusDone PreProc highlight link todoStatusDoing PreProc From 7157291b24cd14ff2e52d3cf24294dd207c4f232 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 2 Jan 2018 12:47:25 +0100 Subject: [PATCH 15/82] 'Cancelled' task is darker --- .vim/syntax/todo.vim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim index 844f11c..97e09f5 100644 --- a/.vim/syntax/todo.vim +++ b/.vim/syntax/todo.vim @@ -54,10 +54,12 @@ highlight note ctermfg=Grey guifg=#eeeeee syntax match todoStatusDone "\v^v " syntax match todoStatusDone "\v v " -syntax match todoStatusDone "\v^x " -syntax match todoStatusDone "\v x " highlight todoStatusDone ctermfg=green guifg=#00ff00 +syntax match todoStatusCancelled "\v^x " +syntax match todoStatusCancelled "\v x " +highlight todoStatusCancelled ctermfg=DarkGreen + syntax match todoStatusDoing "\v^d .*$" syntax match todoStatusDoing "\v d .*$" highlight todoStatusDoing ctermfg=223 guifg=#f0dfaf From 57153f15b549bcb69d40ffbfee5f0c1596d6fe34 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 2 Jan 2018 13:05:36 +0100 Subject: [PATCH 16/82] Day headings are tinted --- .vim/syntax/todo.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim index 97e09f5..d1dbe00 100644 --- a/.vim/syntax/todo.vim +++ b/.vim/syntax/todo.vim @@ -32,9 +32,9 @@ highlight link todoComment Comment " Heading (day) delimiters -syn region todoDay matchgroup=todoHeadingDelimiter start="==\@!" end="==*\s*$" keepend oneline +syntax region todoDay start=/\v\=\=\ / skip=/\v\\./ end=/\v\ \=\=\=\=\=\=/ -hi def link todoHeadingDelimiter Delimiter +hi link todoDay Delimiter " Generic operators From 27ff57a5b84a474d0df6e40f8e464673f3e109bb Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 2 Jan 2018 13:06:08 +0100 Subject: [PATCH 17/82] New plugin for quickly commenting regions of files --- .vimrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vimrc b/.vimrc index ab0a147..2fd9742 100644 --- a/.vimrc +++ b/.vimrc @@ -97,8 +97,14 @@ Plugin 'ryanoasis/vim-devicons' " == Content convenience ====== +" transparent editing of gpg encrypted files. The filename must have a .gpg, +" .pgp or .asc suffix. Plugin 'jamessan/vim-gnupg' +" tcomment provides easy to use, file-type sensible comments for Vim. It +" can handle embedded syntax. +Plugin 'tomtom/tcomment_vim' + " Automatically insert matching close bracket where it belongs "Plugin 'seletskiy/vim-autosurround' "inoremap ( (:call AutoSurround(")") From d0a5e0fb7fcdf0d60744fac12b9e0f52e34e734b Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 2 Jan 2018 16:38:37 +0100 Subject: [PATCH 18/82] Fixed lousy coding style :) --- bin/git_autosave | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/git_autosave b/bin/git_autosave index 4a40bfa..f88b6b5 100755 --- a/bin/git_autosave +++ b/bin/git_autosave @@ -3,14 +3,14 @@ if [ -n "$1" ]; then FIRSTFILE=$1 #echo $! - GITDIR=$(dirname ${FIRSTFILE}) + GITDIR=$(dirname "${FIRSTFILE}") #echo $GITDIR - cd $GITDIR - DATETIME=`date +%Y%m%d\ %H:%M:%S` + cd "$GITDIR" || exit + DATETIME=$(date +%Y%m%d\ %H:%M:%S) #echo $DATETIME #git pull - RESULT=`git commit $* -m "Autosave at $DATETIME"` - echo $RESULT + RESULT=$(git commit "$*" -m "Autosave at $DATETIME") + echo "$RESULT" #zenity --info --text=$RESULT #echo $? #echo "git commit $* -m 'Autosave at $DATETIME'" From 8666be8ebc9f68ed681d62adf815d79f5734c0bc Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 2 Jan 2018 16:39:15 +0100 Subject: [PATCH 19/82] Cleanup --- bin/git_autosave | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bin/git_autosave b/bin/git_autosave index f88b6b5..519f07b 100755 --- a/bin/git_autosave +++ b/bin/git_autosave @@ -2,18 +2,13 @@ if [ -n "$1" ]; then FIRSTFILE=$1 - #echo $! GITDIR=$(dirname "${FIRSTFILE}") - #echo $GITDIR cd "$GITDIR" || exit DATETIME=$(date +%Y%m%d\ %H:%M:%S) - #echo $DATETIME #git pull RESULT=$(git commit "$*" -m "Autosave at $DATETIME") echo "$RESULT" #zenity --info --text=$RESULT - #echo $? - #echo "git commit $* -m 'Autosave at $DATETIME'" git push else From 0ac2f3ab86786af2bf0a4f0aa737f4125ab2109d Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 09:25:51 +0100 Subject: [PATCH 20/82] fzf fuzzy finding integration --- .bashrc | 2 ++ .config/fish/fishfile | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.bashrc b/.bashrc index 26ce71c..be35479 100644 --- a/.bashrc +++ b/.bashrc @@ -214,3 +214,5 @@ export NVM_DIR="${HOME}/.nvm" # QT autoscaling, helpful for hidpi systems export QT_AUTO_SCREEN_SCALE_FACTOR=1 + +[ -f ~/.fzf.bash ] && source ~/.fzf.bash diff --git a/.config/fish/fishfile b/.config/fish/fishfile index 13c6386..9215e1b 100644 --- a/.config/fish/fishfile +++ b/.config/fish/fishfile @@ -1,7 +1,11 @@ +fisherman/await edc/bass oh-my-fish/theme-bobthefish +fisherman/fzf +fisherman/get fisherman/getopts oh-my-fish/plugin-grc +fisherman/last_job_id fisherman/nvm fisherman/shark fisherman/z From a680a0fa2f4cc487985ca55fbed6ae1653c7aec6 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 10:08:18 +0100 Subject: [PATCH 21/82] Replaced ctrl+p by fzf --- .vimrc | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.vimrc b/.vimrc index 2fd9742..190d41d 100644 --- a/.vimrc +++ b/.vimrc @@ -74,17 +74,24 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree " Full path fuzzy file, buffer, mru, tag, ... finder " Quickly open files, fuzzy search on name -Plugin 'ctrlpvim/ctrlp.vim' -"let g:ctrlp_map = 't' -let g:ctrlp_map = '' +"Plugin 'ctrlpvim/ctrlp.vim' +"let g:ctrlp_map = '' " Search in Files, Buffers and MRU files at the same time: -let g:ctrlp_cmd = 'CtrlPMixed' -let g:ctrlp_match_window_bottom = 1 -let g:ctrlp_match_window_reversed = 0 -let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py' -let g:ctrlp_working_path_mode = 0 -let g:ctrlp_dotfiles = 0 -let g:ctrlp_switch_buffer = 0 +"let g:ctrlp_cmd = 'CtrlPMixed' +"let g:ctrlp_match_window_bottom = 1 +"let g:ctrlp_match_window_reversed = 0 +"let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py' +"let g:ctrlp_working_path_mode = 0 +"let g:ctrlp_dotfiles = 0 +"let g:ctrlp_switch_buffer = 0 + + +" fzf integration for fast fuzzy finding, better and faster than ctrl-p +set rtp+=~/workspace/projects/others/fzf +Plugin 'junegunn/fzf.vim' +nmap ; :Buffers +nmap t :Files +nmap r :Tags " Web Development/Filetype icons From a27eda389d1e596ff1e471dd754d920e4442c9e6 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 11:55:37 +0100 Subject: [PATCH 22/82] gutentags is maintained and better than easytags --- .vimrc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.vimrc b/.vimrc index 190d41d..539da18 100644 --- a/.vimrc +++ b/.vimrc @@ -281,10 +281,12 @@ Plugin 'lepture/vim-jinja' "Plugin 'chrisbra/csv.vim' " apparently doesn't work this way ;) " Automatic generation of tags file (ctags), in a central place (~/.vimtags) -Plugin 'xolox/vim-misc' -Plugin 'xolox/vim-easytags' +"Plugin 'xolox/vim-misc' +"Plugin 'xolox/vim-easytags' " easytags highlighting is slow -let g:easytags_auto_highlight = 0 +"let g:easytags_auto_highlight = 0 + +Plugin 'ludovicchabant/vim-gutentags' " All of your Plugins must be added before the following line call vundle#end() " required From cdee89effe2a94103be1aa6d9234e3fda1087dfc Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 12:08:44 +0100 Subject: [PATCH 23/82] Let fzf use Silver Searcher 'ag' --- .config/fish/config.fish | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 7d4f4fd..3db665b 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -33,6 +33,11 @@ end # QT autoscaling, helpful for hidpi systems set -x QT_AUTO_SCREEN_SCALE_FACTOR 1 +# SilverSearcher 'ag' ('ack' and 'grep' replacement) +set -gx FZF_DEFAULT_COMMAND 'ag -g ""' +set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND" +set -gx FZF_ALT_C_COMMAND "$FZF_DEFAULT_COMMAND" + # Aliases ## Listing alias ll 'ls -alF' From 69192a865ab25c05a620c17c4368e8cda09d493a Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 12:10:20 +0100 Subject: [PATCH 24/82] Search with ag --- .vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vimrc b/.vimrc index 539da18..7f56ac5 100644 --- a/.vimrc +++ b/.vimrc @@ -85,6 +85,11 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree "let g:ctrlp_dotfiles = 0 "let g:ctrlp_switch_buffer = 0 +" Run your favorite search tool from Vim, with an enhanced results list. +" Supports Silver Searcher `ag` +Plugin 'mileszs/ack.vim' +" apt install silversearcher-ag +let g:ackprg = 'ag --nogroup --nocolor --column' " fzf integration for fast fuzzy finding, better and faster than ctrl-p set rtp+=~/workspace/projects/others/fzf From 532f2e7592fdac02603c5c86ac3f3072a36f0588 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 12:10:22 +0100 Subject: [PATCH 25/82] 'ag' ignore file --- .agignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .agignore diff --git a/.agignore b/.agignore new file mode 100644 index 0000000..0d20b64 --- /dev/null +++ b/.agignore @@ -0,0 +1 @@ +*.pyc From 6310b184b26036d4a74bf7446cf764562baad79a Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 12:15:58 +0100 Subject: [PATCH 26/82] More info, better 'ag' checking --- .vimrc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index 7f56ac5..3380d5f 100644 --- a/.vimrc +++ b/.vimrc @@ -86,10 +86,14 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree "let g:ctrlp_switch_buffer = 0 " Run your favorite search tool from Vim, with an enhanced results list. -" Supports Silver Searcher `ag` +" Supports Silver Searcher `ag`. Use with: +" :Ack [options] {pattern} [{directories}] Plugin 'mileszs/ack.vim' " apt install silversearcher-ag -let g:ackprg = 'ag --nogroup --nocolor --column' +if executable('ag') + "let g:ackprg = 'ag --nogroup --nocolor --column' + let g:ackprg = 'ag --vimgrep' +endif " fzf integration for fast fuzzy finding, better and faster than ctrl-p set rtp+=~/workspace/projects/others/fzf From 46220b2c81e358829b483b9403a93cdaeda623c9 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 13:04:53 +0100 Subject: [PATCH 27/82] Better-to-remember keys, added c for Commits --- .vimrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index 3380d5f..7da09bb 100644 --- a/.vimrc +++ b/.vimrc @@ -99,8 +99,9 @@ endif set rtp+=~/workspace/projects/others/fzf Plugin 'junegunn/fzf.vim' nmap ; :Buffers -nmap t :Files -nmap r :Tags +nmap f :Files +nmap t :Tags +nmap c :Commits " Web Development/Filetype icons From b1fd3466a7d8f24803302ccd62326584c2c0dab9 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 13:07:16 +0100 Subject: [PATCH 28/82] Close buffer with leader-q, but leave split alone --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 7da09bb..99d725e 100644 --- a/.vimrc +++ b/.vimrc @@ -377,6 +377,9 @@ iab timeh strftime("## %Y%m%d %a %H:%M:%S") " Fly through buffers instead of cycling nnoremap l :ls:b +" Close Location windows, if exist, switch to the previous view buffer, and then close the last switched buffer. +nnoremap q :lcloseb#bd # + " Git and Mercurial 'blame' command. First select lines in visual modes, then " hit the appropriate leader key sequence (e.g., \g for git blame) " Update: For Git blame, just do :Gblame from vim-fugitive From df2c13f41911994819938b2c49d78948c38ac5fd Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 5 Jan 2018 15:57:58 +0100 Subject: [PATCH 29/82] Help fzf search in the whole project, not only current dir --- .vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vimrc b/.vimrc index 99d725e..39c59bc 100644 --- a/.vimrc +++ b/.vimrc @@ -72,6 +72,11 @@ let NERDTreeIgnore = ['\.pyc$'] autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif +" Rooter changes the working directory to the project root when you open a +" file or directory. Useful when using fzf for example. +Plugin 'airblade/vim-rooter' + + " Full path fuzzy file, buffer, mru, tag, ... finder " Quickly open files, fuzzy search on name "Plugin 'ctrlpvim/ctrlp.vim' From 40f446fdeeef4e4cefc1d47d81a09f42b6beb11d Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 6 Jan 2018 13:03:33 +0100 Subject: [PATCH 30/82] Don't quote the list of files, it confuses git --- bin/git_autosave | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/git_autosave b/bin/git_autosave index 519f07b..eb03518 100755 --- a/bin/git_autosave +++ b/bin/git_autosave @@ -6,7 +6,7 @@ if [ -n "$1" ]; then cd "$GITDIR" || exit DATETIME=$(date +%Y%m%d\ %H:%M:%S) #git pull - RESULT=$(git commit "$*" -m "Autosave at $DATETIME") + RESULT=$(git commit $* -m "Autosave at $DATETIME") echo "$RESULT" #zenity --info --text=$RESULT git push From aeeb6a138e8d0e7e626a498bf6f7ed63c9ceeaa8 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 6 Jan 2018 13:38:05 +0100 Subject: [PATCH 31/82] Re-enable ctrl-p plugin, it can find files globally --- .vimrc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.vimrc b/.vimrc index 39c59bc..3d3214d 100644 --- a/.vimrc +++ b/.vimrc @@ -79,16 +79,16 @@ Plugin 'airblade/vim-rooter' " Full path fuzzy file, buffer, mru, tag, ... finder " Quickly open files, fuzzy search on name -"Plugin 'ctrlpvim/ctrlp.vim' -"let g:ctrlp_map = '' +Plugin 'ctrlpvim/ctrlp.vim' +let g:ctrlp_map = '' " Search in Files, Buffers and MRU files at the same time: -"let g:ctrlp_cmd = 'CtrlPMixed' -"let g:ctrlp_match_window_bottom = 1 -"let g:ctrlp_match_window_reversed = 0 -"let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py' -"let g:ctrlp_working_path_mode = 0 -"let g:ctrlp_dotfiles = 0 -"let g:ctrlp_switch_buffer = 0 +let g:ctrlp_cmd = 'CtrlPMixed' +let g:ctrlp_match_window_bottom = 1 +let g:ctrlp_match_window_reversed = 0 +let g:ctrlp_custom_ignore = '\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py' +let g:ctrlp_working_path_mode = 0 +let g:ctrlp_dotfiles = 0 +let g:ctrlp_switch_buffer = 0 " Run your favorite search tool from Vim, with an enhanced results list. " Supports Silver Searcher `ag`. Use with: From 4710e5e733b431dd8befbeea2c55a70882a1bedc Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 12 Jan 2018 12:39:16 +0100 Subject: [PATCH 32/82] Nerd font support for bobthefish theme --- .config/fish/config.fish | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 3db665b..f03e25e 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -5,8 +5,13 @@ set EDITOR vim eval (python -m virtualfish compat_aliases) # Theme options for bobthefish +set -g theme_nerd_fonts yes set -g theme_show_exit_status yes set -g theme_date_format "+%a %Y-%m-%d %H:%M:%S" +set -g theme_avoid_ambiguous_glyphs yes + +# If you use virtualenv, you will probably need to disable the default virtualenv prompt, since it doesn't play nice with fish +set -x VIRTUAL_ENV_DISABLE_PROMPT 1 # grc colouriser set -U grcplugin_ls --color From ca9074fb4ca768592677640beea784e2dff782fb Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 12 Jan 2018 12:39:18 +0100 Subject: [PATCH 33/82] Typescript syntax highlighting --- .vimrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.vimrc b/.vimrc index 3d3214d..bc8f61c 100644 --- a/.vimrc +++ b/.vimrc @@ -127,6 +127,10 @@ Plugin 'jamessan/vim-gnupg' " can handle embedded syntax. Plugin 'tomtom/tcomment_vim' +" Typescript syntax file and more +Plugin 'leafgarland/typescript-vim' +autocmd BufNewFile,BufRead *.ts setlocal filetype=typescript + " Automatically insert matching close bracket where it belongs "Plugin 'seletskiy/vim-autosurround' "inoremap ( (:call AutoSurround(")") From ec87d100850b7c11de3c261fe0425d72ff6a6779 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 15 Jan 2018 09:22:16 +0100 Subject: [PATCH 34/82] csv handling, highlighting, column number in airline --- .vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vimrc b/.vimrc index bc8f61c..766d92f 100644 --- a/.vimrc +++ b/.vimrc @@ -131,6 +131,10 @@ Plugin 'tomtom/tcomment_vim' Plugin 'leafgarland/typescript-vim' autocmd BufNewFile,BufRead *.ts setlocal filetype=typescript +" handling column separated data (csv) +Plugin 'chrisbra/csv.vim' +autocmd BufNewFile,BufRead *.csv setlocal filetype=csv + " Automatically insert matching close bracket where it belongs "Plugin 'seletskiy/vim-autosurround' "inoremap ( (:call AutoSurround(")") @@ -311,6 +315,7 @@ Plugin 'ludovicchabant/vim-gutentags' call vundle#end() " required filetype plugin indent on " required +"filetype plugin on " Enable line numbers, highlighting of current line and syntax highlighting by default set number From e576f0494992950e190fe6b7b02ef6761d985d95 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 15 Jan 2018 15:39:56 +0100 Subject: [PATCH 35/82] Show -scratched out- parts of a line as darker text --- .vim/syntax/todo.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim index d1dbe00..938f1d2 100644 --- a/.vim/syntax/todo.vim +++ b/.vim/syntax/todo.vim @@ -37,6 +37,12 @@ syntax region todoDay start=/\v\=\=\ / skip=/\v\\./ end=/\v\ \=\=\=\=\=\=/ hi link todoDay Delimiter +" Show -scratched out- parts of a line as darker text (Delimiter colour) +syntax region scratchThis start=/\v -/ skip=/\v\\./ end=/\v-\ / oneline + +hi link scratchThis Delimiter + + " Generic operators syntax match todoOperator "\v\*" syntax match todoOperator "\v/" From c5c34934180f88a1519cc3a6cea5eabd004306f7 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 15 Jan 2018 15:51:40 +0100 Subject: [PATCH 36/82] Status-line notification for gutentags tags file generation --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 766d92f..d0b7003 100644 --- a/.vimrc +++ b/.vimrc @@ -309,7 +309,10 @@ Plugin 'lepture/vim-jinja' " easytags highlighting is slow "let g:easytags_auto_highlight = 0 +" Automatic generation of tags file (ctags: Exhuberant Ctags) Plugin 'ludovicchabant/vim-gutentags' +" know when Gutentags is generating tags (prints 'TAGS' in status-line) +set statusline+=%{gutentags#statusline()} " All of your Plugins must be added before the following line call vundle#end() " required From a305dabdf37c893bb17c141c435fcdbafab427f7 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 15 Jan 2018 16:01:57 +0100 Subject: [PATCH 37/82] Some default things to have ctags ignore, also fixes huge tags file in ~/.vim/ --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index d0b7003..9c9b81f 100644 --- a/.vimrc +++ b/.vimrc @@ -313,6 +313,7 @@ Plugin 'lepture/vim-jinja' Plugin 'ludovicchabant/vim-gutentags' " know when Gutentags is generating tags (prints 'TAGS' in status-line) set statusline+=%{gutentags#statusline()} +let g:gutentags_ctags_exclude = ["*.min.js", "*.min.css", "build", "vendor", ".git", "node_modules", "*.vim/bundle/*"] " All of your Plugins must be added before the following line call vundle#end() " required From d0918003f87f29e101abc3bb7f79de7ad0dacf97 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 22 Jan 2018 10:32:42 +0100 Subject: [PATCH 38/82] Better 'no fold', use highlighting for fenced code blocks, wider vimroom --- .vimrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.vimrc b/.vimrc index 9c9b81f..166e963 100644 --- a/.vimrc +++ b/.vimrc @@ -265,6 +265,9 @@ Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' " Do not fold markdown files by default let g:vim_markdown_folding_disabled = 1 +set nofoldenable +" Use filetype name as fenced code block languages for syntax highlighting +let g:vim_markdown_fenced_languages = ['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini', 'python=python'] if v:version >= 704 " Pandoc, for stuff like autocompletion of citations from bibtex, other LaTeX @@ -274,6 +277,7 @@ endif " Distraction-free writing, start with V (\V or ,V in this config) Plugin 'mikewest/vimroom' +let g:vimroom_width = 120 " undotree.vim : Display your undo history in a graph. Plugin 'mbbill/undotree' From 0ab1fae97cd9d4b9d01152e576607d1ec8410467 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 22 Jan 2018 13:22:23 +0100 Subject: [PATCH 39/82] Zenburn the prompt --- .config/fish/config.fish | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index f03e25e..ea108a6 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -9,6 +9,7 @@ set -g theme_nerd_fonts yes set -g theme_show_exit_status yes set -g theme_date_format "+%a %Y-%m-%d %H:%M:%S" set -g theme_avoid_ambiguous_glyphs yes +set -g theme_color_scheme "zenburn" # If you use virtualenv, you will probably need to disable the default virtualenv prompt, since it doesn't play nice with fish set -x VIRTUAL_ENV_DISABLE_PROMPT 1 From 080b2467457720bc446688e4421ebeac1ebe6eac Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 23 Jan 2018 08:52:22 +0100 Subject: [PATCH 40/82] Maybe a bit of contrast can't hurt after all --- .config/fish/config.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index ea108a6..202d9a4 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -9,7 +9,7 @@ set -g theme_nerd_fonts yes set -g theme_show_exit_status yes set -g theme_date_format "+%a %Y-%m-%d %H:%M:%S" set -g theme_avoid_ambiguous_glyphs yes -set -g theme_color_scheme "zenburn" +#set -g theme_color_scheme "zenburn" # If you use virtualenv, you will probably need to disable the default virtualenv prompt, since it doesn't play nice with fish set -x VIRTUAL_ENV_DISABLE_PROMPT 1 From 51c5b10a6f54fb1edd0dbc0d037b041c7cd0afcb Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 23 Jan 2018 22:10:23 +0100 Subject: [PATCH 41/82] Words --- .vim/spell/nl.utf-8.add | 2 ++ .vim/spell/nl.utf-8.add.spl | Bin 619 -> 647 bytes 2 files changed, 2 insertions(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index 8fee085..57dcd5e 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -32,3 +32,5 @@ Xylometazoline gedehydrateerd ofzo dubbelaflevering +bolognese +penne diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index 25d25bf001198936c57990bccfbe134456eaf72c..c902712a22457c2e9ece1da2bbdf9c9125d432b3 100644 GIT binary patch literal 647 zcmZuvyH3ME5WG2)8X+MHJ^<3tP~-!UKq3+yg8C9){5qd4+j)?RPfD53K;l#Q0GM4v zN36)VJF~O9<9m60>RTVe?YA-bJadcGud<@7W7GD-X1hbc2KHp)V9a^mbOV;Cuttj> zhG2sX5uOnVQ_t8FZ}|>LdG25>wzz@g6G<+x!a%^j+hWakWa&UmN(SW2c$KQK;NvOd zSP^*I@ZYgMD$cgn@0k$EktTFbaTS!%D7BLFTtsD>9B+Jgl#~%fPNq&#Vz1GNIdV!> z5{{}p)b_ejawJr+Tx6TXhc$MzL!zG4OimXWcacoAD+zUmgLKf*XK}Kmcc(tojm0EMuQ R(HL`yJ3Qm{pL;-%zaN?Bdu9Lt literal 619 zcmZuuyG{c!5cD{qM?y5zC{zfEf+8gy1s#Ig$vOA(`A+A{gH(J<%KQcV3!lITgxO8# z$SJaScXoDm{QC5qIv>LQ!5Dm=yIJNJd092FO~Y!vLBI-jJa#bVqUZJmGae+K)R^(}q;c#Bysh}}*&nr@ zBU-;@LMV?gfwT2GD4 Date: Fri, 2 Feb 2018 16:06:54 +0100 Subject: [PATCH 42/82] Words --- .vim/spell/nl.utf-8.add | 3 +++ .vim/spell/nl.utf-8.add.spl | Bin 647 -> 736 bytes 2 files changed, 3 insertions(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index 57dcd5e..1bcf0d2 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -34,3 +34,6 @@ ofzo dubbelaflevering bolognese penne +draagconsulente +verstikkingsgevaar +warmteregulerend diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index c902712a22457c2e9ece1da2bbdf9c9125d432b3..88cbe222e31512a8a6293b3b47d91ebc35d94e14 100644 GIT binary patch delta 271 zcmX|*v2MaZ5JYdza)E^0BNCvXfP#jCe@Ky*GSS638N=B|=Oa>(Qd3*kg)gE&5r06N z@DVU3h+?Ik(Z1Q)gvT(NK0TL9ZOr&AgzQyO76hrSzB+9Mg#Wbl4|GoXa_QP{tw;P1r|t|p72w` z+ziFI-lcbqfYP{o+an8(P-z+jfgn#{<+ z$e)^%o6nR{#F)>R!&m~80E#e{GUhTS0Y!kyE==CRsL9Ek%9zgtf*l zle}FPV+vy;(6C~Vy3eW1iK&@D6H*zAfH0FW3uKmSGSJjw#$?6}ph}=BuL7Vv$QFhj PlNT^aGwztYhe-thXf!KE From 8beb0b2d082564b0a5d9bae5e4fb030a01a3cfec Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 2 Feb 2018 16:09:27 +0100 Subject: [PATCH 43/82] tmux terminfo for italics --- .terminfo/t/tmux | Bin 0 -> 1455 bytes .terminfo/t/tmux-256color | Bin 0 -> 1558 bytes .terminfo/tmux-256color.terminfo | 4 ++++ .terminfo/tmux.terminfo | 4 ++++ 4 files changed, 8 insertions(+) create mode 100644 .terminfo/t/tmux create mode 100644 .terminfo/t/tmux-256color create mode 100644 .terminfo/tmux-256color.terminfo create mode 100644 .terminfo/tmux.terminfo diff --git a/.terminfo/t/tmux b/.terminfo/t/tmux new file mode 100644 index 0000000000000000000000000000000000000000..caf3e5ed1461abb9e0edb28263e9526890468f77 GIT binary patch literal 1455 zcmchWJ!lhQ7{{MCh^?Y64ubZ;7UV@sKfJqKn#O2T+X}%prhW}=P#SHTq`gb8>7`9S z1x0XiQBXwb;_Bk$Bse&Ti-UucgM)*UAQT6O^Z&e;LQ9LFh?hM7=l6WP?|b(o*Cd*$ z5uc*C6Y`u&b(y8b%axsCDQmYl727MicCMN$6AATY2N1(lPlw3g;i{)zbnK$t=r~MA zNK&in>!2P~251mbibkMUX^bXlQdLXjQiT@5x9P6R+@t&S2=tWJ=o$QTdOzaQ9|F*{O;NRES_dn1_`b3}U3w@<;v`#;9*L7l_@cjd@gQ7_^!}E1i91|yM9Avg? z6t$D0Ukr&Wplc#8T=<1;D{iUG1L#BXSUeGH;yZYKTVJsI59GT;n@>8mCE`l|w#?@K zf5*wt`Tum%<-a^<R z?N%CNHFd=bA?X3+x;WzgG@c@T20_BGwI1aQ+G*0x0@b|uECs0zz#Rmc-VGSq0Nz?P zW7hz%^$qoax^Bap5lo?*v?!03chqGb&@`u(ohy144#L@RlY@hZqBuD@3Fmw7QfO!p6uspA-tYb1$N%mn*Dg*$8-5Dn zYshmet6|-WOc$MEd4r=%+a!AA|9Dw8CH@QIgTLAlDKUSQ84v^5z zbzw+AKMcY!MkyFayb6<$gE`JFKnW_a&in@BO}GVjkv)KIc!>THJb|b1jB~#KyzXD1 ze_7|R(7-+u#d;T^n(5AX@T!FTupKOrPqgzq0lJ1UNecJy?0h?C-Uod-%I>X@@c zLR=K1$i~HWF^}Hc(@|sPHsT#|Puv&V;v@3Ud+LJeUr_G~?LMiuA)<`2N7-Hf?|3Yf zsGl_WpHCe5%lTu!>6>VhyVgYe(|u*@GYX-{Atf^bEpP;sj4a5KCTDC}(&bDU1!ERr zNXcA6H;hKUp=byWQ3YC3w;X&eu*b}Elt+FZloU%2;wV}QS`jT5K_f_Nsu`zBlOReG zgX!Yyt7KdPuAu=YfzEjy3lzM$ZWW~w*g`ZmK}ipw(K)(C(HPogv@57+7AhGn${1se z6Y45+rU>al)FKp7eHtGieGY@9<|qmFdF3o97m)I*=qx6w9fEfdDE&KRWQWjbF2<<= z!O_$FfU4@C*Dc&a43sEsl_sh(DN7OQ*_yP8YDkTM>PXFi8c3r7HIZ7 Date: Fri, 2 Feb 2018 16:12:32 +0100 Subject: [PATCH 44/82] More italics support --- .terminfo/x/xterm-256color | Bin 0 -> 2307 bytes .terminfo/xterm-256color.terminfo | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 .terminfo/x/xterm-256color create mode 100644 .terminfo/xterm-256color.terminfo diff --git a/.terminfo/x/xterm-256color b/.terminfo/x/xterm-256color new file mode 100644 index 0000000000000000000000000000000000000000..db6fcff7ab6e7c73588851cf734579ef5d28a408 GIT binary patch literal 2307 zcma)6U1(fI6h5;vG1?GB1+Bfbtk{v#zuY_b-rc>uHCt`9A#L1hgw$?}joJKcvPrg^ zZS%WL6|wqKeUTy*q(10F1r-!2QVW6=5eX=$2z@9jh(7c|6hUM?XJ)b?CJ~oC=ljl? zIp5qpbM|gvE^LI`p~x;bO;!6VqdQcX>KiYOSLSq>oGey{l9)^CIt9*df=K%!Vf;;YoP4ED0g`K!Ff=)Pybv?+Rf&uiyFa}dF zr&Z3t^Y9X!Lw+7Ez(vG2;S#(HAHc`(34D(6SMV)dhadFrdi{5c&8%K;L8DJA;+>Y) z>vyvaEXg*rEo?heEW_H_KGw+|!}V^o9(I)VvVK-VKEWp0e51~2{o9{qudvtH8|)H$ zpIu?s*aG{`R@`7ev0sqiWPj?+xOe7PvM7@3nZRzt|BYFYZM>@Ki__UE- z+DYt-#KIaY%l9phzScG0H!5!=eooxf(I4plwt2yqs#^FR{2soEOTL}^Jm!1(0p88? zypNCY2|mN0{un`LFyp{uk$>McgGEalhCml!(M0 zv0vmwk9b-Pig7V1=EYfYPP{5Eh^15i54$Md7VnA6;)=K?zFebrThmG&A9(6TBl z;a>!ar%E~;!eB4jLnaxkkTQqRy1?1uB8H>rJaSpj4I)}r6a~aG#L^8H5Yvx(7^@#9 zbMlnar6nW*Ii)L<-klAHHt+Uax2+v_;nO+!`^w1tIKT%)Ysbt%m`CrQ1}BG_IeI$f zQS><46KLI-@j}exy|nfj?IZHaMW5>+Mr0q76y<4qj()lqD^w-GCge;b%(+=_$axT# z^e>`QHR)O;RHZX}770Cv&Kz7Mbezu6Nt!&lNa&;@T0kyD*XJC=4mV@8q6HaD+UqTV zlco#p0-2TNNLKNhWIuLV#!lX)TuN4BPsT(;q{>i*G%(bYWna!=oHlWQG&D4gG$UiY zvktfo+wlk-Ki=CrFfce+EDjHkjFd{Fqhn*^1!)-L0Ypn#UuQ*5PG&~81gglKI4ZkO6Gc~zeR(*Z2 k?AIwTrE}5Z`VLu;{XX8Lc|1M)%gcjR$~|{keXy+lA9Zg Date: Fri, 2 Feb 2018 16:21:07 +0100 Subject: [PATCH 45/82] OK, italics in tmux --- .terminfo/t/tmux-256color-italic | Bin 0 -> 1596 bytes .terminfo/tmux-256color-italic.terminfo | 13 +++++++++++++ .tmux.conf | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .terminfo/t/tmux-256color-italic create mode 100644 .terminfo/tmux-256color-italic.terminfo diff --git a/.terminfo/t/tmux-256color-italic b/.terminfo/t/tmux-256color-italic new file mode 100644 index 0000000000000000000000000000000000000000..fab849a899f7385375cd9c4072b1b76a86300e0d GIT binary patch literal 1596 zcmcIkO=uHQ5S|yrs%Yy)&^{~DTpO=_)JY(r8#*(fwNZL{relBS#frD+dd zyeKH5^y1ZvCr^Tc2l3*;gC`FjL=?f3Cr^cS=4}cM4T7SZ%s1bBGjHDR>`yl{p$mUD z+X;DYZ8f5q(dn{Nu10Jx@7U8DB!*XPuNcNmSf-Z3`BEVq;Zeow%KRoU-#7o-M^vU8``_m zKubg!eV?+o{@?L0$D>13<6E&H7wwGa(xO)l+)5#wLwq5_s=$Fmr=qjb@(HBv)gWMv+R-iJq{G z1m2-6eR?fUH Date: Fri, 2 Feb 2018 16:27:07 +0100 Subject: [PATCH 46/82] Support the tmux 256-colour italic terminfo --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 166e963..b169cbb 100644 --- a/.vimrc +++ b/.vimrc @@ -370,7 +370,7 @@ set hidden set cryptmethod=blowfish2 " Ensure 256 colour support if the terminal supports it -if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" +if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic" set t_Co=256 colorscheme zenburn From b069ca2bc5d4d5b85e4468f0959edb467d789e7f Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 2 Feb 2018 16:39:05 +0100 Subject: [PATCH 47/82] vim italics, now for real --- .vimrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.vimrc b/.vimrc index b169cbb..0b19670 100644 --- a/.vimrc +++ b/.vimrc @@ -435,3 +435,7 @@ set autoindent " Django html template highlighting by default au BufNewFile,BufRead *.html set filetype=htmldjango + +" Italics +let &t_ZH = "\e[3m" +let &t_ZR = "\e[23m" From 4a61d34a937c25e3d8b6a3ee984f14bf28a00c3b Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 2 Feb 2018 16:44:06 +0100 Subject: [PATCH 48/82] Clean up unnecessary terminfo files --- .terminfo/t/tmux | Bin 1455 -> 0 bytes .terminfo/t/tmux-256color | Bin 1558 -> 0 bytes .terminfo/tmux-256color.terminfo | 4 ---- .terminfo/tmux.terminfo | 4 ---- .terminfo/x/xterm-256color | Bin 2307 -> 0 bytes .terminfo/xterm-256color.terminfo | 3 --- 6 files changed, 11 deletions(-) delete mode 100644 .terminfo/t/tmux delete mode 100644 .terminfo/t/tmux-256color delete mode 100644 .terminfo/tmux-256color.terminfo delete mode 100644 .terminfo/tmux.terminfo delete mode 100644 .terminfo/x/xterm-256color delete mode 100644 .terminfo/xterm-256color.terminfo diff --git a/.terminfo/t/tmux b/.terminfo/t/tmux deleted file mode 100644 index caf3e5ed1461abb9e0edb28263e9526890468f77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1455 zcmchWJ!lhQ7{{MCh^?Y64ubZ;7UV@sKfJqKn#O2T+X}%prhW}=P#SHTq`gb8>7`9S z1x0XiQBXwb;_Bk$Bse&Ti-UucgM)*UAQT6O^Z&e;LQ9LFh?hM7=l6WP?|b(o*Cd*$ z5uc*C6Y`u&b(y8b%axsCDQmYl727MicCMN$6AATY2N1(lPlw3g;i{)zbnK$t=r~MA zNK&in>!2P~251mbibkMUX^bXlQdLXjQiT@5x9P6R+@t&S2=tWJ=o$QTdOzaQ9|F*{O;NRES_dn1_`b3}U3w@<;v`#;9*L7l_@cjd@gQ7_^!}E1i91|yM9Avg? z6t$D0Ukr&Wplc#8T=<1;D{iUG1L#BXSUeGH;yZYKTVJsI59GT;n@>8mCE`l|w#?@K zf5*wt`Tum%<-a^<R z?N%CNHFd=bA?X3+x;WzgG@c@T20_BGwI1aQ+G*0x0@b|uECs0zz#Rmc-VGSq0Nz?P zW7hz%^$qoax^Bap5lo?*v?!03chqGb&@`u(ohy144#L@RlY@hZqBuD@3Fmw7QfO!p6uspA-tYb1$N%mn*Dg*$8-5Dn zYshmet6|-WOc$MEd4r=%+a!AA|9Dw8CH@QIgTLAlDKUSQ84v^5z zbzw+AKMcY!MkyFayb6<$gE`JFKnW_a&in@BO}GVjkv)KIc!>THJb|b1jB~#KyzXD1 ze_7|R(7-+u#d;T^n(5AX@T!FTupKOrPqgzq0lJ1UNecJy?0h?C-Uod-%I>X@@c zLR=K1$i~HWF^}Hc(@|sPHsT#|Puv&V;v@3Ud+LJeUr_G~?LMiuA)<`2N7-Hf?|3Yf zsGl_WpHCe5%lTu!>6>VhyVgYe(|u*@GYX-{Atf^bEpP;sj4a5KCTDC}(&bDU1!ERr zNXcA6H;hKUp=byWQ3YC3w;X&eu*b}Elt+FZloU%2;wV}QS`jT5K_f_Nsu`zBlOReG zgX!Yyt7KdPuAu=YfzEjy3lzM$ZWW~w*g`ZmK}ipw(K)(C(HPogv@57+7AhGn${1se z6Y45+rU>al)FKp7eHtGieGY@9<|qmFdF3o97m)I*=qx6w9fEfdDE&KRWQWjbF2<<= z!O_$FfU4@C*Dc&a43sEsl_sh(DN7OQ*_yP8YDkTM>PXFi8c3r7HIZ7uHCt`9A#L1hgw$?}joJKcvPrg^ zZS%WL6|wqKeUTy*q(10F1r-!2QVW6=5eX=$2z@9jh(7c|6hUM?XJ)b?CJ~oC=ljl? zIp5qpbM|gvE^LI`p~x;bO;!6VqdQcX>KiYOSLSq>oGey{l9)^CIt9*df=K%!Vf;;YoP4ED0g`K!Ff=)Pybv?+Rf&uiyFa}dF zr&Z3t^Y9X!Lw+7Ez(vG2;S#(HAHc`(34D(6SMV)dhadFrdi{5c&8%K;L8DJA;+>Y) z>vyvaEXg*rEo?heEW_H_KGw+|!}V^o9(I)VvVK-VKEWp0e51~2{o9{qudvtH8|)H$ zpIu?s*aG{`R@`7ev0sqiWPj?+xOe7PvM7@3nZRzt|BYFYZM>@Ki__UE- z+DYt-#KIaY%l9phzScG0H!5!=eooxf(I4plwt2yqs#^FR{2soEOTL}^Jm!1(0p88? zypNCY2|mN0{un`LFyp{uk$>McgGEalhCml!(M0 zv0vmwk9b-Pig7V1=EYfYPP{5Eh^15i54$Md7VnA6;)=K?zFebrThmG&A9(6TBl z;a>!ar%E~;!eB4jLnaxkkTQqRy1?1uB8H>rJaSpj4I)}r6a~aG#L^8H5Yvx(7^@#9 zbMlnar6nW*Ii)L<-klAHHt+Uax2+v_;nO+!`^w1tIKT%)Ysbt%m`CrQ1}BG_IeI$f zQS><46KLI-@j}exy|nfj?IZHaMW5>+Mr0q76y<4qj()lqD^w-GCge;b%(+=_$axT# z^e>`QHR)O;RHZX}770Cv&Kz7Mbezu6Nt!&lNa&;@T0kyD*XJC=4mV@8q6HaD+UqTV zlco#p0-2TNNLKNhWIuLV#!lX)TuN4BPsT(;q{>i*G%(bYWna!=oHlWQG&D4gG$UiY zvktfo+wlk-Ki=CrFfce+EDjHkjFd{Fqhn*^1!)-L0Ypn#UuQ*5PG&~81gglKI4ZkO6Gc~zeR(*Z2 k?AIwTrE}5Z`VLu;{XX8Lc|1M)%gcjR$~|{keXy+lA9Zg Date: Sat, 3 Feb 2018 12:24:35 +0100 Subject: [PATCH 49/82] Words --- .vim/spell/nl.utf-8.add | 1 + .vim/spell/nl.utf-8.add.spl | Bin 736 -> 745 bytes 2 files changed, 1 insertion(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index 1bcf0d2..fbc5d17 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -37,3 +37,4 @@ penne draagconsulente verstikkingsgevaar warmteregulerend +draagpop diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index 88cbe222e31512a8a6293b3b47d91ebc35d94e14..209192eee38195effd809f266a1ca604ae9064b1 100644 GIT binary patch delta 186 zcmaFB`jV9|%+t5HAT=k)=syDklj=mi$?{Ce1&sNOd5p!3rHna@sX!JZ1A|!!Pz*?G z6inQH-soHvTs)68nUR4}H#H|WpDCjVs3?cA1gH=w0@R+%m;}-GZt@OBO-{vB#(XBA zA?GH)V$5I^oE*%gr2QceXjBmpW-?}h^d%<)O(ApstjUZFj2fvqx%o^PML-QXj3q#YKoOv}T*f4z2vFP0$p;xVIb~8A^O=CWlaoI) pW-#(hj$u*~e4Ph0st5=(8M8q8;wJYqNitrXypl;8NFHTU0RV*yC`teT From cf442b9532b24f4aaf6ed33e6231568182ee9699 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 5 Feb 2018 09:12:12 +0100 Subject: [PATCH 50/82] Replaced the aging vimroom with goyo --- .vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vimrc b/.vimrc index 0b19670..d5b701d 100644 --- a/.vimrc +++ b/.vimrc @@ -276,8 +276,8 @@ if v:version >= 704 endif " Distraction-free writing, start with V (\V or ,V in this config) -Plugin 'mikewest/vimroom' -let g:vimroom_width = 120 +Plugin 'junegunn/goyo.vim' +let g:goyo_width = 120 " undotree.vim : Display your undo history in a graph. Plugin 'mbbill/undotree' From f25ed0bdd00b53a8eaa1f21391d9af06bfa5d368 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 5 Feb 2018 10:27:37 +0100 Subject: [PATCH 51/82] More distraction free writing, and better mode for prose --- .vimrc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.vimrc b/.vimrc index d5b701d..6fb483e 100644 --- a/.vimrc +++ b/.vimrc @@ -275,10 +275,25 @@ if v:version >= 704 Plugin 'vim-pandoc/vim-pandoc' endif + " Distraction-free writing, start with V (\V or ,V in this config) Plugin 'junegunn/goyo.vim' let g:goyo_width = 120 +" Help focus on text by dimming other parts a bit +Plugin 'junegunn/limelight.vim' +let g:limelight_conceal_ctermfg = 'Grey69' +let g:limelight_conceal_ctermfg = 145 + +" Helps with writing prose (better line breaks, agnostic on soft line wraps vs +" hard line breaks etc) +Plugin 'reedes/vim-pencil' + +" Toggle Gogo with Limelight and Pencil together with Ctrl+F11 +"map :Goyo :Limelight!! :TogglePencil +nmap V :Goyo :Limelight!! :TogglePencil + + " undotree.vim : Display your undo history in a graph. Plugin 'mbbill/undotree' nnoremap u :UndotreeToggle From ccc5f4f7491b682fea0a511fb17044b9d914fcbc Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 5 Feb 2018 10:27:59 +0100 Subject: [PATCH 52/82] Be silent when automatically changing project root dir --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 6fb483e..a191c8b 100644 --- a/.vimrc +++ b/.vimrc @@ -75,6 +75,8 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTree " Rooter changes the working directory to the project root when you open a " file or directory. Useful when using fzf for example. Plugin 'airblade/vim-rooter' +" Do not echo the project directory +let g:rooter_silent_chdir = 1 " Full path fuzzy file, buffer, mru, tag, ... finder From c4c9a422b759257a0fac540a609bc0895314fcb9 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 9 Feb 2018 10:46:45 +0100 Subject: [PATCH 53/82] Quickly find and edit files --- bin/fuz | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 bin/fuz diff --git a/bin/fuz b/bin/fuz new file mode 100755 index 0000000..00626fa --- /dev/null +++ b/bin/fuz @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# Taken from https://medium.com/adorableio/simple-note-taking-with-fzf-and-vim-2a647a39cfa + +set -e + +main() { + previous_file="$1" + file_to_edit=`select_file $previous_file` + + if [ -n "$file_to_edit" ] ; then + "$EDITOR" "$file_to_edit" + main "$file_to_edit" + fi +} + +select_file() { + given_file="$1" + fzf --preview="cat {}" --preview-window=right:70%:wrap --query="$given_file" +} + +main "" From b66fc50d3250735571c6ccf0a2f9448d1f3ef0ef Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 9 Feb 2018 10:47:14 +0100 Subject: [PATCH 54/82] Provide 'vim' as fallback --- bin/fuz | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/fuz b/bin/fuz index 00626fa..88f5933 100755 --- a/bin/fuz +++ b/bin/fuz @@ -8,7 +8,7 @@ main() { file_to_edit=`select_file $previous_file` if [ -n "$file_to_edit" ] ; then - "$EDITOR" "$file_to_edit" + "${EDITOR:-vim}" "$file_to_edit" main "$file_to_edit" fi } From d2d88dfc83ac947b91eb33c5371754a93b76efb6 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 9 Feb 2018 11:54:11 +0100 Subject: [PATCH 55/82] Match on first item of todoItem, see if there's a 'project name' --- .vim/syntax/todo.vim | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim index 938f1d2..2ff1630 100644 --- a/.vim/syntax/todo.vim +++ b/.vim/syntax/todo.vim @@ -58,24 +58,24 @@ syntax match note "\v n .*$" syntax match note "\v .*$" highlight note ctermfg=Grey guifg=#eeeeee -syntax match todoStatusDone "\v^v " -syntax match todoStatusDone "\v v " +syntax match todoStatusDone "\v^v " nextgroup=todoItem skipwhite +syntax match todoStatusDone "\v v " nextgroup=todoItem skipwhite highlight todoStatusDone ctermfg=green guifg=#00ff00 -syntax match todoStatusCancelled "\v^x " -syntax match todoStatusCancelled "\v x " +syntax match todoStatusCancelled "\v^x " nextgroup=todoItem skipwhite +syntax match todoStatusCancelled "\v x " nextgroup=todoItem skipwhite highlight todoStatusCancelled ctermfg=DarkGreen -syntax match todoStatusDoing "\v^d .*$" -syntax match todoStatusDoing "\v d .*$" +syntax match todoStatusDoing "\v^d .*$" nextgroup=todoItem skipwhite +syntax match todoStatusDoing "\v d .*$" nextgroup=todoItem skipwhite highlight todoStatusDoing ctermfg=223 guifg=#f0dfaf -syntax match todoStatusTest "\v^t " -syntax match todoStatusTest "\v t " +syntax match todoStatusTest "\v^t " nextgroup=todoItem skipwhite +syntax match todoStatusTest "\v t " nextgroup=todoItem skipwhite highlight todoStatusTest ctermfg=darkcyan guifg=#6666ff -syntax match todoStatusTodo "\v^- " -syntax match todoStatusTodo "\v - " +syntax match todoStatusTodo "\v^- " nextgroup=todoItem skipwhite +syntax match todoStatusTodo "\v - " nextgroup=todoItem skipwhite highlight todoStatusTodo ctermfg=red guifg=#ff0000 syntax match todoStatusImportant "\v^\> .*$" @@ -85,16 +85,21 @@ syntax match todoStatusImportant "\v ! .*$" "highlight todoStatusImportant ctermfg=131 guifg=#af5f5f highlight todoStatusImportant ctermfg=167 guifg=#d75f5f -syntax match todoStatusQuestion "\v^\? " -syntax match todoStatusQuestion "\v \? " +syntax match todoStatusQuestion "\v^\? " nextgroup=todoItem skipwhite +syntax match todoStatusQuestion "\v \? " nextgroup=todoItem skipwhite highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff " Highlight matching brackets (for example a timeslot) "syntax match brack /[\[\]]/ | hi brack ctermfg=DarkMagenta -syntax match timeslot "\v\[.*-.*\] " +syntax match timeslot "\v\[.*-.*\] " nextgroup=todoItem skipwhite highlight timeslot ctermfg=Magenta +"syn keyword todoType note todoStatusDone todoStatusCancelled todoStatusDoing todoStatusTest todoStatusImportant nextgroup=todoItem skipwhite +"syn match VarName '\i\+' contained +syn match todoItem '\i\+:' contained +hi todoItem ctermfg=Blue + highlight link todoStatusDone PreProc highlight link todoStatusDoing PreProc highlight link todoStatusTodo PreProc From 36518cf27fed04d58bafeca2ea9a386339ac9a55 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 9 Feb 2018 11:54:43 +0100 Subject: [PATCH 56/82] Cleanup --- .vim/syntax/todo.vim | 2 -- 1 file changed, 2 deletions(-) diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim index 2ff1630..2c0022b 100644 --- a/.vim/syntax/todo.vim +++ b/.vim/syntax/todo.vim @@ -95,8 +95,6 @@ highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff syntax match timeslot "\v\[.*-.*\] " nextgroup=todoItem skipwhite highlight timeslot ctermfg=Magenta -"syn keyword todoType note todoStatusDone todoStatusCancelled todoStatusDoing todoStatusTest todoStatusImportant nextgroup=todoItem skipwhite -"syn match VarName '\i\+' contained syn match todoItem '\i\+:' contained hi todoItem ctermfg=Blue From c581a85ad92d61e8f75a11fb76d4c0a7d5624d06 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 9 Feb 2018 12:03:01 +0100 Subject: [PATCH 57/82] Clarifying comment --- .vim/syntax/todo.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/.vim/syntax/todo.vim b/.vim/syntax/todo.vim index 2c0022b..d911365 100644 --- a/.vim/syntax/todo.vim +++ b/.vim/syntax/todo.vim @@ -95,6 +95,7 @@ highlight todoStatusQuestion ctermfg=darkcyan guifg=#6666ff syntax match timeslot "\v\[.*-.*\] " nextgroup=todoItem skipwhite highlight timeslot ctermfg=Magenta +" A todoItem has a subject (e.g., a word that's followed by a ':') syn match todoItem '\i\+:' contained hi todoItem ctermfg=Blue From c974a4e6dc8b3fd5984f3f9becd89b590dd49a32 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 12 Feb 2018 11:27:20 +0100 Subject: [PATCH 58/82] Word --- .vim/spell/nl.utf-8.add | 1 + .vim/spell/nl.utf-8.add.spl | Bin 745 -> 772 bytes 2 files changed, 1 insertion(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index fbc5d17..bbaed46 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -38,3 +38,4 @@ draagconsulente verstikkingsgevaar warmteregulerend draagpop +chocoladehagel diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index 209192eee38195effd809f266a1ca604ae9064b1..62181bb15585462633a58867a937eaf0a1b9faf8 100644 GIT binary patch literal 772 zcmZuvJ#X7E5Y?lTp~w~>D9}G(7-*L+Su$lw3L{(5&azBPv?xlTIBmKF&MOWP73czUdPk1z%Yd_&1EknFI*M8Nz-LspfTW#TrZ)P$tuXD;q| z4^*D$m*T_-`-Znkur`$dk#g`Xn-7#m^EcnN|3n|Hv8=Z^6=yJ=3AGGEH=b z&V3T-6SdWSsmyv&gA>n4Nj*byO0~uo=VWC}FWM$0agy3oXXd%CK*%v%vi;2Z9geJD z)<|lt+vhsJVHwOuW~$+$4Ec%Sx?=yIt?zo%L~?!7qlZczU#(2|RPt1rk>$8t(6Xg3 zH-o49vetUlDJ8kX5Pm-wHS-Q^krZ83G+O8kQ-CnGWqAsSXB*|sj`av?OWh zDkDJB7Luf+&~iYG1v^<|X&@A92- z>>iRdN;#IwrIJIqMJxrU3QFVzwWmhiM_&$*K{{pIiMCtW!#{65s0B|~Mf`@9QyX4` zha)S*Pju4^9bRbLw5s&r+MtIBlp1_>sPvU$r%ew#CK_7Rh{a|?cxi$;xxsK0?#JAR z1dH&wO-5-Cg Date: Tue, 13 Feb 2018 19:25:11 +0100 Subject: [PATCH 59/82] ssh alias to ensure compatibility with foreign hosts --- .config/fish/config.fish | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 202d9a4..40914ac 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -64,6 +64,9 @@ alias gl "git log" alias gt 'git tag|less' #alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c' +## SSH, for compatibility, as our terminfo now is non-standard 'tmux-256color-italic' in tmux +alias ssh 'TERM=xterm ssh' + ## Grepping alias findfile 'find . | grep -v .svn | grep -v .hg | grep -v .git | grep' alias findphp 'find . -name "*.php" | xargs grep --color=auto' From 74776479663dd0c45e122efa78a30800d38272f6 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 16 Feb 2018 09:34:15 +0100 Subject: [PATCH 60/82] Fix for env var --- .config/fish/config.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 40914ac..53359e6 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -65,7 +65,7 @@ alias gt 'git tag|less' #alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c' ## SSH, for compatibility, as our terminfo now is non-standard 'tmux-256color-italic' in tmux -alias ssh 'TERM=xterm ssh' +alias ssh 'env TERM=xterm ssh' ## Grepping alias findfile 'find . | grep -v .svn | grep -v .hg | grep -v .git | grep' From 6c61c2261a6090d952df2dfeadeef5e74a5742bf Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 19 Feb 2018 10:51:50 +0100 Subject: [PATCH 61/82] Ignore tags files --- .vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index a191c8b..72f6552 100644 --- a/.vimrc +++ b/.vimrc @@ -67,7 +67,7 @@ Plugin 'jnurmine/Zenburn.git' " Quick file system tree, mapped to Ctrl+n for quick toggle Plugin 'scrooloose/nerdtree' map :NERDTreeToggle -let NERDTreeIgnore = ['\.pyc$'] +let NERDTreeIgnore = ['\.pyc$', 'tags'] " close vim if the only window left open is a NERDTree autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif From ab84c723a422fc2de068dc92f20d75948bc6818d Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Mon, 19 Feb 2018 10:52:30 +0100 Subject: [PATCH 62/82] 256 color xterm --- .config/fish/config.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 53359e6..d9d0700 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -65,7 +65,7 @@ alias gt 'git tag|less' #alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c' ## SSH, for compatibility, as our terminfo now is non-standard 'tmux-256color-italic' in tmux -alias ssh 'env TERM=xterm ssh' +alias ssh 'env TERM=xterm-256color ssh' ## Grepping alias findfile 'find . | grep -v .svn | grep -v .hg | grep -v .git | grep' From 4b7a721fd4c321478da71fa1643b877988335c2b Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 21 Feb 2018 16:32:43 +0100 Subject: [PATCH 63/82] Words --- .vim/spell/nl.utf-8.add | 3 +++ .vim/spell/nl.utf-8.add.spl | Bin 772 -> 819 bytes 2 files changed, 3 insertions(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index bbaed46..04fec4d 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -39,3 +39,6 @@ verstikkingsgevaar warmteregulerend draagpop chocoladehagel +standup +crappy +cogitorama diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index 62181bb15585462633a58867a937eaf0a1b9faf8..877a583cbff0d3f27b62f9f913358e3389067d52 100644 GIT binary patch delta 238 zcmW-aJqp4=6ohv+l18vl>@38e!b*^UH&8@uZ6(HFBFSz@6j8y-3&>V_3-KPF!JFu8 zc+I>SzL}f*c5BPoqR7G|8U2Kit9wmVoJi;QYpabdV(g)j!$%4TG4QD}p4F$x#Kunv<{?`4#eOvslO4s2M{;ny`^44TW3T?!jZeh$!*iDT;0!^KSH5EFBh sooQdOJ?F*PS@sdIvp|4|G|73!yxgc3I5E@Qv5t>(xgT4qYQD1f2gFG-8UO$Q delta 190 zcmdnY*22aY=IL8pkeZWY^q+x&$z~#79us56#0Hs-dxRN{8D3T~rZVO+GBPlj=dmU; zGBA3i=H%uxWfU>yGv+Xs040DTjHQgZj7dNdAdho0Gm|E#O)6tP6HwF3$&O4WjFpqi znDiNSCNE=Ba_7zi8dwB`nT%N=^>xWWbBY<088a9YLDqN|0OdjEGJGs%tOUyC1I-4B RBr;Zk?aTzrP3C7-0RY+PDrW!y From a49dc3acb4e08fdf42c84385987c5933387b0aed Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 21 Feb 2018 21:38:32 +0100 Subject: [PATCH 64/82] More words --- .vim/spell/nl.utf-8.add | 8 ++++++++ .vim/spell/nl.utf-8.add.spl | Bin 819 -> 915 bytes 2 files changed, 8 insertions(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index 04fec4d..305ae21 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -42,3 +42,11 @@ chocoladehagel standup crappy cogitorama +weekplanning +Trello +footer +slavink +meh +review +kudos +zevenen diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index 877a583cbff0d3f27b62f9f913358e3389067d52..e687800c9e051e78fa06ed48e711387fc3898df1 100644 GIT binary patch literal 915 zcmZuwORm%~5KKGpwyY3{3m`oWLcs1V*@48Y5QwEG@g$x&cI15Ky;&e`!X?;q29Cig zpsLN=G0`aFuIlRQZqKK8ALhx0@cK_xneUJ7p=sT*^QU2qY0C4moo_D^WE1n?p_Qt7 z+NZooBZI6m$t)GXB%MTYIDxQpI6L4I-a%UY&SH$5<%L*05o9k%Spb-CHRQl+lxvmU zgVX_}R#5T+G$T4{j3N^r;&-*rE4UH07mX*pdqhh9fEd(FLo+0;utYkNZzxNVNe*}% z5DQ<#H+(Z(DsPA8jJqH}AOZJN|msl@9mO9C@TcxnjvO z0Pbwlo`CMoR}J8^3u9VL&#eTNM+m|rM#S>+(i)pI4M{(uc9h}K7w`K4w6X-?H(vXY z!J+q9I{CGllntGeo2G|7SG6pr9$eG=9I_!{3h4$A2vIacNWt^90Q%s&% z_0wuqUQ7AnYU{kg-5vi~c1S4KfolTg73aa4r4{+v7#E;Fp*r28=5OAi2K!V8`w0o$ nfIOP9Vg3Lyr>Wa=yeD$BCTe-UkhTgFnSzf|)h1 z#aT{azBy|L(6^*!hfbq zs42J*e7?=Q65mMLTNEQYZ*BBI8LkUb<@!V8KTt4wp9vm z8t(F$=_eFN`+>1?n^e9I<_ Date: Tue, 27 Feb 2018 15:33:24 +0100 Subject: [PATCH 65/82] Firefox Nightly with touchscreen support --- .config/fish/config.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index d9d0700..94b7c62 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -64,6 +64,8 @@ alias gl "git log" alias gt 'git tag|less' #alias gad 'git log --pretty='"'"'%at'"'"' | while read d; do date -d "@$d"; done | awk '"'"'{print $1}'"'"' | sort | uniq -c' +alias ffnightly 'env MOZ_USE_XINPUT2=1 /usr/local/bin/firefoxnightly/firefox' + ## SSH, for compatibility, as our terminfo now is non-standard 'tmux-256color-italic' in tmux alias ssh 'env TERM=xterm-256color ssh' From 482fa8d8b76ce2a7e2828fbd0ba2fa103571ae22 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 2 Mar 2018 22:07:23 +0100 Subject: [PATCH 66/82] Disable automatic formatting in Pencil mode --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 72f6552..32c58b1 100644 --- a/.vimrc +++ b/.vimrc @@ -290,6 +290,9 @@ let g:limelight_conceal_ctermfg = 145 " Helps with writing prose (better line breaks, agnostic on soft line wraps vs " hard line breaks etc) Plugin 'reedes/vim-pencil' +" Disable automatic formatting, as this automatically merges lines devided by +" 1 hard enter only, which can be annoying +let g:pencil#autoformat = 0 " Toggle Gogo with Limelight and Pencil together with Ctrl+F11 "map :Goyo :Limelight!! :TogglePencil From 1e204fb3b23de25f5acc639d7dd8570892b80260 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 7 Mar 2018 19:58:54 +0100 Subject: [PATCH 67/82] Clean project from orphan swap/bytecode files --- bin/clean_project | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 bin/clean_project diff --git a/bin/clean_project b/bin/clean_project new file mode 100755 index 0000000..0b29553 --- /dev/null +++ b/bin/clean_project @@ -0,0 +1,12 @@ +#!/bin/bash +read -p "Close vim and stop running (Python) processes. Type 'c' to continue after doing so, any other key to abort. " -n 1 -r +echo # (optional) move to a new line +if [[ $REPLY =~ ^[Cc]$ ]] +then + # do semi-dangerous stuff + find . -name "*.pyc" -type f -delete + find . -name "*.swp" -type f -delete + find . -name "*.swo" -type f -delete +else + echo "aborted" +fi From a65226e568eb6780f89ad0489fa224ab66f9f3d8 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Thu, 8 Mar 2018 22:42:56 +0100 Subject: [PATCH 68/82] Let's try ripgrep instead of silver searcher for FZF --- .config/fish/config.fish | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 94b7c62..b8b303e 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -40,7 +40,8 @@ end set -x QT_AUTO_SCREEN_SCALE_FACTOR 1 # SilverSearcher 'ag' ('ack' and 'grep' replacement) -set -gx FZF_DEFAULT_COMMAND 'ag -g ""' +#set -gx FZF_DEFAULT_COMMAND 'ag -g ""' +set -gx FZF_DEFAULT_COMMAND 'rg --files --no-ignore --hidden --follow --glob "!.git/*"' set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND" set -gx FZF_ALT_C_COMMAND "$FZF_DEFAULT_COMMAND" From eebcf90f0360e33aa18294b201e8b6889c6a1727 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 9 Mar 2018 09:56:26 +0100 Subject: [PATCH 69/82] Words --- .vim/spell/nl.utf-8.add | 6 ++++++ .vim/spell/nl.utf-8.add.spl | Bin 915 -> 1013 bytes 2 files changed, 6 insertions(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index 305ae21..c6837a0 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -50,3 +50,9 @@ meh review kudos zevenen +planningsessie +aangeprutst +bapao +bapao's +thuiskantoor +grilham diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index e687800c9e051e78fa06ed48e711387fc3898df1..57c12b189c55bec1a0621596b6a64f94c8b01501 100644 GIT binary patch literal 1013 zcmZuwL5|Zv5Oj|he!ztrr{=tZV2s-zZ+dchqw3B=t5ZkD+=@Hh22)Q+ckdQ^+O!fG#`!+XJdm5(uk8$ zk}NXIgtw4`n5$=2isH77X*Sg;9kQb!vYNz7GzFG-*AgV6d;r0uNr$}yc*K8@8tWv+ z$Wd-lWwn==9eOx1pG%MfS1Hyix&?@G*eGD-0gd3W(rb()C*!2prRR%K(~nG z`VLsIQGHa<0!f5}d_!6`8D)#dA!DJ7`2*gB#)@0PoN;Fas3pS)r~9A;(Ri|V+<4lj zH!>&V(vznX{^@}!k~3X{FF>u;T`zk%Yc3->jXg7Wtk6!b#}U*Ti{-V;^0UYmSWb!( zV(G#n55RIap|;`bb(0PI!R)xDUU_vkju!xd%>X3>9vW{jQJ$!t>4v@!>K?e&@p*;H zA1?H9HZ9LDXlI1bv&S&0Ox{^zqn4rQ*Pzxp4xerL4lvFN(4Vauly6QYsKwulUXBI$ z3A3fNd}6YWhRW-tlmVreqsr%l>yO lpd!c_vA74Esb|d%X?Y=~FkgnEC|=4Nc`qOT^En}j-y>@0!)5>g literal 915 zcmZuwORm%~5KKGpwyY3{3m`oWLcs1V*@48Y5QwEG@g$x&cI15Ky;&e`!X?;q29Cig zpsLN=G0`aFuIlRQZqKK8ALhx0@cK_xneUJ7p=sT*^QU2qY0C4moo_D^WE1n?p_Qt7 z+NZooBZI6m$t)GXB%MTYIDxQpI6L4I-a%UY&SH$5<%L*05o9k%Spb-CHRQl+lxvmU zgVX_}R#5T+G$T4{j3N^r;&-*rE4UH07mX*pdqhh9fEd(FLo+0;utYkNZzxNVNe*}% z5DQ<#H+(Z(DsPA8jJqH}AOZJN|msl@9mO9C@TcxnjvO z0Pbwlo`CMoR}J8^3u9VL&#eTNM+m|rM#S>+(i)pI4M{(uc9h}K7w`K4w6X-?H(vXY z!J+q9I{CGllntGeo2G|7SG6pr9$eG=9I_!{3h4$A2vIacNWt^90Q%s&% z_0wuqUQ7AnYU{kg-5vi~c1S4KfolTg73aa4r4{+v7#E;Fp*r28=5OAi2K!V8`w0o$ nfIOP9Vg3 Date: Tue, 13 Mar 2018 19:28:24 +0100 Subject: [PATCH 70/82] List interesting stats about a webserver log --- bin/logfileinfo | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 bin/logfileinfo diff --git a/bin/logfileinfo b/bin/logfileinfo new file mode 100755 index 0000000..a54c308 --- /dev/null +++ b/bin/logfileinfo @@ -0,0 +1,32 @@ +from urllib.parse import urlparse + +domains = {} +privacy_domains = {} + +#with open('consent_20180227_1055.log', encoding='latin1') as pf: +with open('20180313_1532.log') as pf: + logdata = pf.readlines() + + for line in logdata: + url = line.split(' ')[10] + url = url[1:-1] # Strip quotes + domain = urlparse(url).netloc + if domain not in domains: + domains[domain] = 0 + domains[domain] += 1 + + url = line.split(' ')[6] + #print(url) + domain = urlparse(url).netloc + if domain not in privacy_domains: + privacy_domains[domain] = 0 + privacy_domains[domain] += 1 + +print('== Referrers ======') +for key in sorted(domains, key=domains.__getitem__, reverse=True): + print('{:6} {}'.format(domains[key], key)) + +print() +print('== Domains ======') +for key in sorted(privacy_domains, key=privacy_domains.__getitem__, reverse=True): + print('{:6} {}'.format(privacy_domains[key], key)) From 521af766e5faf10b8e7fc2936c6a3c0f039b0009 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 13 Mar 2018 19:39:49 +0100 Subject: [PATCH 71/82] Run it with Python, because Python --- bin/logfileinfo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/logfileinfo b/bin/logfileinfo index a54c308..d39b2af 100755 --- a/bin/logfileinfo +++ b/bin/logfileinfo @@ -1,10 +1,11 @@ +#!/usr/bin/env python3 from urllib.parse import urlparse domains = {} privacy_domains = {} #with open('consent_20180227_1055.log', encoding='latin1') as pf: -with open('20180313_1532.log') as pf: +with open('logfile.log') as pf: logdata = pf.readlines() for line in logdata: From eec696e224581afee9b9516b92e299bc05552dd8 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Fri, 16 Mar 2018 14:50:37 +0100 Subject: [PATCH 72/82] Ignore python compiled binaries --- .config/fish/config.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index b8b303e..7f7db56 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -41,7 +41,7 @@ set -x QT_AUTO_SCREEN_SCALE_FACTOR 1 # SilverSearcher 'ag' ('ack' and 'grep' replacement) #set -gx FZF_DEFAULT_COMMAND 'ag -g ""' -set -gx FZF_DEFAULT_COMMAND 'rg --files --no-ignore --hidden --follow --glob "!.git/*"' +set -gx FZF_DEFAULT_COMMAND 'rg --files --no-ignore --hidden --follow --glob "!.git/*" --glob "!*.pyc"' set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND" set -gx FZF_ALT_C_COMMAND "$FZF_DEFAULT_COMMAND" From b1de9773d55d0620a9ec7922ea14a3011713f698 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 20 Mar 2018 22:00:24 +0100 Subject: [PATCH 73/82] Some documentation about what's in here --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f3665e2..13d5882 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ dotfiles ======== -After having my homedirs in subversion for years, move to Git. +After having my homedirs in subversion for years, moved this collection to Git in 2014 and standardised over all my machines. + +To install: ``` mkdir ~/.dot @@ -38,3 +40,14 @@ workspace= group= ssh://myserver/srv/git/mydocs.git ``` + +# Interesting scripts + +| ./bin/ | description | +|:--------:|:---------------:| +| calibre_update | Update (or install) ebook manager Calibre | +| clean_mac_files | Remove those DS_Store and other dirs | +| clean_project | Remove compiled Python files, vim swp files | +| clean_pyc | Remove compiled Python files| +| fixpermissions | chmod dirs to 755, files to 644 | +| fixpictimestamps | Change file ctime to datetime from EXIF | From 86e4d1777418d8e17fe5893196a0a40da21993a7 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 20 Mar 2018 22:05:23 +0100 Subject: [PATCH 74/82] Alignment, another script --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 13d5882..0803a57 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,11 @@ ssh://myserver/srv/git/mydocs.git # Interesting scripts | ./bin/ | description | -|:--------:|:---------------:| +|----------|-----------------| | calibre_update | Update (or install) ebook manager Calibre | | clean_mac_files | Remove those DS_Store and other dirs | | clean_project | Remove compiled Python files, vim swp files | | clean_pyc | Remove compiled Python files| | fixpermissions | chmod dirs to 755, files to 644 | | fixpictimestamps | Change file ctime to datetime from EXIF | +| fontupdate | Update nerd-fonts; whole repo on server, link font files to ~/.local/share/fonts | From e13cf55416e6c474fc0fe32e51f35f626fb64a4f Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 20 Mar 2018 22:11:07 +0100 Subject: [PATCH 75/82] More descriptions, more table padding --- README.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0803a57..4ccaf47 100644 --- a/README.md +++ b/README.md @@ -43,12 +43,16 @@ ssh://myserver/srv/git/mydocs.git # Interesting scripts -| ./bin/ | description | -|----------|-----------------| -| calibre_update | Update (or install) ebook manager Calibre | -| clean_mac_files | Remove those DS_Store and other dirs | -| clean_project | Remove compiled Python files, vim swp files | -| clean_pyc | Remove compiled Python files| -| fixpermissions | chmod dirs to 755, files to 644 | -| fixpictimestamps | Change file ctime to datetime from EXIF | -| fontupdate | Update nerd-fonts; whole repo on server, link font files to ~/.local/share/fonts | +| ./bin/ | description | +|------------------|-----------------------------------------------------------------------------------------| +| calibre_update | Update (or install) ebook manager Calibre | +| clean_mac_files | Remove those DS_Store and other dirs | +| clean_project | Remove compiled Python files, vim swp files | +| clean_pyc | Remove compiled Python files | +| fixpermissions | chmod dirs to 755, files to 644 | +| fixpictimestamps | Change file ctime to datetime from EXIF | +| fontupdate | Update nerd-fonts; whole repo on server, link font files to ~/.local/share/fonts | +| fuz | Simple note-taking 'app' based on FZF and vim | +| git_autosave | Simple script to call from crontab or something to commit certain files in Git and push | +| git_clean | Clean the Git tree | +| sorter | Sort files in newly created subdirectories, based on pre- or postfixes | From 42ddde9211813f81652bf458ca368f35b4fb074a Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 20 Mar 2018 22:14:46 +0100 Subject: [PATCH 76/82] updates_repos is kinda neat --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4ccaf47..486461f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ mkdir ~/.dot cd ~/.dot clone cd dotfiles # this takes you to the freshly cloned ~/.dot/dotfiles -sh install.sh # install the files in the homedir +sh install.sh # follow the instructions and install the files in the homedir ``` # Fix for shift+F6 in tmux (and screen probably) @@ -19,7 +19,7 @@ In tmux, do `infocmp > screen-256color`. Add the line `kf16=\E[17;2~,` and compi # ~/.git_repos config file -The update_repos script takes the ~/.git_repos config file and lets you update and clone your projects automatically (or at least in a batch). In the example the first four repos are located in ~/workspace/projects/github, and the other two in workspace/projects/others and workspace/projects/private respectively; then the workspace and group are empty, so mydocs is cloned into the homedir. At the moment, only paths relative to the user's homedir are supported. +The `update_repos` script takes the `~/.git_repos` config file and lets you update and clone your projects automatically (or at least in a batch). In the example the first four repos are located in ~/workspace/projects/github, and the other two in workspace/projects/others and workspace/projects/private respectively; then the workspace and group are empty, so mydocs is cloned into the homedir. At the moment, only paths relative to the user's homedir are supported. ``` workspace=workspace/projects @@ -56,3 +56,4 @@ ssh://myserver/srv/git/mydocs.git | git_autosave | Simple script to call from crontab or something to commit certain files in Git and push | | git_clean | Clean the Git tree | | sorter | Sort files in newly created subdirectories, based on pre- or postfixes | +| update_repos | Update a bunch of Git repos at once, like all your project. Config with ~/.git_repos | From 6cc4ce8d32ab481468ba29cd0b4b6aefde18806c Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 24 Mar 2018 11:32:05 +0100 Subject: [PATCH 77/82] Don't force hard linefeeds in Pencil --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 32c58b1..fc16fc7 100644 --- a/.vimrc +++ b/.vimrc @@ -294,6 +294,9 @@ Plugin 'reedes/vim-pencil' " 1 hard enter only, which can be annoying let g:pencil#autoformat = 0 +" Do not insert hard line breaks in the middle of a sentence +let g:pencil#wrapModeDefault = 'soft' " default is 'hard' + " Toggle Gogo with Limelight and Pencil together with Ctrl+F11 "map :Goyo :Limelight!! :TogglePencil nmap V :Goyo :Limelight!! :TogglePencil From dc98ee1624eb11a5d21dfedca34fe30099bb134f Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 24 Mar 2018 19:41:04 +0100 Subject: [PATCH 78/82] Word --- .vim/spell/nl.utf-8.add | 1 + .vim/spell/nl.utf-8.add.spl | Bin 1013 -> 1034 bytes 2 files changed, 1 insertion(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index c6837a0..eac54e6 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -56,3 +56,4 @@ bapao bapao's thuiskantoor grilham +paasontbijt diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index 57c12b189c55bec1a0621596b6a64f94c8b01501..fac6f0bb0fdf6cc82d785ef322e2173d24e600ad 100644 GIT binary patch delta 71 zcmey$-o?Qe=IL8pkeZWY^q+x&>EA{^aV81o#MB(dM8;yqe8xP+62>IPOh!fq2F7i_9tj<^mKz delta 50 zcmeC;_{z=~=IL8pkeZWY^q+x&>Fq{7aVBP_)SSt-OpT2DC+}yv#Kib#@?_>9#>UCd Gm{kC-@DWS^ From 8ddb631424f0e12497eecc35c4540633dc3eb7f6 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 28 Mar 2018 08:47:47 +0200 Subject: [PATCH 79/82] ycm likes utf-8 --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 32c58b1..bc50575 100644 --- a/.vimrc +++ b/.vimrc @@ -6,6 +6,8 @@ set shell=/bin/bash +set encoding=utf-8 + " change the key from \ to , let mapleader="," From 7037f3ce443df8e24952240db7cc76420d7971c4 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Wed, 28 Mar 2018 10:49:04 +0200 Subject: [PATCH 80/82] Skip YCM if ~/.dot_no_ycm exists --- .vimrc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.vimrc b/.vimrc index 77d4c17..30ce750 100644 --- a/.vimrc +++ b/.vimrc @@ -189,6 +189,10 @@ set complete+=kspell Plugin 'davidhalter/jedi-vim' "let g:jedi#force_py_version = 2 +" For example in termux, ycm does not want to compile, don't load it there +" with ~/.dot_no_ycm +let skip_ycm=fnamemodify(expand("$MYVIMRC"), ":p:h") . "/.dot_no_ycm" +if !filereadable(skip_ycm) " Only load YouCompleteMe if ~/.dot_no_ycm does not exist " code-completion engine " sudo apt-get install build-essential cmake " sudo apt-get install python-dev @@ -202,6 +206,7 @@ let g:ycm_server_python_interpreter = '/usr/bin/python3' " Debug stuff "let g:ycm_server_keep_logfiles = 1 "let g:ycm_server_log_level = 'debug' +endif " Improved Django handling Plugin 'tweekmonster/django-plus.vim' From 2a8a88943d3982ee6f0cfbc405cb1f922ca1c31c Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 31 Mar 2018 21:43:33 +0200 Subject: [PATCH 81/82] Woorden --- .vim/spell/nl.utf-8.add | 2 ++ .vim/spell/nl.utf-8.add.spl | Bin 1034 -> 1054 bytes 2 files changed, 2 insertions(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index eac54e6..3af8209 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -57,3 +57,5 @@ bapao's thuiskantoor grilham paasontbijt +paaseitjes +schuifje diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index fac6f0bb0fdf6cc82d785ef322e2173d24e600ad..7ae706516cfad581a9dd1d47618d50cf0a8fc03c 100644 GIT binary patch delta 85 zcmeC;n8(2v=IL8pkeZWY^q+x&nQJ4TJQFulYCdBoBO?Q2cFAOYCLeL8{8Gjo#uAXo l+*F`U8j!^hnl-td$(-@(}R!L2BaAj<4GXDSo0{*cM9|8gaZ<9CzObh{U0c-(u0RaF3on@1o X0yhEBlhXpz0S%L<15yE!lllWBanTd0 From 6176f6008dd2c7b297db3ec60002a76ca899be81 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sun, 1 Apr 2018 16:04:21 +0200 Subject: [PATCH 82/82] Words --- .vim/spell/nl.utf-8.add | 3 +++ .vim/spell/nl.utf-8.add.spl | Bin 1054 -> 1083 bytes 2 files changed, 3 insertions(+) diff --git a/.vim/spell/nl.utf-8.add b/.vim/spell/nl.utf-8.add index 3af8209..d0349f9 100644 --- a/.vim/spell/nl.utf-8.add +++ b/.vim/spell/nl.utf-8.add @@ -59,3 +59,6 @@ grilham paasontbijt paaseitjes schuifje +magneetjes +Vomar +weekplanner diff --git a/.vim/spell/nl.utf-8.add.spl b/.vim/spell/nl.utf-8.add.spl index 7ae706516cfad581a9dd1d47618d50cf0a8fc03c..a9d890fc8ecbf3fa17b1adae88d8c7e734a430c7 100644 GIT binary patch delta 181 zcmbQov73W0%+t5HAT=k)=syDkv-C#3bBvNK>WQiOjEoEn+IfuWjCqWyK*-3zm|ZgY z8KXBVkkyqr*@DSgbVX`TZhi?$Wt0je R*fJ;YX0~HoGx-;@3IKh7EX@D_ delta 152 zcmdnZF^_{U%+t5HAT=k)=syDkGuKAGbBtWf>Z$pRj0_Cgd6T~~db4K&*^JpGlUxmonxsmVl(@PM*u;#CbIX$OrN!PJY4U!P1$-lsegz*;XKvF^e&U tF_AHku^1#z9NK`VJDK&>No3Q|>1tbNOV9A?&gV~O8-ehqW6#yo^Ca3@a