2 files changed, 14 insertions(+), 8 deletions(-)

M bin/tiles
M doc/tiles.7.scd

@@ 33,7 33,10 @@ start)
 		echo 'tiles: Already in a session.' >&2
 		exit 1
 	else
-		${TILES_HOTKEY_DAEMON:-sxhkd -c /etc/tiles/sxhkd/sxhkdrc} &
+		c="${XDG_CONFIG_HOME:-$HOME/.config}/tiles"
+		${TILES_HOTKEY_DAEMON:-sxhkd -c
+			"$([ -e "$c/sxhkd/sxhkdrc" ] && printf %s\\n "$c/sxhkd/sxhkdrc" || echo /etc/tiles/sxhkd/sxhkdrc)"
+			$(find "$c/sxhkd/additional" -maxdepth 1 -name '*.sxhkd' 2>/dev/null)} &
 		dunst -conf /etc/tiles/dunst/dunstrc &
 		unclutter &
 		"${TILES_COMPOSITOR:-picom}" &

@@ 190,7 190,10 @@ These override the keybound programs:
 
 *TILES_HOTKEY_DAEMON* overrides the executable that provides the keybindings.
 It is run in the background.  The default setup uses *sxhkd* with the config
-at */etc/tiles/sxhkd/sxhkdrc*.
+at */etc/tiles/sxhkd/sxhkdrc* or *$XDG_CONFIG_HOME/tiles/sxhkd/sxhkdrc*
+if it exists, and any additional files ending with *.sxhkd* in
+*$XDG_CONFIG_HOME/tiles/sxhkd/additional/*. (*$XDG_CONFIG_HOME* is *~/.config*
+unless set otherwise.)
 
 *TILES_WINDOW_MANAGER* overrides the executable that provides the behavior
 of your desktop.  The default setup uses *bspwm* with the config at


@@ 206,9 209,9 @@ time you focus a desktop.  The default is */usr/libexec/tiles/wallpaper*.
 
 ## TILES-BROWSER
 
-*tiles-browser* sources any additional config files ending with *.py* in the
-*$XDG_CONFIG_HOME/tiles/browser/additional/* directory.  (*$XDG_CONFIG_HOME*
-is *~/.config* unless set otherwise.)
+*tiles-browser* sources any additional config files ending with *.py*
+in *$XDG_CONFIG_HOME/tiles/browser/additional/*.  (*$XDG_CONFIG_HOME* is
+*~/.config* unless set otherwise.)
 
 For reference, the *tiles-browser* config is at
 */etc/tiles/qutebrowser/config.py*.


@@ 223,8 226,8 @@ is *~/.config* unless set otherwise.)
 The environment variable *TILES_SHELL_STARTUP* specifies a script to be sourced
 on login and overrides the default behavior of starting X on virtual console 1.
 
-*tiles-shell* sources any additional zshrc files ending with *.zsh* in the
-*$XDG_CONFIG_HOME/tiles/shell/additional/* directory.  (*$XDG_CONFIG_HOME*
-is *~/.config* unless set otherwise.)
+*tiles-shell* sources any additional zshrc files ending with *.zsh*
+in *$XDG_CONFIG_HOME/tiles/shell/additional/*.  (*$XDG_CONFIG_HOME* is
+*~/.config* unless set otherwise.)
 
 For reference, the *tiles-shell* zshrc is at */etc/tiles/zsh/.zshrc*.