diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-02-22 23:10:03 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-22 23:10:03 +0000 |
commit | 0dcf5df0eda7742766aadf97bc020e0a671cfd27 (patch) | |
tree | dce480ea9448e1da740a878af236189336706fd0 /nixos/modules/services/x11 | |
parent | d81e32be2a1e37611ed2e21c7fa4d6774bd6402e (diff) | |
parent | c2fa5f172922c001bdf7e8213bcdd46e2b1cc49b (diff) | |
download | nixlib-0dcf5df0eda7742766aadf97bc020e0a671cfd27.tar nixlib-0dcf5df0eda7742766aadf97bc020e0a671cfd27.tar.gz nixlib-0dcf5df0eda7742766aadf97bc020e0a671cfd27.tar.bz2 nixlib-0dcf5df0eda7742766aadf97bc020e0a671cfd27.tar.lz nixlib-0dcf5df0eda7742766aadf97bc020e0a671cfd27.tar.xz nixlib-0dcf5df0eda7742766aadf97bc020e0a671cfd27.tar.zst nixlib-0dcf5df0eda7742766aadf97bc020e0a671cfd27.zip |
Merge pull request #34470 from WilliButz/fix-xautolock
nixos/xautolock: fix default defaults/examples, add assertions
Diffstat (limited to 'nixos/modules/services/x11')
-rw-r--r-- | nixos/modules/services/x11/xautolock.nix | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix index 28fc92024bcb..a614559970e9 100644 --- a/nixos/modules/services/x11/xautolock.nix +++ b/nixos/modules/services/x11/xautolock.nix @@ -26,9 +26,9 @@ in }; locker = mkOption { - default = "xlock"; # default according to `man xautolock` - example = "i3lock -i /path/to/img"; - type = types.string; + default = "${pkgs.xlockmore}/bin/xlock"; # default according to `man xautolock` + example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + type = types.str; description = '' The script to use when automatically locking the computer. @@ -37,8 +37,8 @@ in nowlocker = mkOption { default = null; - example = "i3lock -i /path/to/img"; - type = types.nullOr types.string; + example = "${pkgs.i3lock}/bin/i3lock -i /path/to/img"; + type = types.nullOr types.str; description = '' The script to use when manually locking the computer with <command>xautolock -locknow</command>. @@ -56,10 +56,8 @@ in notifier = mkOption { default = null; - example = literalExample '' - "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\"" - ''; - type = types.nullOr types.string; + example = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; + type = types.nullOr types.str; description = '' Notification script to be used to warn about the pending autolock. @@ -68,8 +66,8 @@ in killer = mkOption { default = null; # default according to `man xautolock` is none - example = "systemctl suspend"; - type = types.nullOr types.string; + example = "${pkgs.systemd}/bin/systemctl suspend"; + type = types.nullOr types.str; description = '' The script to use when nothing has happend for as long as <option>killtime</option> @@ -131,6 +129,12 @@ in assertion = cfg.killer != null -> cfg.killtime >= 10; message = "killtime has to be at least 10 minutes according to `man xautolock`"; } - ]; + ] ++ (lib.flip map [ "locker" "notifier" "nowlocker" "killer" ] + (option: + { + assertion = cfg."${option}" != null -> builtins.substring 0 1 cfg."${option}" == "/"; + message = "Please specify a canonical path for `services.xserver.xautolock.${option}`"; + }) + ); }; } |