diff --git a/hosts/cityseventeen/fonts.nix b/hosts/cityseventeen/fonts.nix index a2d8e4d..3827789 100644 --- a/hosts/cityseventeen/fonts.nix +++ b/hosts/cityseventeen/fonts.nix @@ -1,6 +1,4 @@ { - inputs, - system, pkgs, ... }: @@ -13,16 +11,16 @@ ]; fonts = { sansSerif = { - names = [ "kirsch" ]; - packages = [ inputs.kirsch.packages.${system}.kirsch ]; + names = [ "Aporetic Sans" ]; + packages = [ pkgs.aporetic ]; }; monospace = { - names = [ "kirsch" ]; - packages = [ inputs.kirsch.packages.${system}.kirsch ]; + names = [ "Aporetic Sans Mono" ]; + packages = [ pkgs.aporetic ]; }; serif = { - names = [ "kirsch" ]; - packages = [ inputs.kirsch.packages.${system}.kirsch ]; + names = [ "Aporetic Serif" ]; + packages = [ pkgs.aporetic ]; }; emoji = { names = [ "Noto Fonts Color Emoji" ]; diff --git a/hosts/cityseventeen/users/arturm/configs/foot/foot.ini b/hosts/cityseventeen/users/arturm/configs/foot/foot.ini index 0422b54..8fb6f62 100644 --- a/hosts/cityseventeen/users/arturm/configs/foot/foot.ini +++ b/hosts/cityseventeen/users/arturm/configs/foot/foot.ini @@ -1,6 +1,6 @@ [main] pad=12x12 -font=monospace:size=12 +font=monospace:size=10 [colors] foreground=e0def4 diff --git a/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini b/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini index 321d00d..d19279c 100644 --- a/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini +++ b/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini @@ -1,5 +1,5 @@ # output= -font=Monospace:size=16 +font=Monospace:size=12 # dpi-aware=auto # use-bold=no prompt="󰴈 " diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py b/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py index 12883c6..e787ea1 100644 --- a/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py +++ b/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py @@ -30,7 +30,7 @@ def main() -> None: c.tabs.indicator.width = 0 c.tabs.title.format = "{audio}{relative_index} | {current_title}" - c.fonts.default_size = "9pt" + c.fonts.default_size = "10pt" c.fonts.default_family = "sans-serif" c.url.start_pages = "about:blank" diff --git a/hosts/cityseventeen/users/arturm/configs/waybar/style.css b/hosts/cityseventeen/users/arturm/configs/waybar/style.css index 98dda3f..b8ea335 100644 --- a/hosts/cityseventeen/users/arturm/configs/waybar/style.css +++ b/hosts/cityseventeen/users/arturm/configs/waybar/style.css @@ -18,7 +18,7 @@ * { color: @base05; font-family: monospace; - font-size: 12pt; + font-size: 10pt; border-radius: 0px; border: none; } diff --git a/hosts/shared/fonts.nix b/hosts/shared/fonts.nix index 614e172..cb1de2d 100644 --- a/hosts/shared/fonts.nix +++ b/hosts/shared/fonts.nix @@ -71,7 +71,7 @@ in }; config = lib.mkIf cfg.enable { fonts = { - packages = builtins.concatMap (v: v.packages) (builtins.attrValues cfg.fonts); + packages = builtins.concatMap (v: v.packages) (builtins.attrValues cfg.fonts) ++ cfg.extraFonts; fontconfig = { enable = true; defaultFonts = builtins.mapAttrs (_: v: v.names) cfg.fonts;