Merge branch 'master' of https://github.com/dopefishh/dotfiles

diff --git a/cal/.config/khal/config b/cal/.config/khal/config
index 9b725e6..737bbbd 100644 (file)
--- a/cal/.config/khal/config
+++ b/cal/.config/khal/config
@@ -43,3 +43,6 @@ firstweekday = 0
 default_command = calendar
 default_calendar = mart
 show_all_days = True
+
+[keybindings]
+external_edit = E

diff --git a/cal/.config/todoman/todoman.conf b/cal/.config/todoman/todoman.conf
index e58ff26..2c995d4 100644 (file)
--- a/cal/.config/todoman/todoman.conf
+++ b/cal/.config/todoman/todoman.conf
@@ -1,5 +1,5 @@
 [main]
-path = ~/.local/share/vdirsyncer/tasks/default
+path = ~/.local/share/vdirsyncer/tasks/*
 humanize = true
 default_list = default
 default_due = 0

diff --git a/cal/.config/tudu/config b/cal/.config/tudu/config
new file mode 100644 (file)
index 0000000..971b3e4
--- /dev/null
+++ b/cal/.config/tudu/config
@@ -0,0 +1,2 @@
+[ general ]
+visual_tree = yes

diff --git a/clean/.local/bin/rmabc.sh b/clean/.local/bin/rmabc.sh
index bd7f372..7d37a15 100755 (executable)
--- a/clean/.local/bin/rmabc.sh
+++ b/clean/.local/bin/rmabc.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-find . "$CLEAN_HOME" -type f -name "*.abc" -not -name "_system.abc" -delete
+find "${1:-.}" "$CLEAN_HOME" -type f -name "*.abc" -not -name "_system.abc" -delete

diff --git a/shell/.bashrc b/shell/.bashrc
index 96202f5..060ac34 100644 (file)
--- a/shell/.bashrc
+++ b/shell/.bashrc
@@ -16,6 +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\""
 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"
@@ -23,10 +24,9 @@ export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 export CLEAN_HOME=/opt/clean-x64
 
 export PATH=~/.local/bin:$PATH
-export PATH=$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin:$PATH
 export PATH=/opt/texlive/2020/bin/x86_64-linux:/opt/zotero:/opt/arduino:/opt/beets/bin:/opt/firefox:$PATH
 
-export MANPATH=~/.local/share/man:/opt/texlive/2020/texmf-dist/doc/man:./arduino/java/man:$MANPATH
+export MANPATH=~/.local/share/man:/opt/texlive/2020/texmf-dist/doc/man:/opt/arduino/java/man:$MANPATH
 
 export GTK_IM_MODULE=xim
 export QT_IM_MODULE=xim