config: refactor, accept more possible config dirs

I'm starting to favor dotfiles over XDG basedirs, but there's no reason
why we couldn't have both. So now the search path is:

0. if config was set through -C, use that
1. $CHA_CONFIG_DIR is set -> $CHA_CONFIG_DIR/config.toml
2. $XDG_CONFIG_HOME is set -> $XDG_CONFIG_HOME/chawan/config.toml
3. ~/.config/chawan/config.toml exists -> use that
4. ~/.chawan/config.toml exists -> use that

Notably, this makes it so the default directory is ~/.chawan *if* you
don't have an existing config.toml file. So in that case known_hosts
will be placed in ~/.chawan/known_hosts. However, configurations with a
config in ~/.config/chawan/config.toml continue to work as expected, as
for those the known_hosts file remains inside ~/.config/chawan/.

Finally, I've added a default user CGI directory to reduce friction in
setting CGI up. (Like known_hosts, it's also relative to whatever config
dir you have.)

1 files changed, 1 insertions, 1 deletions

diff --git a/res/config.toml b/res/config.toml
index 56847db7..9fa79079 100644
--- a/res/config.toml
+++ b/res/config.toml
@@ -269,7 +269,7 @@ urimethodmap = [
 tmpdir = "/tmp/cha-tmp-$LOGNAME"
 sockdir = "/tmp/cha-sock-$LOGNAME"
 editor = "${EDITOR:-vi}"
-cgi-dir = "${%CHA_LIBEXEC_DIR}/cgi-bin"
+cgi-dir = ["$CHA_CONFIG_DIR/cgi-bin", "$CHA_LIBEXEC_DIR/cgi-bin"]
 download-dir = "/tmp/"
 w3m-cgi-compat = false