Merge branch 'master' of github.com:aquatix/dotfiles

Vim todo

.bashrc

@@ -177,6 +177,7 @@ if [ -e ~/.ssh/config.d ]; then
             [ -e ~/.ssh/config ] && mv ~/.ssh/config ~/.ssh/config.bak.$(date -Is)
             # Lets preserve order, so you can have  00_generic 10_homestuff 20_work1 21_work2  and such
             find ~/.ssh/config.d/* -type f -print0 | sort -z | xargs -0 -n1 cat > ~/.ssh/config
+            chmod 600 ~/.ssh/config
         fi
     fi
 fi

.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,12 +3,11 @@ set EDITOR vim
 
 set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
 
-if not functions -q fisher
-    echo "Installing fisher for the first time..." >&2
-    set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
-    curl https://git.io/fisher --create-dirs -sLo $XDG_CONFIG_HOME/fish/functions/fisher.fish
-    fish -c fisher
-end
+#if not functions -q fisher
+#    DO NOT ENABLE, it is a fork bomb :)
+#    echo "Installing fisher for the first time..." >&2
+#    curl -sL https://git.io/fisher | source && fisher update
+#end
 
 # Theme options for bobthefish
 set -g theme_nerd_fonts yes
@@ -28,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
@@ -65,6 +69,9 @@ alias la 'ls -A'
 alias l 'ls -CF'
 alias lll 'ls --color=always -alF | less -R'
 
+alias exa 'exa --icons --header --group-directories-first'
+alias exatree 'exa --icons --header --group-directories-first --long --tree'
+
 ## Git
 alias gu "git pull --all"
 alias gp "git push; git push --tags"

.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

@@ -65,3 +65,9 @@
 	insteadOf = "bitbucket:"
 [pull]
 	rebase = false
+[safe]
+	directory = /storage/emulated/0/Git/phren
+	directory = /storage/emulated/0/Git/divaultphren
+	directory = /storage/emulated/0/Git/mydocs
+	directory = /data/data/com.termux/files/home/.dot/dotfiles/
+	directory = /storage/emulated/0/Git/dammit.nl

.gitignore

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

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

@@ -159,3 +159,66 @@ Efteling
 wokgerecht
 rundersaucijs
 Loïs
+Pfizer
+gehaktsaus
+aardappelkroketjes
+AMD
+Assetto
+Corsa
+Wii
+gymkleding
+kutweer
+whoa
+bistrokrieltjes
+dumbbells
+naproxen
+nerden
+E-depot
+Carcassonne
+groepsles
+kennismakingsdag
+Jira
+chippies
+Battlefield
+webinar
+phren
+farfalle
+streamen
+ieuw
+kattenpoep
+kerstontbijt
+ThinkPad
+spelavond
+comics
+refinement
+datacentrum
+zometeen
+hyper
+inductieplaat
+level
+Europaplein
+Blendle
+prutten
+mirai
+kernel
+VPN
+schrapend
+wastafelkraan
+cracottes
+cracotte
+Picard
+nerdcave
+Röyksopp
+Linnaeushof
+recruiter
+Decathlon
+aqua
+Cineworld
+Panta
+Rhei
+hey
+Zoë
+voilà
+Daan's
+Pinkeltje
+awesome

.vimrc

@@ -271,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
 
@@ -376,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
@@ -420,36 +432,21 @@ Plug 'skanehira/preview-markdown.vim'
 let g:preview_markdown_vertical = 1
 
 " Navigate through and from markdown files
-"Plug 'chmp/mdnav'
 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'
-" let g:wiki_root = '~/wiki'
-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:
-let g:wiki_tags_format_pattern = '\v%(^|\s)#\zs[^# ]+'
-" number of lines from the top to scan for tags
-let g:wiki_tags_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>
+" 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']
+    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>
@@ -489,7 +486,10 @@ 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/*", "*.vim/plugged/*"]
+let g:gutentags_ctags_exclude = ["*.min.*", "build", ".bundle", ".git", "log", "node_modules", ".obsidian/*", "tmp", "vendor", "*.vim/bundle/*", "*.vim/plugged/*"]
+" use ripgrep to create list of files to index, which should help with
+" ignoring non-versioned files, for example with .gitignore
+let g:gutentags_file_list_command = 'rg --files'
 "let g:gutentags_trace = 1
 
 
@@ -521,6 +521,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 ============================================================
 
 

bin/font_update

@@ -29,22 +29,24 @@ Futura-Std-Bold-Oblique_19041.ttf
 Futura-Std-Book_19044.ttf
 Futura-Std-Book-Oblique_19043.ttf'
 
-FONTS_OVERPASS=$'overpass-bold-italic.otf
-overpass-bold.otf
-overpass-extrabold-italic.otf
-overpass-extrabold.otf
-overpass-extralight-italic.otf
-overpass-extralight.otf
-overpass-heavy-italic.otf
-overpass-heavy.otf
-overpass-italic.otf
-overpass-light-italic.otf
-overpass-light.otf
-overpass-regular.otf
-overpass-semibold-italic.otf
-overpass-semibold.otf
-overpass-thin-italic.otf
-overpass-thin.otf'
+FONTS_OVERPASS=$'Overpass-BlackItalic.ttf
+Overpass-Black.ttf
+Overpass-BoldItalic.ttf
+Overpass-Bold.ttf
+Overpass-ExtraBoldItalic.ttf
+Overpass-ExtraBold.ttf
+Overpass-ExtraLightItalic.ttf
+Overpass-ExtraLight.ttf
+Overpass-Italic.ttf
+Overpass-LightItalic.ttf
+Overpass-Light.ttf
+Overpass-MediumItalic.ttf
+Overpass-Medium.ttf
+Overpass-Regular.ttf
+Overpass-SemiBoldItalic.ttf
+Overpass-SemiBold.ttf
+Overpass-ThinItalic.ttf
+Overpass-Thin.ttf'
 
 FONTS_JETBRAINS=$'JetBrainsMono-Bold-Italic.ttf
 JetBrainsMono-Bold.ttf
@@ -88,7 +90,23 @@ Knack RegularOblique Plus Nerd File Types Plus Font Awesome Plus Octicons Plus P
 Knack Bold Nerd Font Complete Mono.ttf
 Knack Regular Nerd Font Complete Mono.ttf
 Knack Bold Italic Nerd Font Complete Mono.ttf
-Knack Italic Nerd Font Complete Mono.ttf'
+Knack Italic Nerd Font Complete Mono.ttf
+overpass-bold-italic.otf
+overpass-bold.otf
+overpass-extrabold-italic.otf
+overpass-extrabold.otf
+overpass-extralight-italic.otf
+overpass-extralight.otf
+overpass-heavy-italic.otf
+overpass-heavy.otf
+overpass-italic.otf
+overpass-light-italic.otf
+overpass-light.otf
+overpass-regular.otf
+overpass-semibold-italic.otf
+overpass-semibold.otf
+overpass-thin-italic.otf
+overpass-thin.otf'
 
 if [ -e ~/.dot_is_server ]; then
     # Update from the repo
@@ -108,7 +126,7 @@ if [ -e ~/.dot_is_server ]; then
 
     # Update from the repo
     echo "== Jetbrains Mono ======"
-    SOURCE_DIR="/stuff/system/fonts/JetBrainsMono/ttf"
+    SOURCE_DIR="/stuff/system/fonts/JetBrainsMono/fonts/ttf"
     DEST_DIR="/stuff/system/sync/fonts/active"
     if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
         cd "$SOURCE_DIR"
@@ -123,7 +141,7 @@ if [ -e ~/.dot_is_server ]; then
 
     # Update from the repo
     echo "== Overpass ======"
-    SOURCE_DIR="/stuff/system/fonts/Overpass/desktop-fonts/overpass"
+    SOURCE_DIR="/stuff/system/fonts/Overpass/fonts/ttf"
     DEST_DIR="/stuff/system/sync/fonts/active"
     if [ -d "$SOURCE_DIR" ] && [ -d "$DEST_DIR" ]; then
         cd "$SOURCE_DIR"

bin/mac.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Stolen from https://raw.githubusercontent.com/Cybertinus/macvendor_extractor/master/mac.sh
+
+##########
+# CONFIG #
+##########
+
+# Download from http://standards-oui.ieee.org/oui/oui.txt
+ouilocation="${HOME}/.dot/oui.txt"
+
+#################
+# ACTUAL SCRIPT #
+#################
+
+if [ ! -f "${ouilocation}" ] ; then
+	echo "OUI location can not be found at ${ouilocation}. Have you updated the config?" 1>&2
+	read -p "Do you want to download it now [y/N]? " -n 1 -r
+	echo    # (optional) move to a new line
+	if [[ $REPLY =~ ^[Yy]$ ]]
+	then
+		wget https://standards-oui.ieee.org/oui/oui.txt -O "${ouilocation}"
+	else
+		echo "Aborted"
+		exit 1
+	fi
+fi
+
+if [[ $(find "${ouilocation}" -mtime +30 -print) ]]; then
+	echo "File ${ouilocation} is older than 30 days"
+fi
+
+if [ -z "${1}" ] ; then
+	echo 'No mac address specified, please do so as first argument' 1>&2
+	exit 2
+fi
+
+macaddress="$(echo "${1}" | sed -e 's/[-.:]//g' | tr '[:lower:]' '[:upper:]')"
+macaddress="${macaddress:0:6}"
+echo -n "${1} = "
+
+vendor="$(awk "/^${macaddress}/ {print substr(\$0,index(\$0,\$4))}" "${ouilocation}")"
+if [ -z "${vendor}" ] ; then
+	echo "Not specified in ${ouilocation}"
+else
+	echo "${vendor}"
+fi
+

bin/pgadmin4

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-PGADMINVENV="pgadmin4"
-VENVDIR="$HOME/.virtualenvs/${PGADMINVENV}"
-
-if [ ! -d "$VENVDIR" ] || [ ! -e "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/pgAdmin4.py" ] || [ ! -e "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py" ]; then
-    if [[ -z "$VIRTUAL_ENV" ]]; then
-        # Only activate the virtualenv if we aren't in one already
-        source /usr/share/virtualenvwrapper/virtualenvwrapper.sh
-        mkvirtualenv "${PGADMINVENV}"
-        echo "Downloading the wheel from https://www.pgadmin.org/download/pgadmin-4-python-wheel/ ..."
-        pip install https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v1.6/pip/pgadmin4-1.6-py2.py3-none-any.whl
-        echo "SERVER_MODE = False" >> "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py"
-    fi
-
-    # Install
-    #echo
-    #echo "Download the wheel from https://www.pgadmin.org/download/pgadmin-4-python-wheel/"
-    #echo
-    #echo "Install with:"
-    #echo "workon pgadmin4"
-    #echo "pip install ./pgadmin4-1.6-py2.py3-none-any.whl"
-    #echo "echo "SERVER_MODE = False" >> ${VENVDIR}/lib/python2.7/site-packages/pgadmin4/config_local.py"
-else
-    if [[ -z "$VIRTUAL_ENV" ]]; then
-        # Only activate the virtualenv if we aren't in one already
-        source /usr/share/virtualenvwrapper/virtualenvwrapper.sh
-        workon "${PGADMINVENV}"
-    fi
-
-    # Start
-    python "${VENVDIR}/lib/python2.7/site-packages/pgadmin4/pgAdmin4.py"
-fi

bin/unzip_all

@@ -6,6 +6,5 @@ find . -type f -name '*.zip' -exec sh -c '
     zipdir=$(basename "$file" .zip)
     #echo "$zipdir $file"
     unzip -d "$zipdir" "$file"
-    read line </dev/tty
   done
 ' sh {} +

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_2021.todo notes.md
+vim -c "set nofoldenable" ~/mydocs/work/divault/planning_2022.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/completions/terrible_job.fish" "${HOME}/.config/fish/completions"
+    ln -s "${HOME}/.dot/dotfiles/.config/fish/fish_plugins" "${HOME}/.config/fish/"
     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 "And some plugins: fisher"
+    echo "curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher"
+    echo "fisher update"
     echo
 }