From 7d18d2bd500b23bc9657db9423dd38f9213d18e9 Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Fri, 25 Apr 2025 15:42:09 +0200 Subject: [PATCH] Properly configure swaylock --- homes/julian/features/hyprland/default.nix | 2 +- homes/julian/features/hyprland/swayidle.nix | 3 +- homes/julian/features/hyprland/swaylock.nix | 36 ++------------------- 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/homes/julian/features/hyprland/default.nix b/homes/julian/features/hyprland/default.nix index 6137374..33fb841 100644 --- a/homes/julian/features/hyprland/default.nix +++ b/homes/julian/features/hyprland/default.nix @@ -354,7 +354,7 @@ in swaylock = lib.getExe config.programs.swaylock.package; in lib.optionals config.programs.swaylock.enable [ - "$mod,TAB,exec,${swaylock} --ignore-empty-password --color=000000 --daemonize" + "$mod,TAB,exec,${swaylock} --daemonize" ] ) ++ diff --git a/homes/julian/features/hyprland/swayidle.nix b/homes/julian/features/hyprland/swayidle.nix index 6c60924..3a19de0 100644 --- a/homes/julian/features/hyprland/swayidle.nix +++ b/homes/julian/features/hyprland/swayidle.nix @@ -41,8 +41,7 @@ in [ { timeout = lockTime; - # command = "${swaylock} -i ${config.wallpaper} --daemonize --grace 15 --grace-no-mouse"; - command = "${swaylock} --daemonize --grace 15 --grace-no-mouse"; + command = "${swaylock} --daemonize --grace 15"; } ] ++ diff --git a/homes/julian/features/hyprland/swaylock.nix b/homes/julian/features/hyprland/swaylock.nix index aac9041..cbba3e2 100644 --- a/homes/julian/features/hyprland/swaylock.nix +++ b/homes/julian/features/hyprland/swaylock.nix @@ -9,40 +9,10 @@ in { programs.swaylock = { enable = true; - package = pkgs.swaylock-effects; settings = { - effect-blur = "20x3"; - fade-in = 0.1; - - # font = config.fontProfiles.regular.name; - # font-size = config.fontProfiles.regular.size + 3; - - line-uses-inside = true; - disable-caps-lock-text = true; - indicator-caps-lock = true; - indicator-radius = 40; - indicator-idle-visible = true; - indicator-y-position = 1000; - - # TODO customize - # ring-color = "${colors.surface_bright}"; - # inside-wrong-color = "${colors.on_error}"; - # ring-wrong-color = "${colors.error}"; - # key-hl-color = "${colors.tertiary}"; - # bs-hl-color = "${colors.on_tertiary}"; - # ring-ver-color = "${colors.secondary}"; - # inside-ver-color = "${colors.on_secondary}"; - # inside-color = "${colors.surface}"; - # text-color = "${colors.on_surface}"; - # text-clear-color = "${colors.on_surface_variant}"; - # text-ver-color = "${colors.on_secondary}"; - # text-wrong-color = "${colors.on_surface_variant}"; - # text-caps-lock-color = "${colors.on_surface_variant}"; - # inside-clear-color = "${colors.surface}"; - # ring-clear-color = "${colors.primary}"; - # inside-caps-lock-color = "${colors.on_tertiary}"; - # ring-caps-lock-color = "${colors.surface}"; - # separator-color = "${colors.surface}"; + color = "000000"; + ignore-empty-password = true; + indicator-idle-visible = false; }; }; }