From d4f7650cd0735d1fe9173530cc31c24b65ed44ff Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Mon, 3 Jun 2024 20:50:58 +0530 Subject: global/font: init --- home/cez/home.nix | 11 +---------- home/wayland/modules/foot.nix | 9 +++++++-- home/wayland/modules/sway/mako.nix | 8 +++++++- home/wayland/modules/zathura.nix | 9 +++++++-- 4 files changed, 22 insertions(+), 15 deletions(-) (limited to 'home') diff --git a/home/cez/home.nix b/home/cez/home.nix index da3f6d6..a97ce83 100644 --- a/home/cez/home.nix +++ b/home/cez/home.nix @@ -1,12 +1,3 @@ -{ ... }: let - font = "sans 13"; - monoFont = "monospace:size=18"; -in { +{ ... }: { imports = [ ../wayland/home.nix ]; - - services.mako.font = font; - programs = { - zathura.options.font = font; - foot.settings.main.font = monoFont; - }; } diff --git a/home/wayland/modules/foot.nix b/home/wayland/modules/foot.nix index b068b87..77299aa 100644 --- a/home/wayland/modules/foot.nix +++ b/home/wayland/modules/foot.nix @@ -1,12 +1,17 @@ -{ lib, ... }: { +{ config, lib, ... }: let + font = config.global.font.monospace.name + + ":size=" + + lib.optionalString (config.global.font.monospace.size != null) + (builtins.toString config.global.font.monospace.size); +in { programs.foot = { enable = true; settings = { colors.background = "000000"; main = { + inherit font; pad = "10x10"; - font = lib.mkDefault "monospace"; }; }; }; diff --git a/home/wayland/modules/sway/mako.nix b/home/wayland/modules/sway/mako.nix index 4280fdf..028ae66 100644 --- a/home/wayland/modules/sway/mako.nix +++ b/home/wayland/modules/sway/mako.nix @@ -1,8 +1,14 @@ -{ ... }: { +{ config, lib, ... }: let + font = config.global.font.sans.name + + " " + + lib.optionalString (config.global.font.sans.size != null) + (builtins.toString config.global.font.sans.size); +in { services.mako = { enable = true; defaultTimeout = 3000; + inherit font; borderSize = 2; backgroundColor = "#000000"; }; diff --git a/home/wayland/modules/zathura.nix b/home/wayland/modules/zathura.nix index 8437e80..9a013da 100644 --- a/home/wayland/modules/zathura.nix +++ b/home/wayland/modules/zathura.nix @@ -1,4 +1,9 @@ -{ lib, ... }: { +{ config, lib, ... }: let + font = config.global.font.sans.name + + " " + + lib.optionalString (config.global.font.sans.size != null) + (builtins.toString config.global.font.sans.size); +in { programs.zathura = { enable = true; @@ -7,7 +12,7 @@ "[fullscreen] f" = "toggle_fullscreen"; }; options = { - font = lib.mkDefault "Sans"; + inherit font; statusbar-basename = true; selection-clipboard = "clipboard"; database = "sqlite"; -- cgit v1.2.3