Merge branch 'main' into thinkpad-x1-carbon

home/bin/notes-collect-metadata

@@ -22,7 +22,7 @@ def resolve_target(target, page):
     # This will break if you're trying to link to foo/diary/2023-01-01 instead
     # of /diary/2023-01-01, but at least within my notes that's not something
     # I do, and it's probably a rare case in general.
-    if re.search('diary/\d{4}-\d{2}-\d{2}', target):
+    if re.search(r'diary/\d{4}-\d{2}-\d{2}', target):
         return target
 
     # At this point, we should be fairly confident the link is a wiki page.
@@ -54,6 +54,7 @@ def resolve_target(target, page):
     resolved_path.reverse()
     return '/'.join(resolved_path)
 
+
 def extract_values(elem, doc):
     """Extract links from given document, write to sqlite."""
 
@@ -90,8 +91,13 @@ for input_file in sys.argv[1:]:
 
     # Trim leading directory and .wiki extension:
     # XXX: This fails badly if in a symlinked path
+    #      What to do here?
     input_file_abspath = os.path.abspath(input_file)
     pagename = input_file_abspath.replace(vimwiki_dir + os.sep, '', 1)
+
+    # XXX: HACK:
+    pagename = pagename.replace('/media/brennen/n/notes/vimwiki/', '', 1)
+
     pagename = os.path.splitext(pagename)[0]
 
     # XXX: do real logging

install.sh

@@ -1,17 +1,21 @@
 #!/bin/sh
 
+set -ex
+
 KIT_ROOT=$(pwd)
 
 echo "installing kit from $KIT_ROOT"
 
+# TODO: xautolock?
+
 echo 'installing package prereqs'
 sudo apt-get install build-essential xterm tmux vim perl ack-grep \
 git git-gui htop zsh suckless-tools figlet xmonad trayer xmobar \
 volumeicon-alsa diodon curl jq byzanz festival redshift-gtk ranger \
 rofi xsettingsd wmctrl lynx perl-doc dict moreutils myrepos etckeeper \
 bzr cvs darcs mercurial subversion subversion-tools dunst i3lock \
-fzf xclip xsel xautolock pngphoon tree scrot pandoc dnsutils \
-pasystray pavucontrol exa shellcheck \
+fzf xclip xsel pngphoon tree scrot pandoc dnsutils \
+pasystray pavucontrol eza shellcheck \
   bsdmainutils \
   calendar \
   visidata \
@@ -22,10 +26,10 @@ pasystray pavucontrol exa shellcheck \
   yubikey-manager \
   mosh \
   xcalib \
-  icc-profiles
+  icc-profiles-free
 
 echo 'installing some extra fonts'
-sudo apt-get install fonts-noto-color-emoji fonts-liberation fonts-roboto-hinted texlive-fonts-extra
+sudo apt-get install fonts-noto-color-emoji fonts-liberation texlive-fonts-extra
 
 echo 'installing pandoc from cabal'
 # TODO: restore this or put it elsewhere
@@ -34,12 +38,11 @@ echo 'installing pandoc from cabal'
 
 echo 'installing perl dependencies'
 # TODO: Some of these belong with specific progs:
-sudo cpan -i Module::Build App::WRT DBI SQL::Abstract DBD::SQLite XML::FeedPP
+sudo cpan -T -i Module::Build App::WRT DBI SQL::Abstract DBD::SQLite XML::FeedPP
 
 # TODO: These need to go in a venv now?
 echo 'installing python dependencies and utils'
-sudo apt-get install python3-pip
-
+sudo apt-get install python3-pip python3.13-venv
 if [ ! -d ~/python_bullshit ]; then
   python3 -m venv ~/python_bullshit
   ~/python_bullshit/bin/pip3 install panflute