From 0b4a1f4b5e6351720f8a247e44a34dcfecba20ea Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 16 May 2022 23:42:00 +1200 Subject: Extend xset DPMS to prevent screensaver blanking --- x/xsession.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x/xsession.sh b/x/xsession.sh index df1860d4..5d07ef18 100644 --- a/x/xsession.sh +++ b/x/xsession.sh @@ -33,8 +33,8 @@ setxkbmap \ # Set fast mouse acceleration with a natural threshold xset mouse 5/2 0 & -# Disable power management; my lock script turns them off -xset -dpms +# Disable screen saver and power management; my lock script handles this +xset s off -dpms # Update browser, since .profile set this to a curses browser on login # shellcheck disable=SC2034 -- cgit v1.2.3 From 7bca03333454db8c9a90ed7e2c8a7b5f9932c8b7 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 May 2022 01:32:05 +1200 Subject: Use generic name for X lock binding This varies between machines; might publish it at some point. --- sxhkd/sxhkdrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From f0d638e13c6ca22009d7841a8b6199595448d377 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 May 2022 15:46:29 +1200 Subject: Tidy X keyboard and preferences settings --- x/xsession.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/x/xsession.sh b/x/xsession.sh index 5d07ef18..b2f6d656 100644 --- a/x/xsession.sh +++ b/x/xsession.sh @@ -28,13 +28,20 @@ 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 screen saver and power management; my lock script handles this -xset s off -dpms +# Set a few X user preferences: +# +# - No power management +# - Quick curved mouse acceleration +# - No screen saver +# +xset \ + -dpms \ + mouse 5/2 0 \ + s off \ + & # Update browser, since .profile set this to a curses browser on login # shellcheck disable=SC2034 -- cgit v1.2.3 From 7d125c6ae4af9e9a807e9bb365a4fb96076e7183 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 May 2022 15:46:41 +1200 Subject: Disable bell in X --- x/xsession.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x/xsession.sh b/x/xsession.sh index b2f6d656..46cb0aa5 100644 --- a/x/xsession.sh +++ b/x/xsession.sh @@ -33,11 +33,13 @@ setxkbmap \ # 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 \ -- cgit v1.2.3 From ed690c47d6d6e829267493d00806b6dd00429566 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 May 2022 16:13:30 +1200 Subject: Add config subdir for user logrotate --- logrotate/systemd/user/logrotate.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logrotate/systemd/user/logrotate.service b/logrotate/systemd/user/logrotate.service index aeb17f7c..cea3b0b9 100644 --- a/logrotate/systemd/user/logrotate.service +++ b/logrotate/systemd/user/logrotate.service @@ -4,7 +4,7 @@ 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 TimeoutStartSec=20m -- cgit v1.2.3 From 2944b3effcc7c74599ee5e78a6bcc6427d0f02a3 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 May 2022 16:14:11 +1200 Subject: Update xsession log archive path --- x/logrotate/config.d/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/logrotate/config.d/config b/x/logrotate/config.d/config index 9b68b272..1541375d 100644 --- a/x/logrotate/config.d/config +++ b/x/logrotate/config.d/config @@ -2,6 +2,6 @@ copytruncate daily missingok - olddir .config/log/xsession + olddir .local/state/xsession/log rotate 30 } -- cgit v1.2.3 From ee59b28ede89aea2e2cea751f097eb753645d4f2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 May 2022 16:15:54 +1200 Subject: Update state path for logrotate --- logrotate/systemd/user/logrotate.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/logrotate/systemd/user/logrotate.service b/logrotate/systemd/user/logrotate.service index cea3b0b9..45170485 100644 --- a/logrotate/systemd/user/logrotate.service +++ b/logrotate/systemd/user/logrotate.service @@ -6,5 +6,6 @@ OnFailure=notify-email@%n Type=oneshot 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 -- cgit v1.2.3 From c52eee9bd6fdf20414137addb758c41f53b0aa20 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 18 May 2022 22:48:12 +1200 Subject: Correct name of logrotate config file for xsession --- x/logrotate/config.d/config | 7 ------- x/logrotate/config.d/xsession | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 x/logrotate/config.d/config create mode 100644 x/logrotate/config.d/xsession diff --git a/x/logrotate/config.d/config b/x/logrotate/config.d/config deleted file mode 100644 index 1541375d..00000000 --- a/x/logrotate/config.d/config +++ /dev/null @@ -1,7 +0,0 @@ -~/.xsession-errors { - copytruncate - daily - missingok - olddir .local/state/xsession/log - rotate 30 -} diff --git a/x/logrotate/config.d/xsession b/x/logrotate/config.d/xsession new file mode 100644 index 00000000..1541375d --- /dev/null +++ b/x/logrotate/config.d/xsession @@ -0,0 +1,7 @@ +~/.xsession-errors { + copytruncate + daily + missingok + olddir .local/state/xsession/log + rotate 30 +} -- cgit v1.2.3 From 2bd055a49e0e5840ab49c0bf137bb0d9a1caec92 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 19 May 2022 10:30:07 +1200 Subject: Override all systemd unit services for mail fail --- Makefile | 8 ++++++-- logrotate/systemd/user/logrotate.service | 1 - newsboat/systemd/user/newsboat.service | 1 - systemd/user/notify-email@.service.d/50-notify-email.conf | 2 ++ systemd/user/service.d/50-notify-email.conf | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 systemd/user/notify-email@.service.d/50-notify-email.conf create mode 100644 systemd/user/service.d/50-notify-email.conf 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/logrotate/systemd/user/logrotate.service b/logrotate/systemd/user/logrotate.service index 45170485..0193d5be 100644 --- a/logrotate/systemd/user/logrotate.service +++ b/logrotate/systemd/user/logrotate.service @@ -1,6 +1,5 @@ [Unit] Description=user log rotation -OnFailure=notify-email@%n [Service] Type=oneshot 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/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 -- cgit v1.2.3 From e734dd579af413643378750e71420dc121845a97 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Thu, 19 May 2022 10:35:13 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3