aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2022-05-19 10:35:18 +1200
committerTom Ryder <tom@sanctum.geek.nz>2022-05-19 10:35:18 +1200
commit0bb83fa6a4acbdffb70df159342bc673e9897bf8 (patch)
treea3dc03cf043033b575bcda59720a63a77576d7f3
parentMerge branch 'release/v12.4.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-12.5.0.tar.gz (sig)
dotfiles-12.5.0.zip
Merge branch 'release/v12.5.0'v12.5.0
* release/v12.5.0: Override all systemd unit services for mail fail Correct name of logrotate config file for xsession Update state path for logrotate Update xsession log archive path Add config subdir for user logrotate Disable bell in X Tidy X keyboard and preferences settings Use generic name for X lock binding Extend xset DPMS to prevent screensaver blanking
-rw-r--r--Makefile8
-rw-r--r--VERSION4
-rw-r--r--logrotate/systemd/user/logrotate.service6
-rw-r--r--newsboat/systemd/user/newsboat.service1
-rw-r--r--sxhkd/sxhkdrc2
-rw-r--r--systemd/user/notify-email@.service.d/50-notify-email.conf2
-rw-r--r--systemd/user/service.d/50-notify-email.conf2
-rw-r--r--x/logrotate/config.d/xsession (renamed from x/logrotate/config.d/config)2
-rw-r--r--x/xsession.sh21
9 files changed, 32 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index efd76d52..79a1edc3 100644
--- a/Makefile
+++ b/Makefile
@@ -590,8 +590,12 @@ install-sxhkd: install-scrot install-x
cp -p -- sxhkd/xsession.d/* $(HOME)/.xsession.d
install-systemd:
- mkdir -p -- $(XDG_CONFIG_HOME)/systemd/user
- cp -p -- systemd/user/* $(XDG_CONFIG_HOME)/systemd/user
+ mkdir -p -- $(XDG_CONFIG_HOME)/systemd/user \
+ $(XDG_CONFIG_HOME)/systemd/user/service.d \
+ $(XDG_CONFIG_HOME)/systemd/user/notify-email@.service.d
+ cp -p -- systemd/user/*.service $(XDG_CONFIG_HOME)/systemd/user
+ cp -p -- systemd/user/service.d/*.conf $(XDG_CONFIG_HOME)/systemd/user/service.d
+ cp -p -- systemd/user/notify-email@.service.d/*.conf $(XDG_CONFIG_HOME)/systemd/user/notify-email@.service.d
-systemctl --user daemon-reload
# Need to install these in appropriate order to meet dependencies; could trust
diff --git a/VERSION b/VERSION
index 14d0277b..aac214fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v12.4.0
-Mon, 16 May 2022 10:41:41 +0000
+tejr dotfiles v12.5.0
+Wed, 18 May 2022 22:35:13 +0000
diff --git a/logrotate/systemd/user/logrotate.service b/logrotate/systemd/user/logrotate.service
index aeb17f7c..0193d5be 100644
--- a/logrotate/systemd/user/logrotate.service
+++ b/logrotate/systemd/user/logrotate.service
@@ -1,10 +1,10 @@
[Unit]
Description=user log rotation
-OnFailure=notify-email@%n
[Service]
Type=oneshot
-ConfigurationDirectory=%p
+ConfigurationDirectory=%p %p/config.d
StateDirectory=%p
-ExecStart=/usr/sbin/logrotate --state=%S/%p/status -- %E/%p/config
+ExecStartPre=/bin/mkdir -pv -- %h/.local/state/%p
+ExecStart=/usr/sbin/logrotate --state=%h/.local/state/%p/status -- %E/%p/config
TimeoutStartSec=20m
diff --git a/newsboat/systemd/user/newsboat.service b/newsboat/systemd/user/newsboat.service
index 645843e6..020ba328 100644
--- a/newsboat/systemd/user/newsboat.service
+++ b/newsboat/systemd/user/newsboat.service
@@ -1,6 +1,5 @@
[Unit]
Description=Newsboat news reader
-OnFailure=notify-email@%n
[Service]
Environment=TERM=screen-256color
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index 3dabee06..d71e510d 100644
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -44,7 +44,7 @@ super + Print
xsnap --focused
Pause
- i3lock --color=#000000 --image "$HOME"/.local/share/i3/lock.png --nofork
+ xlock
XF86AudioMute
pactl set-sink-mute @DEFAULT_SINK@ toggle
diff --git a/systemd/user/notify-email@.service.d/50-notify-email.conf b/systemd/user/notify-email@.service.d/50-notify-email.conf
new file mode 100644
index 00000000..dc548c73
--- /dev/null
+++ b/systemd/user/notify-email@.service.d/50-notify-email.conf
@@ -0,0 +1,2 @@
+[Unit]
+OnFailure=
diff --git a/systemd/user/service.d/50-notify-email.conf b/systemd/user/service.d/50-notify-email.conf
new file mode 100644
index 00000000..11b8b2f2
--- /dev/null
+++ b/systemd/user/service.d/50-notify-email.conf
@@ -0,0 +1,2 @@
+[Unit]
+OnFailure=notify-email@%N.service
diff --git a/x/logrotate/config.d/config b/x/logrotate/config.d/xsession
index 9b68b272..1541375d 100644
--- a/x/logrotate/config.d/config
+++ b/x/logrotate/config.d/xsession
@@ -2,6 +2,6 @@
copytruncate
daily
missingok
- olddir .config/log/xsession
+ olddir .local/state/xsession/log
rotate 30
}
diff --git a/x/xsession.sh b/x/xsession.sh
index df1860d4..46cb0aa5 100644
--- a/x/xsession.sh
+++ b/x/xsession.sh
@@ -28,13 +28,22 @@ for program in xrandr xwallpaper ; do (
setxkbmap \
-option caps:ctrl_modifier \
-option compose:ralt \
- -option terminate:ctrl_alt_bksp &
+ -option terminate:ctrl_alt_bksp \
+ &
-# Set fast mouse acceleration with a natural threshold
-xset mouse 5/2 0 &
-
-# Disable power management; my lock script turns them off
-xset -dpms
+# Set a few X user preferences:
+#
+# - No bell
+# - No power management
+# - Quick curved mouse acceleration
+# - No screen saver
+#
+xset \
+ b off \
+ -dpms \
+ mouse 5/2 0 \
+ s off \
+ &
# Update browser, since .profile set this to a curses browser on login
# shellcheck disable=SC2034