From b1de9773d55d0620a9ec7922ea14a3011713f698 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Tue, 20 Mar 2018 22:00:24 +0100 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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^