diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2022-07-27 13:36:34 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2022-07-27 13:36:34 +1200 |
| commit | ae271c83490435fe9b7ead4e0a2e67a78278b52f (patch) | |
| tree | a6f0bb150fd403abac3cb67ad28e844a68701033 | |
| parent | Merge branch 'release/v12.10.0' (diff) | |
| parent | Bump VERSION (diff) | |
| download | dotfiles-ae271c83490435fe9b7ead4e0a2e67a78278b52f.tar.gz dotfiles-ae271c83490435fe9b7ead4e0a2e67a78278b52f.zip | |
Merge branch 'release/v12.11.0'v12.11.0
* release/v12.11.0:
Include .xprofile source-parts dir
Correct path to ~/.xprofile
| -rw-r--r-- | VERSION | 4 | ||||
| -rw-r--r-- | x/xprofile | 7 | ||||
| -rw-r--r-- | x/xsession.sh | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -1,2 +1,2 @@ -tejr dotfiles v12.10.0 -Wed, 27 Jul 2022 01:28:09 +0000 +tejr dotfiles v12.11.0 +Wed, 27 Jul 2022 01:36:28 +0000 @@ -3,3 +3,10 @@ # Update browser, since .profile set this to a curses browser on login # shellcheck disable=SC2034 BROWSER=x-www-browser + +# Load all supplementary scripts in ~/.xprofile.d +for sh in "$HOME"/.xprofile.d/*.sh ; do + [ -e "$sh" ] || continue + . "$sh" +done +unset -v sh diff --git a/x/xsession.sh b/x/xsession.sh index 0219c87d..8f8ca25f 100644 --- a/x/xsession.sh +++ b/x/xsession.sh @@ -2,7 +2,7 @@ # Load common environment variables # shellcheck disable=SC1091 -. "$HOME"/.profile +. "$HOME"/.xprofile # Monitor and wallpaper setup is very machine-specific, and isn't versioned in # here. Neither xrandr(1) nor xwallpaper(1) have config files, so we fake it |