From e1ff251ad894196816a1aa5cd5fcf584181804f6 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 5 Dec 2023 19:03:27 +0100 Subject: sway: use swaylock home-manager module --- usecases/desktop/graphical/sway.nix | 58 ++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 27 deletions(-) (limited to 'usecases/desktop/graphical') diff --git a/usecases/desktop/graphical/sway.nix b/usecases/desktop/graphical/sway.nix index d41ddf6..1e1721e 100644 --- a/usecases/desktop/graphical/sway.nix +++ b/usecases/desktop/graphical/sway.nix @@ -215,41 +215,45 @@ _inputs: { }; }; - # TODO: upstream a PR to beautify this - xdg.configFile."swaylock/config".text = with osConfig.theme.colors; '' - ignore-empty-password - image=${../../../res/wallpapers/wallpaper-1920x1080-install-gentoo.png} + programs.swaylock = { + enable = true; + settings = with osConfig.theme.colors; { + ignore-empty-password = true; + show-failed-attempts = true; + + image = "${../../../res/wallpapers/wallpaper-1920x1080-install-gentoo.png}"; - font=monospace + font = "monospace"; - inside-color=${lib.removePrefix "#" dominant}dd - inside-clear-color=${lib.removePrefix "#" neutralOrange}dd - inside-ver-color=${lib.removePrefix "#" neutralOrange}dd - inside-wrong-color=${lib.removePrefix "#" neutralRed}dd + inside-color = "${lib.removePrefix "#" dominant}dd"; + inside-clear-color = "${lib.removePrefix "#" neutralOrange}dd"; + inside-ver-color = "${lib.removePrefix "#" neutralOrange}dd"; + inside-wrong-color = "${lib.removePrefix "#" neutralRed}dd"; - key-hl-color=${lib.removePrefix "#" brightGreen}ee - bs-hl-color=${lib.removePrefix "#" neutralRed}ee + key-hl-color = "${lib.removePrefix "#" brightGreen}ee"; + bs-hl-color = "${lib.removePrefix "#" neutralRed}ee"; - line-color=${lib.removePrefix "#" background}ee - line-clear-color=${lib.removePrefix "#" background}ee - line-ver-color=${lib.removePrefix "#" background}ee - line-wrong-color=${lib.removePrefix "#" background}ee + line-color = "${lib.removePrefix "#" background}ee"; + line-clear-color = "${lib.removePrefix "#" background}ee"; + line-ver-color = "${lib.removePrefix "#" background}ee"; + line-wrong-color = "${lib.removePrefix "#" background}ee"; - ring-color=${lib.removePrefix "#" dominant}ee - ring-clear-color=${lib.removePrefix "#" brightOrange}ee - ring-ver-color=${lib.removePrefix "#" brightOrange}ee - ring-wrong-color=${lib.removePrefix "#" brightRed}ee + ring-color = "${lib.removePrefix "#" dominant}ee"; + ring-clear-color = "${lib.removePrefix "#" brightOrange}ee"; + ring-ver-color = "${lib.removePrefix "#" brightOrange}ee"; + ring-wrong-color = "${lib.removePrefix "#" brightRed}ee"; - separator-color=${lib.removePrefix "#" background}ee + separator-color = "${lib.removePrefix "#" background}ee"; - text-color=${lib.removePrefix "#" background}ff - text-clear-color=${lib.removePrefix "#" background}ff - text-ver-color=${lib.removePrefix "#" background}ff - text-wrong-color=${lib.removePrefix "#" background}ff + text-color = "${lib.removePrefix "#" background}ff"; + text-clear-color = "${lib.removePrefix "#" background}ff"; + text-ver-color = "${lib.removePrefix "#" background}ff"; + text-wrong-color = "${lib.removePrefix "#" background}ff"; - indicator-radius=75 - indicator-thickness=10 - ''; + indicator-radius = 75; + indicator-thickness = 10; + }; + }; xsession.importedVariables = [ "DBUS_SESSION_BUS_ADDRESS" -- cgit v1.2.3