replaced weird hack with sourcing env vars

This commit is contained in:
2020-04-28 01:44:22 +02:00
parent eb1762e28d
commit 16dd765faa
2 changed files with 10 additions and 20 deletions

View File

@@ -1,36 +1,28 @@
# specifies the time (in seconds) to wait for response to a prompt by auth_x11 before giving up and
# reverting to the screen saver.
XSECURELOCK_AUTH_TIMEOUT=10
export XSECURELOCK_AUTH_TIMEOUT=10
# specifies the time (in seconds) before telling X11 to fully blank the screen; a negative value
# disables X11 blanking. The time is measured since the closing of the auth window or xsecurelock
# startup. Setting this to 0 is rather nonsensical, as key-release events (e.g. from the keystroke
# to launch xsecurelock or from pressing escape to close the auth dialog) always wake up the screen.
XSECURELOCK_BLANK_TIMEOUT=10
# create a second full-screen window to obscure window content in case a running compositor unmaps
# its own window. Helps with some instances of bad compositor behavior (such as compositor crashes/
# restarts, but also compton has been caught at drawing notification icons above the screen locker
# when not using the GLX backend), should prevent compositors from unredirecting as it's 1 pixel
# smaller than the screen from every side, and should otherwise be harmless, so it's enabled by
# default.
XSECURELOCK_COMPOSITE_OBSCURER=1
export XSECURELOCK_BLANK_TIMEOUT=10
# the date format to show. Defaults to the locale settings.
XSECURELOCK_DATETIME_FORMAT=%F %T
export XSECURELOCK_DATETIME_FORMAT="%F %T "
# time_ shows the current time since the epoch on each keystroke. This may be the most secure mode,
# as it gives feedback to keystroke based exclusively on public information, and does not carry
# over any state between keystrokes whatsoever - not even some form of randomness.
# time_hex: same as time, but in microseconds and hexadecimal. "Because we can".
XSECURELOCK_PASSWORD_PROMPT=time_hex
export XSECURELOCK_PASSWORD_PROMPT=time_hex
# whether to show local date and time on the login. Disabled by default.
XSECURELOCK_SHOW_DATETIME=1
export XSECURELOCK_SHOW_DATETIME=1
# whether to show the hostname on the login screen of auth_x11. Possible values are 0 for not
# showing the hostname, 1 for showing the short form, and 2 for showing the long form.
XSECURELOCK_SHOW_HOSTNAME=0
export XSECURELOCK_SHOW_HOSTNAME=0
# whether to show the username on the login screen of auth_x11.
XSECURELOCK_SHOW_USERNAME=0
export XSECURELOCK_SHOW_USERNAME=0

View File

@@ -7,13 +7,11 @@
## CONFIGURATION ##############################################################
# hack: remove space from IFS so that the config can have spaces in the keys
# TODO: find a better way to do this (I'm desperate)
IFS=$'\n\t'
# Source configuration
source "$(dirname "$0")/config"
# Command to start the locker (should not fork)
# Beware the tabs instead of spaces!
locker="env $(grep -v '^#\|^$' ~/.config/xsecurelock/config) xsecurelock"
locker=xsecurelock
# Delay in seconds. Note that by default systemd-logind allows a maximum sleep
# delay of 5 seconds.