aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2022-08-13 19:09:38 +1200
committerTom Ryder <tom@sanctum.geek.nz>2022-08-13 19:09:38 +1200
commit4870a60b864bef1612a4abfdacf09275326694c0 (patch)
tree50e87bb2af3d13ede9b14f7ca06eaf774ba3603c
parentRemove loading ~/.xprofile.d scripts (diff)
downloaddotfiles-4870a60b864bef1612a4abfdacf09275326694c0.tar.gz
dotfiles-4870a60b864bef1612a4abfdacf09275326694c0.zip
Adjust power management settings
It's more practical to keep DPMS enabled and to adjust its timeouts or use the `force` subcommand in `xset`.
-rw-r--r--Makefile1
-rw-r--r--x/xprofile8
-rw-r--r--x/xsession.sh4
3 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index dfe8c82a..16e51e4a 100644
--- a/Makefile
+++ b/Makefile
@@ -674,6 +674,7 @@ install-x: x/xsession check-x install-logrotate install-sh
$(XDG_CONFIG_HOME)/log/xsession
cp -p -- x/xprofile $(HOME)/.xprofile
cp -p -- x/xsession $(HOME)/.xsession
+ cp -p -- x/xsessionrc $(HOME)/.xsessionrc
cp -p -- x/Xresources $(HOME)/.Xresources
cp -p -- x/Xresources.d/* $(HOME)/.Xresources.d
cp -p -- x/logrotate/config.d/* $(XDG_CONFIG_HOME)/logrotate/config.d
diff --git a/x/xprofile b/x/xprofile
index 354df44b..1750c70b 100644
--- a/x/xprofile
+++ b/x/xprofile
@@ -1,5 +1,3 @@
-# Environment variables common to any X session
-
-# Update browser, since .profile set this to a curses browser on login
-# shellcheck disable=SC2034
-BROWSER=x-www-browser
+# Read ~/.profile to set up environment when starting X with a display manager
+# like LightDM, since we didn't have a TTY login arrange that already
+. "$HOME"/.profile
diff --git a/x/xsession.sh b/x/xsession.sh
index 0fa4ad59..6b298048 100644
--- a/x/xsession.sh
+++ b/x/xsession.sh
@@ -20,13 +20,13 @@ xargs xwallpaper \
# Set a few X user preferences:
#
# - No bell
-# - No power management
+# - Power management on, but start with no timeouts
# - Quick curved mouse acceleration
# - No screen saver
#
xset \
b off \
- -dpms \
+ dpms 0 0 0 \
mouse 5/2 0 \
s off