From ac611e33e3f64daaa83cda3e08d041390dc52ba0 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Fri, 26 Jul 2024 13:18:35 +0100
Subject: [PATCH 1/7] Set desktop background

---
 X/.xinitrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/X/.xinitrc b/X/.xinitrc
index 4da8c0c..161b57a 100644
--- a/X/.xinitrc
+++ b/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 &
 
 # Swap CAPSLOCK and Escape
 setxkbmap -option caps:swapescape gb &

From f496e01a0dfcb89879d59b50a0052ef23f398c62 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Fri, 26 Jul 2024 13:18:53 +0100
Subject: [PATCH 2/7] Set vimdiff as default mergetool

---
 git/.gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index 4391554..8612cf6 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,3 +3,5 @@
 [user]
 	name = The Magician
 	email = themagician@engineer.com
+[merge]
+	tool = vimdiff

From d0c49138e563455d2a157309d6633117bb96c212 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Fri, 26 Jul 2024 13:19:23 +0100
Subject: [PATCH 3/7] Add skill values

---
 task/.config/task/taskrc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/task/.config/task/taskrc b/task/.config/task/taskrc
index 8585b27..cf21a50 100644
--- a/task/.config/task/taskrc
+++ b/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

From 67a54b929715e3a806c7aceaad8549cb76240b49 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Fri, 26 Jul 2024 13:19:34 +0100
Subject: [PATCH 4/7] Add function to show syntax segments

---
 vim/.vimrc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/vim/.vimrc b/vim/.vimrc
index 33ff5a8..bf71edc 100644
--- a/vim/.vimrc
+++ b/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
 

From dc4b08288cd9d257ebecc3c5fda944f8adc9865c Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Tue, 30 Jul 2024 16:08:09 +0100
Subject: [PATCH 5/7] Make X launch work when logging in via any tty

---
 bash/.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 69cc228..cd9e326 100644
--- a/bash/.bashrc
+++ b/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 -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

From 558b2611cf1c8343921859d6b98db2e4221103b4 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Fri, 9 Aug 2024 14:07:17 +0100
Subject: [PATCH 6/7] Only check if current user has an X session

---
 bash/.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index cd9e326..e7e4501 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -73,7 +73,7 @@ md() {
 }
 
 # Automatically run X if this is a login tty
-[[ "$(tty)" == /dev/tty* ]] && ! 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

From 25f53401622ebf97cd463da2490b6e98f481aa0f Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Fri, 9 Aug 2024 14:08:24 +0100
Subject: [PATCH 7/7] Use glob comparison properly

---
 bash/.bashrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index e7e4501..9995d33 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -73,7 +73,7 @@ md() {
 }
 
 # Automatically run X if this is a login tty
-[[ "$(tty)" == /dev/tty* ]] && ! pgrep -u "$(whoami)" -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