summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
authorsinanmohd <sinan@sinanmohd.com>2024-06-08 06:15:39 +0530
committersinanmohd <sinan@sinanmohd.com>2024-06-08 07:10:59 +0530
commit92c8ab73bf974457ea1dc720b3fe6876496294c4 (patch)
tree907bd411605ff6c793a41ec442eacc3de5b8ca5a /home
parentc82ff3c17a1787be9348c3939284c57093da8b2f (diff)
home/wayland/sway: properly use `global.font`
Diffstat (limited to 'home')
-rw-r--r--home/wayland/modules/foot.nix3
-rw-r--r--home/wayland/modules/sway/home.nix6
-rw-r--r--home/wayland/modules/sway/mako.nix3
-rw-r--r--home/wayland/modules/zathura.nix3
4 files changed, 8 insertions, 7 deletions
diff --git a/home/wayland/modules/foot.nix b/home/wayland/modules/foot.nix
index 77299aa..5f6c898 100644
--- a/home/wayland/modules/foot.nix
+++ b/home/wayland/modules/foot.nix
@@ -1,8 +1,7 @@
{ 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);
+ ":size=" + builtins.toString config.global.font.monospace.size;
in {
programs.foot = {
enable = true;
diff --git a/home/wayland/modules/sway/home.nix b/home/wayland/modules/sway/home.nix
index d97e8a6..4878bf0 100644
--- a/home/wayland/modules/sway/home.nix
+++ b/home/wayland/modules/sway/home.nix
@@ -19,6 +19,10 @@
brightnessctl = lib.getExe pkgs.brightnessctl;
mako = lib.getExe config.services.mako.package;
firefox = lib.getExe config.programs.firefox.finalPackage;
+
+ font = config.global.font.sans.name
+ + lib.optionalString (config.global.font.sans.size != null)
+ " " + builtins.toString config.global.font.sans.size;
in {
imports = [
./mako.nix
@@ -45,8 +49,8 @@ in {
settings = {
bar = {
+ inherit font;
position = "top";
- font = "sans";
status_command = i3status;
colors = {
background = "#000000";
diff --git a/home/wayland/modules/sway/mako.nix b/home/wayland/modules/sway/mako.nix
index fdc939e..d545cd1 100644
--- a/home/wayland/modules/sway/mako.nix
+++ b/home/wayland/modules/sway/mako.nix
@@ -1,8 +1,7 @@
{ config, pkgs, lib, ... }: let
font = config.global.font.sans.name
- + " "
+ lib.optionalString (config.global.font.sans.size != null)
- (builtins.toString config.global.font.sans.size);
+ " " + builtins.toString config.global.font.sans.size;
in {
home.packages = with pkgs; [ libnotify ];
diff --git a/home/wayland/modules/zathura.nix b/home/wayland/modules/zathura.nix
index 9a013da..faec245 100644
--- a/home/wayland/modules/zathura.nix
+++ b/home/wayland/modules/zathura.nix
@@ -1,8 +1,7 @@
{ config, lib, ... }: let
font = config.global.font.sans.name
- + " "
+ lib.optionalString (config.global.font.sans.size != null)
- (builtins.toString config.global.font.sans.size);
+ " " + builtins.toString config.global.font.sans.size;
in {
programs.zathura = {
enable = true;