aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2022-06-03 20:58:37 +1200
committerTom Ryder <tom@sanctum.geek.nz>2022-06-03 21:02:58 +1200
commitd6976b6f4b33e6149d82b0b89998755512755f28 (patch)
tree575565c93da44491019b4b2568b79f5469afc45b
parentMerge branch 'release/v12.7.0' into develop (diff)
downloaddotfiles-d6976b6f4b33e6149d82b0b89998755512755f28.tar.gz
dotfiles-d6976b6f4b33e6149d82b0b89998755512755f28.zip
Merge install-dunst into install-x
-rw-r--r--Makefile4
-rw-r--r--dunst/xsession.d/dunst.sh2
-rw-r--r--x/xsession.sh9
3 files changed, 6 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index c3c3c2ca..c1380a26 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@
install-cpanm \
install-curl \
install-dillo \
- install-dunst \
install-emacs \
install-ex \
install-finger \
@@ -423,9 +422,6 @@ install-dillo: dillo/dillorc install-x
mkdir -p -- $(HOME)/.dillo
cp -p -- dillo/dillorc $(HOME)/.dillo/dillorc
-install-dunst: install-x
- cp -p -- dunst/xsession.d/* $(HOME)/.xsession.d
-
install-emacs: emacs/bin/emacsm install-sh
mkdir -p -- $(HOME)/.local/bin
cp -p -- emacs/emacs $(HOME)/.emacs
diff --git a/dunst/xsession.d/dunst.sh b/dunst/xsession.d/dunst.sh
deleted file mode 100644
index 6aad0c86..00000000
--- a/dunst/xsession.d/dunst.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Start dunst(1) to display libnotify messages
-dunst &
diff --git a/x/xsession.sh b/x/xsession.sh
index 3475c0bd..d2d9439c 100644
--- a/x/xsession.sh
+++ b/x/xsession.sh
@@ -1,5 +1,9 @@
# Custom X session to fit into Debian's way of doing things
+# Update browser, since .profile set this to a curses browser on login
+# shellcheck disable=SC2034
+BROWSER=x-www-browser
+
# 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
# with xargs and looking for a file with argument tokens to read in
@@ -42,9 +46,8 @@ xset \
s off \
&
-# Update browser, since .profile set this to a curses browser on login
-# shellcheck disable=SC2034
-BROWSER=x-www-browser
+# Start dunst(1) to display libnotify messages
+dunst &
# Load all supplementary scripts in ~/.xsession.d
for sh in "$HOME"/.xsession.d/*.sh ; do