diff options
| author | Tom Ryder <tom@sanctum.geek.nz> | 2022-04-27 21:25:03 +1200 |
|---|---|---|
| committer | Tom Ryder <tom@sanctum.geek.nz> | 2022-04-27 21:25:03 +1200 |
| commit | 1287cf7167393a17497ae1aa33ac7c7bb47a3964 (patch) | |
| tree | 1bfae27d76dfe60f13287b353be39fb37d09518c /X | |
| parent | Refine browser selection logic (diff) | |
| download | dotfiles-1287cf7167393a17497ae1aa33ac7c7bb47a3964.tar.gz dotfiles-1287cf7167393a17497ae1aa33ac7c7bb47a3964.zip | |
Switch .xinitrc to .xsession
This is Debian-specific, but that's the only system with which I'm
presently using X11 anyway.
From Debian's startx(1):
> Note that in the Debian system, what many people traditionally put in
> the .xinitrc file should go in .xsession instead; this permits the
> same X environment to be presented whether startx, xdm, or xinit is
> used to start the X session. All discussion of the .xinitrc file in
> the xinit(1) manual page applies equally well to .xsession. Keep in
> mind that .xinitrc is used only by xinit(1) and completely ignored by
> xdm(1).
Indeed, everything just seems to work a bit better, probably because
problems are more likely to be able to find the user instance of dbus.
Diffstat (limited to 'X')
| -rw-r--r-- | X/xsession (renamed from X/xinitrc) | 9 | ||||
| -rw-r--r-- | X/xsession.d/background.sh (renamed from X/xinitrc.d/background.sh) | 0 | ||||
| -rw-r--r-- | X/xsession.d/browser.sh (renamed from X/xinitrc.d/browser.sh) | 0 | ||||
| -rw-r--r-- | X/xsession.d/dunst.sh (renamed from X/xinitrc.d/dunst.sh) | 0 | ||||
| -rw-r--r-- | X/xsession.d/redshift.sh (renamed from X/xinitrc.d/redshift.sh) | 0 | ||||
| -rw-r--r-- | X/xsession.d/ssh.sh (renamed from X/xinitrc.d/ssh.sh) | 0 | ||||
| -rw-r--r-- | X/xsession.d/sxhkd.sh (renamed from X/xinitrc.d/sxhkd.sh) | 0 | ||||
| -rw-r--r-- | X/xsession.d/urxvt.sh (renamed from X/xinitrc.d/urxvt.sh) | 0 | ||||
| -rw-r--r-- | X/xsession.d/xkb.sh (renamed from X/xinitrc.d/xkb.sh) | 0 |
9 files changed, 3 insertions, 6 deletions
@@ -2,17 +2,14 @@ # shellcheck disable=SC1091 [ -e "$HOME"/.xrandrrc ] && . "$HOME"/.xrandrrc -# Read X resources -xrdb "$HOME"/.Xresources - # Faster mouse acceleration with a natural threshold xset mouse 5/2 0 -# Load all supplementary scripts in ~/.xinitrc.d -for sh in "$HOME"/.xinitrc.d/*.sh ; do +# Load all supplementary scripts in ~/.xsession.d +for sh in "$HOME"/.xsession.d/*.sh ; do [ -e "$sh" ] && . "$sh" done unset -v sh -# Start window manager +# Start i3 window manager exec i3 diff --git a/X/xinitrc.d/background.sh b/X/xsession.d/background.sh index 85a40889..85a40889 100644 --- a/X/xinitrc.d/background.sh +++ b/X/xsession.d/background.sh diff --git a/X/xinitrc.d/browser.sh b/X/xsession.d/browser.sh index 024075d6..024075d6 100644 --- a/X/xinitrc.d/browser.sh +++ b/X/xsession.d/browser.sh diff --git a/X/xinitrc.d/dunst.sh b/X/xsession.d/dunst.sh index bddaa1fe..bddaa1fe 100644 --- a/X/xinitrc.d/dunst.sh +++ b/X/xsession.d/dunst.sh diff --git a/X/xinitrc.d/redshift.sh b/X/xsession.d/redshift.sh index d5d58d8a..d5d58d8a 100644 --- a/X/xinitrc.d/redshift.sh +++ b/X/xsession.d/redshift.sh diff --git a/X/xinitrc.d/ssh.sh b/X/xsession.d/ssh.sh index 005743fe..005743fe 100644 --- a/X/xinitrc.d/ssh.sh +++ b/X/xsession.d/ssh.sh diff --git a/X/xinitrc.d/sxhkd.sh b/X/xsession.d/sxhkd.sh index 132d8f8a..132d8f8a 100644 --- a/X/xinitrc.d/sxhkd.sh +++ b/X/xsession.d/sxhkd.sh diff --git a/X/xinitrc.d/urxvt.sh b/X/xsession.d/urxvt.sh index a5eb0940..a5eb0940 100644 --- a/X/xinitrc.d/urxvt.sh +++ b/X/xsession.d/urxvt.sh diff --git a/X/xinitrc.d/xkb.sh b/X/xsession.d/xkb.sh index a5142398..a5142398 100644 --- a/X/xinitrc.d/xkb.sh +++ b/X/xsession.d/xkb.sh |