This commit is contained in:
mjallen18
2025-12-01 16:32:05 -06:00
parent f132da0433
commit 3a84cfd7b8
4 changed files with 14 additions and 14 deletions

View File

@@ -195,7 +195,7 @@ in
text = "cmd[update:1000] echo -e \"$(LC_TIME=en_US.UTF-8 date +\"%A, %B %d\")\""; text = "cmd[update:1000] echo -e \"$(LC_TIME=en_US.UTF-8 date +\"%A, %B %d\")\"";
color = config.lib.stylix.colors.base06; color = config.lib.stylix.colors.base06;
font_size = "25"; font_size = "25";
font_family = lib.mkDefault "JetBrainsMono NFM"; font_family = lib.mkDefault config.stylix.fonts.monospace.name;
position = "0, 350"; position = "0, 350";
halign = "center"; halign = "center";
valign = "center"; valign = "center";
@@ -206,7 +206,7 @@ in
text = "cmd[update:1000] echo \"<span>$(date +\"%I:%M\")</span>\""; text = "cmd[update:1000] echo \"<span>$(date +\"%I:%M\")</span>\"";
color = config.lib.stylix.colors.base06; color = config.lib.stylix.colors.base06;
font_size = "120"; font_size = "120";
font_family = lib.mkDefault "JetBrainsMono NFM Bold"; font_family = lib.mkDefault "${config.stylix.fonts.monospace.name} Bold";
position = "0, 230"; position = "0, 230";
halign = "center"; halign = "center";
valign = "center"; valign = "center";
@@ -220,7 +220,7 @@ in
dots_spacing = 0.2; dots_spacing = 0.2;
dots_center = true; dots_center = true;
font_size = 18; font_size = 18;
font_family = lib.mkDefault "JetBrainsMono NFM Bold"; font_family = lib.mkDefault "${config.stylix.fonts.monospace.name} Bold";
position = "0, 0"; position = "0, 0";
halign = "center"; halign = "center";
valign = "center"; valign = "center";
@@ -231,7 +231,7 @@ in
text = "cmd[update:30000] waybar-weather --hyprlock"; text = "cmd[update:30000] waybar-weather --hyprlock";
color = config.lib.stylix.colors.base06; color = config.lib.stylix.colors.base06;
font_size = "25"; font_size = "25";
font_family = lib.mkDefault "JetBrainsMono NFM"; font_family = lib.mkDefault config.stylix.fonts.monospace.name;
position = "-100, 100"; position = "-100, 100";
halign = "right"; halign = "right";
valign = "bottom"; valign = "bottom";
@@ -242,7 +242,7 @@ in
text = "cmd[update:1000] waybar-media"; text = "cmd[update:1000] waybar-media";
color = config.lib.stylix.colors.base06; color = config.lib.stylix.colors.base06;
font_size = "15"; font_size = "15";
font_family = lib.mkDefault "JetBrainsMono NFM"; font_family = lib.mkDefault config.stylix.fonts.monospace.name;
position = "100, 100"; position = "100, 100";
halign = "left"; halign = "left";
valign = "bottom"; valign = "bottom";
@@ -265,7 +265,7 @@ in
{ {
size = "200, 50"; size = "200, 50";
position = "0, -80"; position = "0, -80";
font_family = lib.mkDefault "JetBrainsMono NFM"; font_family = lib.mkDefault config.stylix.fonts.monospace.name;
monitor = cfg.primaryDisplay; monitor = cfg.primaryDisplay;
dots_center = true; dots_center = true;
fade_on_empty = true; fade_on_empty = true;

View File

@@ -38,8 +38,8 @@ let
}; };
# Fonts # Fonts
fontName = "JetBrainsMono NFM"; fontName = config.stylix.fonts.monospace.name;
fontPackage = pkgs.nerd-fonts.jetbrains-mono; fontPackage = config.stylix.fonts.monospace.package;
fontSize = 12; fontSize = 12;
in in
{ {

View File

@@ -1,4 +1,4 @@
{ lib, pkgs, ... }: { lib, config, ... }:
{ {
services = { services = {
@@ -7,8 +7,8 @@
hwRender = true; hwRender = true;
fonts = [ fonts = [
{ {
name = lib.mkDefault "JetBrainsMono NFM"; name = lib.mkDefault config.stylix.fonts.monospace;
package = lib.mkDefault pkgs.nerd-fonts.jetbrains-mono; package = lib.mkDefault config.stylix.fonts.monospace.package;
} }
]; ];
}; };

View File

@@ -4,7 +4,7 @@
{ {
lib, lib,
pkgs, config,
namespace, namespace,
... ...
}: }:
@@ -78,8 +78,8 @@
hwRender = true; hwRender = true;
fonts = [ fonts = [
{ {
name = lib.mkDefault "JetBrainsMono NFM"; name = lib.mkDefault config.stylix.fonts.monospace.name;
package = lib.mkDefault pkgs.nerd-fonts.jetbrains-mono; package = lib.mkDefault config.stylix.fonts.monospace.package;
} }
]; ];
}; };