From d0e5071b4a1c01ba9284caaf8adaca7109509b50 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Wed, 7 Aug 2024 22:43:16 -0400 Subject: [PATCH] mako: migrate to font modules --- homeManagerModules/services/mako/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/homeManagerModules/services/mako/default.nix b/homeManagerModules/services/mako/default.nix index e81dee82..4c264f4e 100644 --- a/homeManagerModules/services/mako/default.nix +++ b/homeManagerModules/services/mako/default.nix @@ -3,25 +3,27 @@ lib, pkgs, ... -}: { - config = lib.mkIf config.ar.home.services.mako.enable { +}: let + cfg = config.ar.home; +in { + config = lib.mkIf cfg.services.mako.enable { services.mako = { actions = true; anchor = "top-center"; - backgroundColor = "${config.ar.home.theme.colors.background}CC"; - borderColor = "${config.ar.home.theme.colors.primary}EE"; + backgroundColor = "${cfg.theme.colors.background}CC"; + borderColor = "${cfg.theme.colors.primary}EE"; borderRadius = 10; borderSize = 2; defaultTimeout = 10000; enable = true; - font = "${config.gtk.font.name} Regular ${toString config.gtk.font.size}"; + font = "${cfg.theme.sansFont.name} Regular ${toString cfg.theme.sansFont.size}"; height = 300; iconPath = "${pkgs.papirus-icon-theme}/share/icons/Papirus/"; icons = true; layer = "top"; margin = "20,0"; padding = "15"; - textColor = "${config.ar.home.theme.colors.text}"; + textColor = "${cfg.theme.colors.text}"; width = 400; extraConfig = ''