Compare commits
No commits in common. "cff3811cade39de009d1925586aa5a8d514f22d6" and "b8be3d80a8273237ace7238c03236c32c594388e" have entirely different histories.
cff3811cad
...
b8be3d80a8
|
@ -65,7 +65,13 @@ in
|
||||||
enable = my.mkDisableOption "Notify when about to lock the screen";
|
enable = my.mkDisableOption "Notify when about to lock the screen";
|
||||||
|
|
||||||
delay = mkOption {
|
delay = mkOption {
|
||||||
type = types.int;
|
type = with types;
|
||||||
|
addCheck int (x:
|
||||||
|
let
|
||||||
|
cfg = config.my.home.wm.screen-lock.notify;
|
||||||
|
cornerCfg = config.my.home.wm.screen-lock.cornerLock;
|
||||||
|
in
|
||||||
|
(cfg.enable && cornerCfg.enable) -> cornerCfg.delay >= x);
|
||||||
default = 5;
|
default = 5;
|
||||||
example = 15;
|
example = 15;
|
||||||
description = ''
|
description = ''
|
||||||
|
|
|
@ -12,22 +12,6 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
assertions = [
|
|
||||||
{
|
|
||||||
assertion =
|
|
||||||
let
|
|
||||||
inherit (cfg) cornerLock notify;
|
|
||||||
bothEnabled = cornerLock.enable && notify.enable;
|
|
||||||
cornerLockHigherThanNotify = cornerLock.delay >= notify.delay;
|
|
||||||
in
|
|
||||||
bothEnabled -> cornerLockHigherThanNotify;
|
|
||||||
message = ''
|
|
||||||
`config.my.home.wm.notify.delay` cannot have a value higher than
|
|
||||||
`config.my.home.wm.cornerLock.delay`.
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
services.screen-locker = {
|
services.screen-locker = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
{ config, lib, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.my.system.boot;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.my.system.boot = with lib; {
|
|
||||||
tmp = {
|
|
||||||
clean = mkEnableOption "clean `/tmp` on boot.";
|
|
||||||
|
|
||||||
tmpfs = my.mkDisableOption "mount `/tmp` as a tmpfs on boot.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = {
|
|
||||||
boot = {
|
|
||||||
cleanTmpDir = cfg.tmp.clean;
|
|
||||||
|
|
||||||
tmpOnTmpfs = cfg.tmp.tmpfs;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./boot.nix
|
|
||||||
./documentation.nix
|
./documentation.nix
|
||||||
./language.nix
|
./language.nix
|
||||||
./media.nix
|
./media.nix
|
||||||
|
|
Loading…
Reference in a new issue