aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2022-04-27 21:25:03 +1200
committerTom Ryder <tom@sanctum.geek.nz>2022-04-27 21:25:03 +1200
commit1287cf7167393a17497ae1aa33ac7c7bb47a3964 (patch)
tree1bfae27d76dfe60f13287b353be39fb37d09518c /Makefile
parentRefine browser selection logic (diff)
downloaddotfiles-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 'Makefile')
-rw-r--r--Makefile22
1 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index df6f04d1..1beb06fd 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@
check-man \
check-sh \
check-urxvt \
- check-xinit \
+ check-xsession \
check-zsh \
lint \
lint-bash \
@@ -75,7 +75,7 @@
lint-sh \
lint-urxvt \
lint-vim \
- lint-xinit
+ lint-xsession
.SUFFIXES:
.SUFFIXES: .awk .bash .m4 .mi5 .pl .sed .sh
@@ -624,15 +624,15 @@ install-wget: install-sh
mkdir -p -- $(XDG_CACHE_HOME)/wget $(XDG_CONFIG_HOME)/wget
cp -p -- wget/wgetrc $(XDG_CONFIG_HOME)/wget/wgetrc
-install-x: check-xinit
+install-x: check-xsession
mkdir -p -- \
$(XDG_CONFIG_HOME)/sxhkd \
- $(HOME)/.xinitrc.d \
+ $(HOME)/.xsession.d \
$(HOME)/.Xresources.d
cp -p -- X/redshift.conf $(XDG_CONFIG_HOME)
cp -p -- X/sxhkdrc $(XDG_CONFIG_HOME)/sxhkd
- cp -p -- X/xinitrc $(HOME)/.xinitrc
- cp -p -- X/xinitrc.d/*.sh $(HOME)/.xinitrc.d
+ cp -p -- X/xsession $(HOME)/.xsession
+ cp -p -- X/xsession.d/*.sh $(HOME)/.xsession.d
cp -p -- X/Xresources $(HOME)/.Xresources
cp -p -- X/Xresources.d/* $(HOME)/.Xresources.d
@@ -680,8 +680,8 @@ check-sh:
check-urxvt: urxvt/ext/select
sh check/urxvt.sh
-check-xinit:
- sh check/xinit.sh
+check-xsession:
+ sh check/xsession.sh
check-zsh:
sh check/zsh.sh
@@ -694,7 +694,7 @@ lint: lint-bash \
lint-sh \
lint-urxvt \
lint-vim \
- lint-xinit
+ lint-xsession
lint-bash: check-bash
sh lint/bash.sh
@@ -720,5 +720,5 @@ lint-urxvt: check-urxvt
lint-vim:
sh lint/vim.sh
-lint-xinit: check-xinit
- sh lint/xinit.sh
+lint-xsession: check-xsession
+ sh lint/xsession.sh