From f54de0816252a70df0da69e232b21ce9741ae6d5 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Wed, 7 Aug 2024 21:50:38 -0400 Subject: [PATCH] swaylock: migrate to font modules --- homeManagerModules/apps/swaylock/default.nix | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/homeManagerModules/apps/swaylock/default.nix b/homeManagerModules/apps/swaylock/default.nix index eafdb65d..44a387c7 100644 --- a/homeManagerModules/apps/swaylock/default.nix +++ b/homeManagerModules/apps/swaylock/default.nix @@ -3,8 +3,10 @@ lib, pkgs, ... -}: { - config = lib.mkIf config.ar.home.apps.swaylock.enable { +}: let + cfg = config.ar.home; +in { + config = lib.mkIf cfg.apps.swaylock.enable { home.packages = with pkgs; [swaylock]; programs.swaylock.enable = true; @@ -15,8 +17,8 @@ caps-lock-key-hl-color=e78284 color=303446 daemonize - font="UbuntuSansMono Nerd Font" - image=${config.ar.home.theme.wallpaper} + font="${cfg.theme.monospaceFont.name}" + image=${cfg.theme.wallpaper} indicator-caps-lock indicator-idle-visible indicator-radius=120 @@ -27,18 +29,18 @@ inside-ver-color=303446cc inside-wrong-color=303446cc key-hl-color=a6d189 - line-caps-lock-color=${config.ar.home.theme.colors.background}CC - line-clear-color=${config.ar.home.theme.colors.background}CC - line-color=${config.ar.home.theme.colors.background}CC - line-ver-color=${config.ar.home.theme.colors.background}CC - line-wrong-color=${config.ar.home.theme.colors.background}CC + line-caps-lock-color=${cfg.theme.colors.background}CC + line-clear-color=${cfg.theme.colors.background}CC + line-color=${cfg.theme.colors.background}CC + line-ver-color=${cfg.theme.colors.background}CC + line-wrong-color=${cfg.theme.colors.background}CC ring-caps-lock-color=e78284cc ring-clear-color=85c1dccc - ring-color=${config.ar.home.theme.colors.primary}CC + ring-color=${cfg.theme.colors.primary}CC ring-ver-color=a6d189cc ring-wrong-color=e78284cc scaling=fill - separator-color=${config.ar.home.theme.colors.background}CC + separator-color=${cfg.theme.colors.background}CC text-caps-lock-color=c6d0f5 text-clear-color=c6d0f5 text-ver-color=c6d0f5