Original mdnav repo is unmaintained, remove mention

Vim todo

.bash_aliases

@@ -22,6 +22,11 @@ alias lll='ls --color=always -alF | less -R'
 # append history instead of overwriting:
 shopt -s histappend
 
+if command -v batcat &> /dev/null; then
+    # Sometimes `bat` has the binary `batcat`, like on Debian or Ubuntu
+    alias bat='batcat'
+fi
+
 alias findphp='find . -name "*.php" | xargs grep --color=auto'
 alias findjs='find . -name "*.js" | xargs grep --color=auto'
 alias findcss='find . -name "*.css" | xargs grep --color=auto'

.config/beets/config.yaml

@@ -0,0 +1,60 @@
+directory: /stuff/beets/music
+library: /stuff/beets/musiclibrary.db
+
+art_filename: cover
+asciify_paths: yes
+per_disc_numbering: yes
+threaded: yes
+
+paths:
+  # default: $albumartist/$year - $album/$track $artist - $title
+  default: %the{$albumartist}/$year - $album%aunique{}/%if{$multidisc,$disc-}$track $artist - $title
+  #singleton: Singletons/$artist - $title
+  singleton: %the{$albumartist}/single - $artist - $title/$artist - $title
+  comp: Compilations/$album%aunique{}/%if{$multidisc,$disc-}$track $artist - $title
+  albumtype:soundtrack: Soundtracks/$album%aunique{}/%if{$multidisc,$disc-}$track $artist - $title
+
+import:
+  write: yes
+  copy: yes
+  move: no
+  resume: ask
+  #incremental: yes
+  log: beetslog.log
+
+ignore: .AppleDouble ._* *~ .DS_Store
+
+plugins: [
+  bandcamp,  # pip install beets-bandcamp
+  discogs,
+  duplicates,
+  embedart,
+  fetchart,
+  ftintitle,
+  importadded,
+  inline,
+  the,
+]
+
+discogs:
+  # pip install discogs-client
+  # Useful for classical music:
+  index_tracks: yes
+
+fetchart:
+  # pip install requests
+  cautious: true
+
+ftintitle:
+  auto: yes
+  format: (feat. {0})
+
+importadded:
+  preserve_mtimes: yes
+  preserve_write_mtimes: yes
+
+item_fields:
+  multidisc: 1 if disctotal > 1 else 0
+
+musicbrainz:
+  host: localhost:5000

.config/fish/config.fish

@@ -3,15 +3,11 @@ set EDITOR vim
 
 set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
 
-if not functions -q fisher
+#if not functions -q fisher
-    echo "Installing fisher for the first time..." >&2
+#    DO NOT ENABLE, it is a fork bomb :)
-    set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
+#    echo "Installing fisher for the first time..." >&2
-    curl https://git.io/fisher --create-dirs -sLo $XDG_CONFIG_HOME/fish/functions/fisher.fish
+#    curl -sL https://git.io/fisher | source && fisher update
-    fisher
+#end
-end
-
-# Virtualenv support with virtualfish
-eval (python3 -m virtualfish compat_aliases)
 
 # Theme options for bobthefish
 set -g theme_nerd_fonts yes
@@ -31,6 +27,11 @@ set -U grcplugin_ls --color
 if test -x ~/.local/bin
     set PATH $PATH ~/.local/bin
 end
+# Local Rust apps installed through cargo
+if test -x ~/.cargo/bin
+    set PATH $PATH ~/.cargo/bin
+end
+# Scripts from my dotfiles repo
 if test -x ~/.dot/dotfiles/bin
     set PATH $PATH ~/.dot/dotfiles/bin
 end
@@ -58,6 +59,9 @@ set -gx FZF_DEFAULT_COMMAND 'rg --files --no-ignore --hidden --follow --glob "!.
 set -gx FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
 set -gx FZF_ALT_C_COMMAND "$FZF_DEFAULT_COMMAND"
 
+# Set HOSTNAME to the hostname of the device, without trailing domain name
+set -x HOSTNAME (hostname | string split -m1 '.')[1]
+
 # Aliases
 ## Listing
 alias ll 'ls -alF'
@@ -84,7 +88,10 @@ alias gt 'git tag|less'
 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'
+#alias ssh 'env TERM=xterm-256color ssh'
+function ssh
+    env TERM=screen-256color ssh $argv
+end
 
 ## Grepping
 alias findfile 'find . | grep -v .svn | grep -v .hg | grep -v .git | grep'
@@ -98,11 +105,16 @@ function grepl
     grep --color=always -ir $argv | less -R
 end
 
+# Sometimes `bat` has the binary `batcat`, like on Debian or Ubuntu
+alias bat (command -v batcat || echo bat)
+
 function rgl
     rg -p $argv | less -RFX
 end
 
 ## Various
+alias ip 'ip -c'
+
 #alias tmux 'tmux -2'
 alias tmux_reload "tmux source-file ~/.tmux.conf"
 alias tmux_takeover "tmux detach -a"
@@ -128,6 +140,24 @@ function rgvim
     end
 end
 
+function imready
+    # Get return status and run time of last command, to be used with long-running jobs
+    # e.g.: longrunning.sh; imready
+    set laststatus $status
+    if test $status = 0
+        set result "success"
+    else
+        set result "failed with result $laststatus"
+    end
+    set duration (echo "$CMD_DURATION 1000" | awk '{printf "%.3fs", $1 / $2}')
+    set resulttext "Result of command: $result (took: $duration)"
+
+    # Send a push message with summary
+    if test -f "$HOME/workspace/projects/others/pushover.sh/pushover.sh"
+        $HOME/workspace/projects/others/pushover.sh/pushover.sh -t "[$HOSTNAME] command finished" "$resulttext"
+    end
+end
+
 function jl
     # Pretty print the json file used as argument, and feed it in colour to less
     jq -C --indent 2 . $argv | less -R

.config/fish/fish_plugins

@@ -0,0 +1,9 @@
+jorgebucaran/fisher
+edc/bass
+oh-my-fish/theme-bobthefish
+fisherman/fzf
+fisherman/getopts
+fisherman/nvm
+oh-my-fish/plugin-grc
+fisherman/shark
+fisherman/z

.gitconfig

@@ -33,11 +33,17 @@
 	# list aliases
 	la = "!git config -l | grep alias | cut -c 7-"
 
+	# git change-commits GIT_COMMITTER_NAME "old name" "new name"
+	change-commits = "!f() { VAR=$1; OLD=$2; NEW=$3; shift 3; git filter-branch --env-filter \"if [[ \\\"$`echo $VAR`\\\" = '$OLD' ]]; then export $VAR='$NEW'; fi\" $@; }; f "
+	# from https://help.github.com/articles/remove-sensitive-data
+	remove-file = "!f() { git filter-branch -f --index-filter \"git rm --cached --ignore-unmatch $1\" --prune-empty --tag-name-filter cat -- --all; }; f"
+
 [push]
 	default = simple
 
 [core]
 	editor = vim
+	excludesfile = ~/.gitignore_global
 
 [diff]
 	wsErrorHighlight = all
@@ -57,3 +63,5 @@
 
 [url "git://bitbucket.org/"]
 	insteadOf = "bitbucket:"
+[pull]
+	rebase = false

.gitignore

@@ -1,5 +1,6 @@
 # Vim
 .vim/bundle
+*.spl
 *.swp
 *.swo
 

.gitignore_global

@@ -0,0 +1,6 @@
+# vim
+*.swp
+*.swo
+
+# virtualenv
+.venv

.ideavimrc

@@ -1 +1,2 @@
 set ideajoin
+set clipboard+=unnamed

.vim/after/syntax/markdown.vim

@@ -0,0 +1,3 @@
+unlet b:current_syntax
+syntax include @Yaml syntax/yaml.vim
+syntax region yamlFrontmatter start=/\%^---$/ end=/^---$/ keepend contains=@Yaml

.vim/ftdetect/todo.vim

@@ -1 +1,2 @@
 au BufNewFile,BufRead *.todo set filetype=todo
+"au BufNewFile,BufRead *.todo set filetype=markdown

.vim/spell/nl.utf-8.add

@@ -149,3 +149,29 @@ tweaken
 dammIT
 YouTube
 berenhap
+inlegzooltjes
+Chromebook
+KlikAanKlikUit
+Mandalorian
+knuffelbaar
+gewokte
+Efteling
+wokgerecht
+rundersaucijs
+Loïs
+Pfizer
+gehaktsaus
+aardappelkroketjes
+AMD
+Assetto
+Corsa
+Wii
+gymkleding
+kutweer
+whoa
+bistrokrieltjes
+dumbbells
+naproxen
+nerden
+E-depot
+Carcassonne

.vim/syntax/todo.vim

@@ -2,6 +2,11 @@ if exists("b:current_syntax")
     finish
 endif
 
+runtime! syntax/html.vim
+unlet! b:current_syntax
+
+"runtime! syntax/markdown.vim
+"unlet! b:current_syntax
 
 " Keywords that we want to emphasize
 "syntax keyword todoKeyword todo done important
@@ -85,6 +90,19 @@ highlight todoTitledItem ctermfg=172 guifg=#d78700
 syntax match todoItem '[a-zA-Z0-9\-_]\+:' contained
 highlight todoItem ctermfg=Blue guifg=#87d7ff
 
+
+syn region markdownIdDeclaration matchgroup=markdownLinkDelimiter start="^ \{0,3\}!\=\[" end="\]:" oneline keepend nextgroup=markdownUrl skipwhite
+syn match markdownUrl "\S\+" nextgroup=markdownUrlTitle skipwhite contained
+syn region markdownUrl matchgroup=markdownUrlDelimiter start="<" end=">" oneline keepend nextgroup=markdownUrlTitle skipwhite contained
+syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+"+ end=+"+ keepend contained
+syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+'+ end=+'+ keepend contained
+syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+(+ end=+)+ keepend contained
+
+syn region markdownLinkText matchgroup=markdownLinkTextDelimiter start="!\=\[\%(\_[^]]*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" nextgroup=markdownLink,markdownId skipwhite contains=@markdownInline,markdownLineStart
+syn region markdownLink matchgroup=markdownLinkDelimiter start="(" end=")" contains=markdownUrl keepend contained
+syn region markdownId matchgroup=markdownIdDelimiter start="\[" end="\]" keepend contained
+syn region markdownAutomaticLink matchgroup=markdownUrlDelimiter start="<\%(\w\+:\|[[:alnum:]_+-]\+@\)\@=" end=">" keepend oneline
+
 highlight link todoStatusDone PreProc
 highlight link todoStatusDoing PreProc
 highlight link todoStatusCancelled PreProc
@@ -93,6 +111,18 @@ highlight link todoStatusTodo PreProc
 highlight link todoStatusImportant PreProc
 highlight link todoStatusQuestion PreProc
 
+hi def link markdownLinkText              htmlLink
+hi def link markdownIdDeclaration         Typedef
+hi def link markdownId                    Type
+hi def link markdownAutomaticLink         markdownUrl
+hi def link markdownUrl                   Float
+hi def link markdownUrlTitle              String
+hi def link markdownIdDelimiter           markdownLinkDelimiter
+hi def link markdownUrlDelimiter          htmlTag
+hi def link markdownUrlTitleDelimiter     Delimiter
+
+" runtime! syntax/markdown.vim
+" unlet! b:current_syntax
 
 " Syntax highlighting scheme name
 let b:current_syntax = "todo"

.vimrc

@@ -141,6 +141,7 @@ endif
 " fzf integration for fast fuzzy finding, better and faster than ctrl-p
 set rtp+=~/workspace/projects/others/fzf
 set rtp+=/data/data/com.termux/files/usr/bin/fzf
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 
 " Customize fzf colors to match your color scheme
@@ -165,29 +166,35 @@ let g:fzf_colors =
 " https://medium.com/@crashybang/supercharge-vim-with-fzf-and-ripgrep-d4661fc853d2
 command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --hidden --follow --color "always" '.shellescape(<q-args>).'| tr -d "\017"', 1, <bang>0)
 
-" Alternative, not enabled for the moment, as it also searches part of the
+" Search contents of files with ripgrep
-" file name
+" https://sidneyliebrand.io/blog/how-fzf-and-ripgrep-improved-my-workflow
 command! -bang -nargs=* Rg
   \ call fzf#vim#grep(
-  \   'rg --column --line-number --no-heading --color=always --smart-case '.shellescape(<q-args>), 1,
+  \   'rg --column --line-number --smart-case --no-heading --color=always '.shellescape(<q-args>), 1,
-  \   <bang>0 ? fzf#vim#with_preview('up:60%')
+  \   <bang>0 ? fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'up:60%')
-  \           : fzf#vim#with_preview('right:50%:hidden', '?'),
+  \           : fzf#vim#with_preview({'options': '--delimiter : --nth 4..'}, 'right:50%:hidden', '?'),
   \   <bang>0)
 
 " Files command with preview window
 command! -bang -nargs=? -complete=dir FilesPreview
   \ call fzf#vim#files(<q-args>, fzf#vim#with_preview(), <bang>0)
 
+" Mapping the above functions to more easily accessible hotkeys.
 " Simply type ; to search through buffers, leader-o to search through file
 " names, leader-O to search through file names, showing a preview window,
 " \t for tags, \c for (Git) commits and \f to search through contents of files
 nmap ; :Buffers<CR>
 nmap <Leader>o :Files<CR>
-nmap <Leader>O :FilesPreview<CR>
+"nmap <Leader>O :FilesPreview<CR>
+" Git files, takes .gitignore into account
+nmap <Leader>O :GFiles<CR>
+nmap <Leader>b :Buffers<CR>
 nmap <Leader>t :Tags<CR>
 nmap <Leader>c :Commits<CR>
-nmap <Leader>f :Find<CR>
+" nmap <Leader>f :Find<CR>
+nmap <Leader>f :Rg<CR>
 nmap <Leader>l :Lines<CR>
+" nmap <Leader>g :Rg<CR>
 
 nnoremap <silent> [f :lprevious<CR>
 nnoremap <silent> ]f :lnext<CR>
@@ -197,9 +204,8 @@ nnoremap <silent> ]f :lnext<CR>
 " https://github.com/ryanoasis/nerd-fonts
 Plug 'ryanoasis/vim-devicons'
 " Set guifont when using gvim:
-"set guifont=Droid\ Sans\ Mono\ for\ Powerline\ Plus\ Nerd\ File\ Types\ 11
+set guifont=Hack\ Nerd\ Font\ Mono\ 10
 
-"
 " undotree.vim : Display your undo history in a graph.
 Plug 'mbbill/undotree'
 nnoremap <Leader>u :UndotreeToggle<CR>
@@ -265,6 +271,15 @@ endif
 " https://castel.dev/post/lecture-notes-1/
 inoremap <C-l> <c-g>u<Esc>[s1z=`]a<c-g>u
 
+" Make sure .add.spl spelling files are up-to-date with their .add
+" counterparts
+" https://vi.stackexchange.com/questions/5050/how-to-share-vim-spellchecking-additions-between-multiple-machines
+for d in glob('~/.vim/spell/*.add', 1, 1)
+    if filereadable(d) && (!filereadable(d . '.spl') || getftime(d) > getftime(d . '.spl'))
+        exec 'mkspell! ' . fnameescape(d)
+    endif
+endfor
+
 " Word completion from dictionary (on ctrl+space)
 set complete+=kspell
 
@@ -279,6 +294,8 @@ Plug 'Yggdroot/indentLine'
 let g:indentLine_char = '┊'
 "let g:indentLine_setConceal = 0
 let g:indentLine_conceallevel = 1
+" Do not conceal LaTeX symbols
+let g:tex_conceal=""
 
 " Colour-match brackets
 Plug 'luochen1990/rainbow'
@@ -309,7 +326,14 @@ if !filereadable(skip_ycm)  " Only load YouCompleteMe if ~/.dot_no_ycm does not
     " sudo apt-get install python-dev
     " cd ~/.vim/bundle/YouCompleteMe
     " ./install.py  # For C-style languages: ./install.py --clang-completer
-    Plug 'ycm-core/YouCompleteMe'
+    if has('patch-8.1.2269')
+        " Latest YCM needs at least this version of vim
+        Plug 'ycm-core/YouCompleteMe'
+    else
+        " Version compatible with the vim in Debian 10 buster
+        " Plug 'ycm-core/YouCompleteMe', { 'commit':'d98f896' }
+        Plug 'ycm-core/YouCompleteMe', { 'branch':'legacy-vim' }
+    endif
     " YouCompleteMe interpreter version (should be the same as what YCM was
     " compiled with):
     if filereadable('/data/data/com.termux/files/usr/bin/python3')
@@ -361,6 +385,9 @@ endif
 " Improved Django handling
 Plug 'tweekmonster/django-plus.vim'
 
+" requirements.txt highlighter
+Plug 'raimon49/requirements.txt.vim', {'for': 'requirements'}
+
 
 " Code checker. For python, install flake8 or pylint, preferably in the
 " virtualenv. For Django support, install pylint-django
@@ -394,6 +421,7 @@ let g:vim_markdown_folding_disabled = 1
 set nofoldenable
 let g:vim_markdown_conceal = 0
 let g:vim_markdown_conceal_code_blocks = 0
+let g:vim_markdown_new_list_item_indent = 2
 Plug 'godlygeek/tabular'
 Plug 'plasticboy/vim-markdown'
 " Use filetype name as fenced code block languages for syntax highlighting
@@ -403,6 +431,27 @@ let g:vim_markdown_fenced_languages = ['c++=cpp', 'viml=vim', 'bash=sh', 'ini=do
 Plug 'skanehira/preview-markdown.vim'
 let g:preview_markdown_vertical = 1
 
+" Navigate through and from markdown files
+Plug 'aquatix/mdnav', { 'branch': 'fixes' }
+" Only open these local files in vim, use pyfile for all others:
+let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst'
+" let g:mdnav#DebugMode = 'true'
+
+
+" wiki.vim
+Plug 'lervag/wiki.vim'
+" Config below, after plug#end()
+
+
+if $USER != 'root'
+    " notational velocity with fzf: quickly search and open notes
+    Plug 'https://github.com/alok/notational-fzf-vim'
+    let g:nv_search_paths = ['~/phren', '~/mydocs', '~/.dot/caplog', '~/divaultphren']
+    let g:nv_ignore_pattern = ['*.xml', '*.svg']
+    " Quickly open the search with this shortcut
+    nmap <leader>n :NV <CR>
+endif
+
 
 " The NERD Commenter: A plugin that allows for easy commenting of code for
 " many filetypes.
@@ -437,7 +486,7 @@ au BufNewFile,BufRead *.j2,*.jinja2 set ft=jinja
 Plug 'ludovicchabant/vim-gutentags'
 " know when Gutentags is generating tags (prints 'TAGS' in status-line)
 set statusline+=%{gutentags#statusline()}
-let g:gutentags_ctags_exclude = ["*.min.*", "build", ".bundle", ".git", "log", "node_modules", "tmp", "vendor", "*.vim/bundle/*"]
+let g:gutentags_ctags_exclude = ["*.min.*", "build", ".bundle", ".git", "log", "node_modules", "tmp", "vendor", "*.vim/bundle/*", "*.vim/plugged/*"]
 "let g:gutentags_trace = 1
 
 
@@ -451,6 +500,8 @@ let g:goyo_width = 120
 Plug 'junegunn/limelight.vim'
 let g:limelight_conceal_ctermfg = 'Grey69'
 let g:limelight_conceal_ctermfg = 145
+" Color name (:help gui-colors) or RGB color
+let g:limelight_conceal_guifg = '#b0b0b0'
 
 " Helps with writing prose (better line breaks, agnostic on soft line wraps vs
 " hard line breaks etc)
@@ -467,6 +518,37 @@ nmap <leader>V :Goyo <bar> :Limelight!! <bar> :TogglePencil <CR>
 
 " All of the plugins must be added before the following line
 call plug#end()
+
+
+" wiki.vim config
+let g:wiki_root = '~/phren'
+let g:wiki_filetypes = ['md']
+let g:wiki_link_extension = '.md'
+let g:wiki_link_target_type = 'md'
+" let g:wiki_mappings_use_defaults = 1
+"support for #tag style tags instead of :tag: (hashes instead of colons)
+runtime autoload/wiki/tags.vim
+let s:tag_parser = deepcopy(g:wiki#tags#default_parser)
+let s:tag_parser.re_match = '\v%(^|\s)#\zs[^# ]+'
+let s:tag_parser.re_findstart = '\v%(^|\s)#\zs[^# ]+'
+
+"let g:wiki_tags_format_pattern = '\v%(^|\s)#\zs[^# ]+'
+" parse tags in lines that match "tags: keyword1, keyword2" in addition to the default parser:
+let g:wiki_tag_parsers = [
+            \ s:tag_parser,
+            \ {'match': {x -> x =~# '^tags: '},
+            \  'parse': {x -> split(matchstr(x, '^tags:\zs.*'), '[ ,]\+')}}
+            \ ]
+" number of lines from the top to scan for tags
+let g:wiki_tag_scan_num_lines = 500
+" search through the tags in the wiki
+nmap <leader>wf :WikiFzfTags <CR>
+" find backlinks to this document
+nmap <leader>wb :WikiGraphFindBacklinks <CR>
+" find in ToC/structure of the (markdown) file
+nmap <leader>ft :WikiFzfToc <CR>
+
+
 " == End of plugins ============================================================
 
 
@@ -486,6 +568,14 @@ set listchars=tab:▸\ ,trail:·
 " Display whitespace
 set list
 
+" Trim trailing whitespace with :TrimWhitespace
+fun! TrimWhitespace()
+    let l:save = winsaveview()
+    keeppatterns %s/\s\+$//e
+    call winrestview(l:save)
+endfun
+command! TrimWhitespace call TrimWhitespace()
+
 " enable words completion
 set dictionary+=/usr/share/dict/words
 " use ctrl-n ctrl-n instead of ctrl-x ctrl-k
@@ -515,7 +605,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" || &term == "tmux-256color-italic"
+if has("gui_running") || &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
 
     set background=dark
     let g:enable_bold_font = 1
@@ -526,6 +616,9 @@ if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &te
     " create a bar for airline
     set laststatus=2
     let g:airline_powerline_fonts = 1
+
+    " ensure black background in gvim
+    highlight Normal guibg=black
 endif
 
 " This is what sets vim to use 24-bit colors. It will also work for any version of neovim

README.md

@@ -13,8 +13,12 @@ cd dotfiles    # this takes you to the freshly cloned ~/.dot/dotfiles
 sh install.sh  # follow the instructions and install the files in the homedir
 ```
 
+Extra's:
 
-# Dependency on `fzf` and ripgrep `rg`
+[virtualfish](https://virtualfish.readthedocs.io/en/latest/install.html) for virtualenv(wrapper) integration in `fish` shell.
+
+
+## Dependency on `fzf` and ripgrep `rg`
 
 Both the shell configuration and vim make use of `fzf`. [fzf is a general-purpose command-line fuzzy finder](https://github.com/junegunn/fzf) and helps one 'grep' really fast through filenames. It's an alternative for the well-known `find`. Install it by cloning the repository and running the install script ([check the Installation notes too](https://github.com/junegunn/fzf#installation)).
 
@@ -23,11 +27,19 @@ Both the shell configuration and vim make use of `fzf`. [fzf is a general-purpos
 If your distribution does not provide a package, [get yours from the releases page](https://github.com/BurntSushi/ripgrep/releases) (there's a .deb for 64-bit systems).
 
 
-# Fix for shift+F6 in tmux (and screen probably)
+## vim config
+
+The [.vimrc](https://github.com/aquatix/dotfiles/blob/master/.vimrc) has a lot going on. [Find out more about my tweaks](https://dammit.nl/tag/vim.html) and use `:Maps` in vim itself to see key mappings
+
+vim uses both `fzf` and `rg`, and also really likes having `ctags` (Exuberant Ctags) available.
+
+
+## Fix for shift+F6 in tmux (and screen probably)
 
 In tmux, do `infocmp > screen-256color`. Add the line `kf16=\E[17;2~,` and compile the file with tic. This will result in `~/.terminfo/s/screen-256color` with the correct keycode for shift+F6. `.tmux.conf` needs the line `setw -g xterm-keys on` for it to register correctly.
 
-# ~/.git_repos config file
+
+## ~/.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.
 
@@ -51,7 +63,8 @@ group=
 ssh://myserver/srv/git/mydocs.git
 ```
 
-# Interesting scripts
+
+## Interesting scripts
 
 | ./bin/           | description                                                                             |
 |------------------|-----------------------------------------------------------------------------------------|
@@ -60,7 +73,7 @@ ssh://myserver/srv/git/mydocs.git
 | 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                                                 |
+| fixpictimestamps | Change file ctime to datetime from EXIF using exiftool                                  |
 | 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 |

bin/calibre_update

@@ -1,2 +1,2 @@
 #!/bin/bash
-sudo -v && wget -nv -O- https://raw.githubusercontent.com/kovidgoyal/calibre/master/setup/linux-installer.py | sudo python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()"
+sudo -v && wget -nv -O- https://download.calibre-ebook.com/linux-installer.sh | sudo sh /dev/stdin

bin/font_update

@@ -46,6 +46,15 @@ overpass-semibold.otf
 overpass-thin-italic.otf
 overpass-thin.otf'
 
+FONTS_JETBRAINS=$'JetBrainsMono-Bold-Italic.ttf
+JetBrainsMono-Bold.ttf
+JetBrainsMono-ExtraBold-Italic.ttf
+JetBrainsMono-ExtraBold.ttf
+JetBrainsMono-Italic.ttf
+JetBrainsMono-Medium-Italic.ttf
+JetBrainsMono-Medium.ttf
+JetBrainsMono-Regular.ttf'
+
 FONTS_GO=$'Go-Bold-Italic.ttf
 Go-Bold.ttf
 Go-Italic.ttf
@@ -67,7 +76,7 @@ Rubik-Medium.ttf
 Rubik-Regular.ttf'
 
 # https://github.com/eosrei/emojione-color-font/
-FONTS_VARIOUS=$'EmojiOneColor-SVGinOT.ttf'
+# FONTS_VARIOUS=$'EmojiOneColor-SVGinOT.ttf'
 
 FONTS_DELETE=$'Sauce Code Pro Medium Plus Nerd File Types Plus Font Awesome Plus Octicons Plus Pomicons.ttf
 Sauce Code Pro Bold Plus Nerd File Types Mono Plus Font Awesome Plus Octicons Plus Pomicons.ttf
@@ -97,6 +106,21 @@ if [ -e ~/.dot_is_server ]; then
         echo "$SOURCE_DIR or $DEST_DIR not found, aborting"
     fi
 
+    # Update from the repo
+    echo "== Jetbrains Mono ======"
+    SOURCE_DIR="/stuff/system/fonts/JetBrainsMono/ttf"
+    DEST_DIR="/stuff/system/sync/fonts/active"
+    if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
+        cd "$SOURCE_DIR"
+        git pull --all
+        while read -r FONT; do
+            echo "Copied font: $FONT"
+            cp -a "$SOURCE_DIR/$FONT" "$DEST_DIR"
+        done <<< "$FONTS_JETBRAINS"
+    else
+        echo "$SOURCE_DIR or $DEST_DIR not found, aborting"
+    fi
+
     # Update from the repo
     echo "== Overpass ======"
     SOURCE_DIR="/stuff/system/fonts/Overpass/desktop-fonts/overpass"
@@ -140,6 +164,9 @@ else
             FONT_FILE=$(basename "${SOURCE_DIR}/${FONT}")
             install_font "$SOURCE_DIR/$FONT_FILE" "$DEST_DIR/$FONT_FILE"
         done <<< "$FONTS_CODING"
+        while read -r FONT; do
+            install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
+        done <<< "$FONTS_JETBRAINS"
         while read -r FONT; do
             install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
         done <<< "$FONTS_FUTURA"
@@ -152,14 +179,15 @@ else
         while read -r FONT; do
             install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
         done <<< "$FONTS_RUBIK"
-        while read -r FONT; do
+        # while read -r FONT; do
-            install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
+        #     install_font "$SOURCE_DIR/$FONT" "$DEST_DIR/$FONT"
-        done <<< "$FONTS_VARIOUS"
+        # done <<< "$FONTS_VARIOUS"
         if [ ! -e "${HOME}/.config/fontconfig" ]; then
             mkdir -p "${HOME}/.config/fontconfig"
         fi
-        if [ ! -e "${HOME}/.config/fontconfig/fonts.conf" ]; then
+        if [ -L "${HOME}/.config/fontconfig/fonts.conf" ]; then
-            ln -s "${SOURCE_DIR}/fonts.conf" "${HOME}/.config/fontconfig/"
+            # Remove the emoji-fallback config that causes crashes in Telegram Desktop (symlink)
+            rm "${HOME}/.config/fontconfig/fonts.conf"
         fi
         # Delete obsolete fonts
         while read -r FONT; do

bin/gitmv

@@ -0,0 +1,111 @@
+#!/bin/bash
+#
+# git-mv-with-history -- move/rename file or folder, with history.
+#
+# Moving a file in git doesn't track history, so the purpose of this
+# utility is best explained from the kernel wiki:
+#
+#   Git has a rename command git mv, but that is just for convenience.
+#   The effect is indistinguishable from removing the file and adding another
+#   with different name and the same content.
+#
+# https://git.wiki.kernel.org/index.php/GitFaq#Why_does_Git_not_.22track.22_renames.3F
+#
+# While the above sucks, git has the ability to let you rewrite history
+# of anything via `filter-branch`. This utility just wraps that functionality,
+# but also allows you to easily specify more than one rename/move at a
+# time (since the `filter-branch` can be slow on big repos).
+#
+# Usage:
+#
+#   git-rewrite-history [-d/--dry-run] [-v/--verbose] <srcname>=<destname> <...> <...>
+#
+# After the repsitory is re-written, eyeball it, commit and push up.
+#
+# Given this example repository structure:
+#
+#   src/makefile
+#   src/test.cpp
+#   src/test.h
+#   src/help.txt
+#   README.txt
+#
+# The command:
+#
+#   git-rewrite-history README.txt=README.md  \     <-- rename to markdpown
+#                       src/help.txt=docs/    \     <-- move help.txt into docs
+#                       src/makefile=src/Makefile   <-- capitalize makefile
+#
+#  Would restructure and retain history, resulting in the new structure:
+#
+#    docs/help.txt
+#    src/Makefile
+#    src/test.cpp
+#    src/test.h
+#    README.md
+#
+# @author emiller
+# @date   2013-09-29
+# @url    https://gist.github.com/tupy/79ec62fee769d4049db2
+#
+
+function usage() {
+  echo "usage: `basename $0` [-d/--dry-run] [-v/--verbose] <srcname>=<destname> <...> <...>"
+  [ -z "$1" ] || echo $1
+
+  exit 1
+}
+
+[ ! -d .git ] && usage "error: must be ran from within the root of the repository"
+
+dryrun=0
+filter=""
+verbose=""
+repo=$(basename `git rev-parse --show-toplevel`)
+
+while [[ $1 =~ ^\- ]]; do
+  case $1 in
+    -d|--dry-run)
+      dryrun=1
+      ;;
+
+    -v|--verbose)
+      verbose="-v"
+      ;;
+
+    *)
+      usage "invalid argument: $1"
+  esac
+
+  shift
+done
+
+for arg in $@; do
+  val=`echo $arg | grep -q '=' && echo 1 || echo 0`
+  src=`echo $arg | sed 's/\(.*\)=\(.*\)/\1/'`
+  dst=`echo $arg | sed 's/\(.*\)=\(.*\)/\2/'`
+  dir=`echo $dst | grep -q '/$' && echo $dst || dirname $dst`
+
+  [ "$val" -ne 1  ] && usage
+  [ ! -e "$src"   ] && usage "error: $src does not exist"
+
+  filter="$filter                            \n\
+    if [ -e \"$src\" ]; then                 \n\
+      echo                                   \n\
+      if [ ! -e \"$dir\" ]; then             \n\
+        mkdir -p ${verbose} \"$dir\" && echo \n\
+      fi                                     \n\
+      mv $verbose \"$src\" \"$dst\"          \n\
+    fi                                       \n\
+  "
+done
+
+[ -z "$filter" ] && usage
+
+if [[ $dryrun -eq 1 || ! -z $verbose ]]; then
+  echo
+  echo "tree-filter to execute against $repo:"
+  echo -e "$filter"
+fi
+
+[ $dryrun -eq 0 ] && git filter-branch -f --tree-filter "`echo -e $filter`"

bin/worknotes

@@ -1,5 +1,7 @@
 #!/bin/bash
 cd ~/mydocs/work/divault
 git pull
+cd ~/divaultphren
+git pull
 #vim -c ":vsp planning_2015.todo" notes_2015.md notes_2014.md
-vim -c "set nofoldenable" planning_2020.todo notes.md
+vim -c "set nofoldenable" ~/mydocs/work/divault/planning_2021.todo ~/divaultphren/index.md

install.sh

@@ -30,15 +30,14 @@ install_fish()
     mkdir -p "${HOME}/.config/fish/completions"
     curl -sL get.fisherman.sh | fish
     ln -s "${HOME}/.dot/dotfiles/.config/fish/config.fish" "${HOME}/.config/fish/"
-    ln -s "${HOME}/.dot/dotfiles/.config/fish/fishfile" "${HOME}/.config/fish/"
+    ln -s "${HOME}/.dot/dotfiles/.config/fish/fish_plugins" "${HOME}/.config/fish/"
-    ln -s "${HOME}/.dot/dotfiles/.config/fish/completions/terrible_job.fish" "${HOME}/.config/fish/completions"
     ln -s "${HOME}/workspace/application_addons/cli/git-flow-completion/git.fish" "${HOME}/.config/fish/completions"
     ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/mux.fish" "${HOME}/.config/fish/completions"
     ln -s "${HOME}/workspace/application_addons/cli/tmuxinator/completion/tmuxinator.fish" "${HOME}/.config/fish/completions"
     echo
     echo "You might want to install Fisher:"
-    echo "curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish"
+    echo "curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher"
-    echo "And some plugins: fisher"
+    echo "fisher update"
     echo
 }
 
@@ -87,7 +86,7 @@ DATETIME=$(date +%Y%m%d_%H%M)
 cd || exit
 
 # Symlink all the things
-for TARGET in .bash_aliases .bashrc bin .gitconfig .gitmodules .hgauthors.txt .hgignore .hgrc .ideavimrc .ignore .screenrc .terminfo .tmux.conf .vim .vimrc install.sh
+for TARGET in .bash_aliases .bashrc bin .gitconfig .gitignore_global .gitmodules .hgauthors.txt .hgignore .hgrc .ideavimrc .ignore .screenrc .terminfo .tmux.conf .vim .vimrc install.sh
 do
     make_link $DIR $TARGET
 done