From 18289ff4d9b532b436b72e0b6fb9b80628f32d50 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Wed, 14 Feb 2024 12:33:51 +0800 Subject: [PATCH] home(sway): switch to swaylock-effects --- home/gui/catppuccin/home.nix | 36 ++++++++++++++++++++++++++++++++++-- home/sway/home.nix | 22 +++++++++++++++++++++- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/home/gui/catppuccin/home.nix b/home/gui/catppuccin/home.nix index f08d6265..d13a4b21 100644 --- a/home/gui/catppuccin/home.nix +++ b/home/gui/catppuccin/home.nix @@ -50,15 +50,47 @@ in mkIf cfg.enable { trayOutput = "primary"; } ]; - #output."*".bg = mkForce "${palette.sway.${cfg.sway}.base} solid_color"; output."*".bg = mkForce "${./flake.png} fill"; - gaps.inner = 12; gaps.outer = 5; # dodge the status bar gaps.bottom = 0; }; + programs.swaylock.settings = with palette.sway.${cfg.sway}; let + transparent = "00000000"; + in { + color = base; + bs-hl-color = rosewater; + caps-lock-bs-hl-color = rosewater; + caps-lock-key-hl-color = green; + inside-color = transparent; + inside-clear-color = transparent; + inside-caps-lock-color = transparent; + inside-ver-color = transparent; + inside-wrong-color = transparent; + key-hl-color = green; + layout-bg-color = transparent; + layout-border-color = transparent; + layout-text-color = text; + line-color = transparent; + line-clear-color = transparent; + line-caps-lock-color = transparent; + line-ver-color = transparent; + line-wrong-color = transparent; + ring-color = lavender; + ring-clear-color = rosewater; + ring-caps-lock-color = peach; + ring-ver-color = blue; + ring-wrong-color = maroon; + separator-color = transparent; + text-color = text; + text-clear-color = rosewater; + text-caps-lock-color = peach; + text-ver-color = blue; + text-wrong-color = maroon; + }; + programs.i3status.general = with palette.sway.${cfg.sway}; { color_good = lavender; color_degraded = yellow; diff --git a/home/sway/home.nix b/home/sway/home.nix index eccf1583..139995cd 100644 --- a/home/sway/home.nix +++ b/home/sway/home.nix @@ -18,7 +18,7 @@ XF86MonBrightnessUp = "light -A 5"; XF86MonBrightnessDown = "light -U 5"; - "Control+Alt+l" = "exec ${pkgs.swaylock}/bin/swaylock -c 000000"; + "Control+Alt+l" = "exec swaylock -f --grace 0"; "Print" = "exec ${pkgs.grim}/bin/grim - | ${pkgs.wl-clipboard}/bin/wl-copy"; "${modifier}+Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy"; "${modifier}+q" = "exec google-chrome-stable"; @@ -45,4 +45,24 @@ output."*".bg = "#000000 solid_color"; }; }; + + programs.swaylock = { + enable = true; + package = pkgs.swaylock-effects; + settings = { + indicator-caps-lock = true; + font-size = 20; + ignore-empty-password = true; + show-failed-attempts = true; + color = mkDefault "#00000000"; + + # Ring + indicator-radius = 115; + + # Swaylock-effects specific settings + clock = true; + timestr = "%r"; + grace = 2; + }; + }; }