Moved wiki.vim config to outside the load part

Vim todo

.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

.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

.gitignore

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

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

@@ -159,3 +159,13 @@ Efteling
 wokgerecht
 rundersaucijs
 Loïs
+Pfizer
+gehaktsaus
+aardappelkroketjes
+AMD
+Assetto
+Corsa
+Wii
+gymkleding
+kutweer
+whoa

.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
@@ -428,28 +440,13 @@ let g:mdnav#Extensions = '.md, .MD, .markdown, .todo, .txt, .rst'
 
 " 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>
@@ -521,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 ============================================================
 
 

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_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/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
 }