aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile22
-rw-r--r--README.md2
-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
-rw-r--r--check/xinit.sh6
-rw-r--r--check/xsession.sh6
-rw-r--r--lint/xsession.sh (renamed from lint/xinit.sh)4
-rw-r--r--man/man1/xrbg.1df4
-rw-r--r--man/man7/dotfiles.7df2
-rw-r--r--sh/profile.d/browser.sh4
-rw-r--r--vim/filetype.vim6
18 files changed, 33 insertions, 32 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
diff --git a/README.md b/README.md
index dc609744..bf2bae83 100644
--- a/README.md
+++ b/README.md
@@ -656,7 +656,7 @@ available to run them:
- `lint-games`
- `lint-ksh`
- `lint-sh`
- - `lint-xinit`
+ - `lint-xsession`
- Perl::Critic:
- `lint-urxvt`
- [Vint](https://github.com/Kuniwak/vint):
diff --git a/X/xinitrc b/X/xsession
index b5041f8c..b8fdcce6 100644
--- a/X/xinitrc
+++ b/X/xsession
@@ -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
diff --git a/check/xinit.sh b/check/xinit.sh
deleted file mode 100644
index a354422a..00000000
--- a/check/xinit.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set \
- X/xinitrc \
- X/xinitrc.d/*.sh
-for xinit do
- sh -n -- "$xinit" || exit
-done
diff --git a/check/xsession.sh b/check/xsession.sh
new file mode 100644
index 00000000..0e8db668
--- /dev/null
+++ b/check/xsession.sh
@@ -0,0 +1,6 @@
+set \
+ X/xsession \
+ X/xsession.d/*.sh
+for xsession do
+ sh -n -- "$xsession" || exit
+done
diff --git a/lint/xinit.sh b/lint/xsession.sh
index 0fab84d2..fd60c864 100644
--- a/lint/xinit.sh
+++ b/lint/xsession.sh
@@ -1,4 +1,4 @@
set \
- X/xinitrc \
- X/xinitrc.d/*.sh
+ X/xsession \
+ X/xsession.d/*.sh
shellcheck -e SC1090 -s sh -- "$@"
diff --git a/man/man1/xrbg.1df b/man/man1/xrbg.1df
index 14bfbc7d..9c067ff9 100644
--- a/man/man1/xrbg.1df
+++ b/man/man1/xrbg.1df
@@ -11,8 +11,8 @@ XBACKGROUNDS=/path/to/images
.B xrbg
searches for images in the directory named in the XBACKGROUNDS environment
variable (defaults to ~/.xbackgrounds), chooses a random one with rndf(1df),
-and applies it with feh(1). It's designed for use in ~/.xinitrc, but it seems
-to work when called manually from within an X session too.
+and applies it with feh(1). It's designed for use in X startup files, but it
+seems to work when called manually from within an X session too.
.SH SEE ALSO
feh(1), rndf(1df)
.SH AUTHOR
diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df
index ea6d3080..02f49d0b 100644
--- a/man/man7/dotfiles.7df
+++ b/man/man7/dotfiles.7df
@@ -1043,7 +1043,7 @@ ShellCheck (https://www.shellcheck.net/):
.IP \[bu] 2
\f[C]lint-sh\f[R]
.IP \[bu] 2
-\f[C]lint-xinit\f[R]
+\f[C]lint-xsession\f[R]
.RE
.IP \[bu] 2
Perl::Critic:
diff --git a/sh/profile.d/browser.sh b/sh/profile.d/browser.sh
index 2c724505..ee94857c 100644
--- a/sh/profile.d/browser.sh
+++ b/sh/profile.d/browser.sh
@@ -1,4 +1,4 @@
-# Set command-line browser to lynx; ~/.xinitrc will change this to something
-# graphical instead
+# Set command-line browser to lynx; ~/.xsession will change this to something
+# graphical instead if invoked
BROWSER=lynx
export BROWSER
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 91cc1ec5..c461e503 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -363,12 +363,16 @@ augroup filetypedetect
\,.shinit
\,.shrc
\,.xinitrc
+ \,.xsession
+ \,.xsessionrc
\,/etc/default/*
\,configure
\,profile
\,shinit
\,shrc
- \,xinitrc
+ \,/etc/X11/xinit
+ \,/etc/X11/Xreset
+ \,/etc/X11/Xsession
\ let b:is_posix = 1
\|setfiletype sh
" SQL
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 01:09:49 +0000