Do not hide latex symbols

.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/fish/config.fish

@@ -10,9 +10,6 @@ if not functions -q fisher
     fish -c fisher
 end
 
-# Virtualenv support with virtualfish
-eval (python3 -m virtualfish compat_aliases)
-
 # Theme options for bobthefish
 set -g theme_nerd_fonts yes
 set -g theme_show_exit_status yes
@@ -58,6 +55,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 +84,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 +101,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 +136,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

.gitconfig

@@ -43,6 +43,7 @@
 
 [core]
 	editor = vim
+	excludesfile = ~/.gitignore_global
 
 [diff]
 	wsErrorHighlight = all
@@ -62,3 +63,5 @@
 
 [url "git://bitbucket.org/"]
 	insteadOf = "bitbucket:"
+[pull]
+	rebase = false

.gitignore_global

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

.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

@@ -154,3 +154,8 @@ Chromebook
 KlikAanKlikUit
 Mandalorian
 knuffelbaar
+gewokte
+Efteling
+wokgerecht
+rundersaucijs
+Loïs

.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
@@ -184,7 +185,10 @@ command! -bang -nargs=? -complete=dir FilesPreview
 " \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>
@@ -200,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>
@@ -282,6 +285,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'
@@ -312,7 +317,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
+    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')
@@ -414,38 +426,34 @@ Plug 'aquatix/mdnav', { 'branch': 'fixes' }
 let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst'
 
 
-" vimwiki
+" wiki.vim
-Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
+Plug 'lervag/wiki.vim'
-let wiki_1 = {}
+" let g:wiki_root = '~/wiki'
-let wiki_1.path = '~/phren/'
+let g:wiki_root = '~/phren'
-let wiki_1.syntax = 'markdown'
+let g:wiki_filetypes = ['md']
-let wiki_1.ext = '.md'
+let g:wiki_link_extension = '.md'
-
+let g:wiki_link_target_type = 'md'
-" vimwiki-markdown
+" let g:wiki_mappings_use_defaults = 1
-let wiki_1.template_path = '~/phren/templates/'
+"support for #tag style tags instead of :tag:
-let wiki_1.template_default = 'default'
+let g:wiki_tags_format_pattern = '\v%(^|\s)#\zs[^# ]+'
-let wiki_1.path_html = '~/phren/site_html/'
+" number of lines from the top to scan for tags
-let wiki_1.custom_wiki2html = 'vimwiki_markdown'
+let g:wiki_tags_scan_num_lines = 500
-let wiki_1.template_ext = '.tpl'
+" search through the tags in the wiki
-let $VIMWIKI_MARKDOWN_EXTENSIONS = 'wikilinks'
+nmap <leader>wf :WikiFzfTags <CR>
-
+" find backlinks to this document
-let g:vimwiki_list = [wiki_1]
+nmap <leader>wb :WikiGraphFindBacklinks <CR>
-let g:vimwiki_ext2syntax = {'.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'}
+" find in ToC/structure of the (markdown) file
-" Do not use vimwiki magic on non-wiki (markdown) files
+nmap <leader>ft :WikiFzfToc <CR>
-let g:vimwiki_global_ext = 0
-" Be smarter with file extensions
-let g:vimwiki_markdown_link_ext = 1
-
-" Quick way of opening a window with backlinks to the current document
-nmap <leader>wb :VimwikiBacklinks <CR>
 
 
-" notational velocity with fzf: quickly search and open notes
+if $USER != 'root'
-Plug 'https://github.com/alok/notational-fzf-vim'
+    " notational velocity with fzf: quickly search and open notes
-let g:nv_search_paths = ['~/phren', '~/mydocs', '~/.dot/caplog']
+    Plug 'https://github.com/alok/notational-fzf-vim'
-let g:nv_ignore_pattern = ['*.xml', '*.svg']
+    let g:nv_search_paths = ['~/phren', '~/mydocs', '~/.dot/caplog']
-" Quickly open the search with this shortcut
+    let g:nv_ignore_pattern = ['*.xml', '*.svg']
-nmap <leader>n :NV <CR>
+    " 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
@@ -569,7 +577,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
@@ -580,6 +588,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

@@ -76,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
@@ -179,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/worknotes

@@ -2,4 +2,4 @@
 cd ~/mydocs/work/divault
 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" planning_2021.todo notes.md

install.sh

@@ -87,7 +87,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