From 57c53f47aca3084159ff71071ae0010cbc521174 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 16 Feb 2024 20:48:17 -0500 Subject: [PATCH 1/3] change diff3 to zdiff3 --- dot_gitconfig.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index 6cd52ea..b996e98 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -51,4 +51,4 @@ [help] autocorrect = 20 [merge] - conflictstyle = diff3 + conflictstyle = zdiff3 From 675319fbee5f62d6c2127551f1c428b6a5d26bbb Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 16 Feb 2024 20:49:30 -0500 Subject: [PATCH 2/3] fix thunderlink xdg-open line --- dot_taskopenrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_taskopenrc b/dot_taskopenrc index d394fbb..6223218 100644 --- a/dot_taskopenrc +++ b/dot_taskopenrc @@ -24,6 +24,6 @@ url.regex="((?:www|http).*)" url.command="/usr/bin/xdg-open $LAST_MATCH" url.modes="batch,any,normal" thunderlink.regex="(cb)?thunderlink:.*" -thunderlink.command="/usr/bin/xdg-open $FILE" +thunderlink.command="/home/kellya/bin/cb_thunderlink/cb_thunderlink $FILE" joplin.regex="joplin:.*" joplin.command="/home/kellya/.joplin/Joplin.AppImage $FILE" From fe2ac6cb698bfb873f8f0f5cbffb43247de67d3f Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 16 Feb 2024 20:49:58 -0500 Subject: [PATCH 3/3] intheam is dead, remove it from the config :( --- dot_config/task/taskrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot_config/task/taskrc b/dot_config/task/taskrc index dce698a..67a60f8 100644 --- a/dot_config/task/taskrc +++ b/dot_config/task/taskrc @@ -91,6 +91,6 @@ context.work.write=+work context.home.read=-work +home or -TAGGED context.home.write=+home -include ~/.config/task/intheam +#include ~/.config/task/intheam #include ~/.config/task/wingtask context=work