summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2019-10-08 23:36:56 -0400
committerJesse Luehrs <doy@tozt.net>2019-10-08 23:36:56 -0400
commit521adc579c34e041192d1429118806a1981dc952 (patch)
treecb464c9a24be850cca8a17dce6ac1f4f6a3130ef
parentd93a6c0155d7d626db4736bb8facc7f6ac2a4280 (diff)
downloadconf-521adc579c34e041192d1429118806a1981dc952.tar.gz
conf-521adc579c34e041192d1429118806a1981dc952.zip
switch to xsecurelock instead of light-locker
-rwxr-xr-xbin/watch-lock37
-rwxr-xr-xservices/available/light-locker/log/run3
-rwxr-xr-xservices/available/light-locker/run2
-rwxr-xr-xservices/available/watch-lock/log/run3
-rwxr-xr-xservices/available/watch-lock/run5
-rwxr-xr-xservices/available/xss-lock/log/run3
-rwxr-xr-xservices/available/xss-lock/run3
-rw-r--r--xbindkeysrc2
-rw-r--r--xprofile2
9 files changed, 9 insertions, 51 deletions
diff --git a/bin/watch-lock b/bin/watch-lock
deleted file mode 100755
index 8545efc..0000000
--- a/bin/watch-lock
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use 5.020;
-
-use POSIX ":sys_wait_h";
-
-$|++;
-
-my $pid = open my $fh, '-|', (
- 'dbus-monitor',
- '--system',
- 'type=signal,interface=org.freedesktop.login1.Session'
-) or die "couldn't spawn dbus-monitor: $!";
-$SIG{CHLD} = sub {
- while ((my $child = waitpid -1, WNOHANG) > 0) {
- if ($child == $pid) {
- undef $pid;
- }
- }
- exit unless $pid;
-};
-
-sub cleanup {
- kill KILL => $pid if $pid;
- undef $pid;
-}
-
-$SIG{TERM} = $SIG{INT} = sub { cleanup; exit; };
-END { cleanup }
-
-while (<$fh>) {
- if (/\bmember=Lock\b/) {
- system("on-lock") && say "on-lock failed";
- say "LOCK";
- }
-}
diff --git a/services/available/light-locker/log/run b/services/available/light-locker/log/run
deleted file mode 100755
index d92a97c..0000000
--- a/services/available/light-locker/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec multilog t s16777215 $HOME/.log/light-locker
diff --git a/services/available/light-locker/run b/services/available/light-locker/run
deleted file mode 100755
index 6cf1077..0000000
--- a/services/available/light-locker/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec light-locker
diff --git a/services/available/watch-lock/log/run b/services/available/watch-lock/log/run
deleted file mode 100755
index fd51f06..0000000
--- a/services/available/watch-lock/log/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec multilog t s16777215 $HOME/.log/watch-lock
diff --git a/services/available/watch-lock/run b/services/available/watch-lock/run
deleted file mode 100755
index f36a7e7..0000000
--- a/services/available/watch-lock/run
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -eu
-set -o pipefail
-
-exec watch-lock
diff --git a/services/available/xss-lock/log/run b/services/available/xss-lock/log/run
new file mode 100755
index 0000000..6444534
--- /dev/null
+++ b/services/available/xss-lock/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec multilog t s16777215 $HOME/.log/xss-lock
diff --git a/services/available/xss-lock/run b/services/available/xss-lock/run
new file mode 100755
index 0000000..87036d8
--- /dev/null
+++ b/services/available/xss-lock/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec xss-lock -n /usr/lib/xsecurelock/dimmer -l -- sh -c 'on-lock; env XSECURELOCK_BLANK_TIMEOUT=1 XSECURELOCK_SHOW_DATETIME=1 xsecurelock'
diff --git a/xbindkeysrc b/xbindkeysrc
index b9dbffb..b6b505a 100644
--- a/xbindkeysrc
+++ b/xbindkeysrc
@@ -10,7 +10,7 @@
"dmenu_run -fn 'Misc Fixed:pixelsize=14'"
Mod4 + r
-"light-locker-command -l"
+"xset s activate"
Mod4 + d
"numkeys toggle"
diff --git a/xprofile b/xprofile
index 4213a9c..d6ff358 100644
--- a/xprofile
+++ b/xprofile
@@ -7,3 +7,5 @@ eval "$(ssh-agent)"
pidof svscan || (svscan "$HOME"/.services/enabled 2>&1 | readproctitle "$USER" ........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................) &
setup-inputs
+
+xset s 300 5