From e944770cad8c51c6c25c7e55e3ab775812999e49 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 2 Dec 2020 09:17:16 +0100
Subject: [PATCH] merge

---
 cal/.config/tudu/config | 4 ++++
 config.h/st/st          | 2 +-
 shell/.bashrc           | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cal/.config/tudu/config b/cal/.config/tudu/config
index 971b3e4..379d804 100644
--- a/cal/.config/tudu/config
+++ b/cal/.config/tudu/config
@@ -1,2 +1,6 @@
 [ general ]
 visual_tree = yes
+loop_move = yes
+sort_order = Dt
+editor = 'vi %s'
+tudu_file = /home/mrl/.local/share/tudu/tudu.xml
diff --git a/config.h/st/st b/config.h/st/st
index fa253f0..4ef0cbd 160000
--- a/config.h/st/st
+++ b/config.h/st/st
@@ -1 +1 @@
-Subproject commit fa253f077f19b3220c7655b81bd91e52f4367803
+Subproject commit 4ef0cbd8b9371f37f7d02ef37b5378b879e6b8bf
diff --git a/shell/.bashrc b/shell/.bashrc
index 5df7160..6ebfb8f 100644
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -16,7 +16,7 @@ export SUDO_ASKPASS=/usr/lib/ssh/ssh-askpass
 # XDG fixes
 alias svn="svn --config-dir \"${XDG_CONFIG_HOME:-$HOME/.config}\"/subversion"
 alias tmux="tmux -f \"${XDG_CONFIG_HOME:-$HOME/.config}/tmux/config\""
-alias tudu="tudu -f \"${XDG_DATA_HOME:-$HOME/.local/share}\"/tudu/tudu.xml -c \"${XDG_CONFIG_HOME:-$HOME/.config}/tudu/config\""
+alias tudu="tudu -c \"${XDG_CONFIG_HOME:-$HOME/.config}/tudu/config\""
 export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}"/notmuch/config
 export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}"/pass
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
-- 
2.20.1