Merge branch 'main' of git.themagician.cc:TheMagician/stow

X/.xinitrc

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Set desktop background
-command -v feh &1>/dev/null && feh --bg-scale $HOME/pix/wallpaper.jpg &
+command -v feh &1>/dev/null && feh --bg-max $HOME/pix/wallpaper.png &
 
 # Set keyboard map
 setxkbmap -option caps:swapescape 40percent &

bash/.bashrc

@@ -73,7 +73,7 @@ md() {
 }
 
 # Automatically run X if this is a login tty
-[[ "$(tty)" == "/dev/tty1" ]] && ! pgrep -x Xorg >/dev/null && startx
+[[ "$(tty)" =~ /dev/tty* ]] && ! pgrep -u "$(whoami)" -x Xorg >/dev/null && startx
 
 # Automatically run tmux if we aren't already in a session and there's no matching session already running
 if [[ -z "$TMUX" ]] && ! tmux list-sessions 2>/dev/null | grep --quiet "$HOSTNAME"; then

task/.config/task/taskrc

@@ -8,3 +8,9 @@ report.in.columns     = id,description,urgency
 report.in.labels      = ID,Description,Urgency
 report.in.filter      = status:pending limit:page (+in) (-BLOCKED)
 report.in.sort        = urgency-
+
+# 'skill' UDA
+uda.skill.type=string
+uda.skill.label=Skill
+urgency.uda.skill.coefficient=1.2
+uda.skill.values=hacking,programming,osint,digital_forensics,reverse_engineering,computer_science,networking,wireless,electronics,lockpicking,notech,data_science,music,drawing,mathematics,languages,anatomy,learning,cooking,finance,history,science,fitness,self_defence,freerunning,sex,travel,covert_ops,infiltration,zen,noskill

vim/.vimrc

@@ -34,6 +34,16 @@ else
     set shiftwidth=4
 endif
 
+function! <SID>SynStack()
+    if !exists("*synstack")
+        return
+    endif
+    echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
+endfunc
+
+" a little more informative version of the above
+nmap <C-P> :call <SID>SynStack()<CR>
+
 " Autocommands
 autocmd BufEnter ~/.local/share/zk/* set filetype=markdown