nixos: fix font options; cityseventeen: change font to aporetic

hosts/cityseventeen/fonts.nix

@@ -1,6 +1,4 @@
 {
-  inputs,
-  system,
   pkgs,
   ...
 }:
@@ -13,16 +11,16 @@
     ];
     fonts = {
       sansSerif = {
-        names = [ "kirsch" ];
+        names = [ "Aporetic Sans" ];
-        packages = [ inputs.kirsch.packages.${system}.kirsch ];
+        packages = [ pkgs.aporetic ];
       };
       monospace = {
-        names = [ "kirsch" ];
+        names = [ "Aporetic Sans Mono" ];
-        packages = [ inputs.kirsch.packages.${system}.kirsch ];
+        packages = [ pkgs.aporetic ];
       };
       serif = {
-        names = [ "kirsch" ];
+        names = [ "Aporetic Serif" ];
-        packages = [ inputs.kirsch.packages.${system}.kirsch ];
+        packages = [ pkgs.aporetic ];
       };
       emoji = {
         names = [ "Noto Fonts Color Emoji" ];

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

hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini

@@ -1,5 +1,5 @@
 # output=<not set>
-font=Monospace:size=16
+font=Monospace:size=12
 # dpi-aware=auto
 # use-bold=no
 prompt="󰴈 "

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"

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;
 }

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;