Make fonts a proper home-manager module

flake.nix

@@ -64,7 +64,7 @@
 
       _module.args = {
         colorscheme = "gruvbox";
-        fonts = (import ./fonts).iosevka;
+        fontstack = "iosevka";
         username = "noib3";
       };
 

modules/flake/machines/default.nix

@@ -3,7 +3,7 @@
   config,
   lib,
   colorscheme,
-  fonts,
+  fontstack,
   username,
   ...
 }:
@@ -90,23 +90,18 @@ in
       cfg
       |> lib.mapAttrs (
         machineName: machine:
-        inputs.home-manager.lib.homeManagerConfiguration rec {
-          pkgs = import inputs.nixpkgs {
-            inherit (machine) system;
-            overlays = [
-              inputs.brew-nix.overlays.default
-            ];
-          };
+        inputs.home-manager.lib.homeManagerConfiguration {
+          pkgs = inputs.nixpkgs.legacyPackages.${machine.system};
 
           modules = [
-            homeManagerMachinesModule
-            ../../../fonts/module.nix
             ../../home
+            homeManagerMachinesModule
             {
-              fonts = fonts pkgs;
               home.username = username;
               machines.current.name = machineName;
               modules.colorscheme.${colorscheme}.enable = true;
+              modules.fonts.stacks.${fontstack}.enable = true;
+              nixpkgs.overlays = [ inputs.brew-nix.overlays.default ];
             }
           ];
 

modules/home/fonts/default.nix

@@ -0,0 +1,70 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.fonts;
+  fontSubmodule = import ./font-submodule.nix { inherit lib; };
+in
+{
+  imports = [
+    ./emoji
+    ./monospace
+    ./sans-serif
+    ./serif
+    ./stacks
+  ];
+
+  options.modules.fonts = {
+    monospace = mkOption {
+      type = types.attrsOf fontSubmodule;
+      default = { };
+      description = "All declared monospace fonts";
+    };
+
+    sansSerif = mkOption {
+      type = types.attrsOf fontSubmodule;
+      default = { };
+      description = "All declared sans-serif fonts";
+    };
+
+    serif = mkOption {
+      type = types.attrsOf fontSubmodule;
+      default = { };
+      description = "All declared serif fonts";
+    };
+
+    emoji = mkOption {
+      type = types.attrsOf fontSubmodule;
+      default = { };
+      description = "All declared emoji fonts";
+    };
+  };
+
+  config =
+    let
+      current = cfg.stacks.current;
+    in
+    {
+      home.packages = unique [
+        current.monospace.package
+        current.sansSerif.package
+        current.serif.package
+        current.emoji.package
+      ];
+
+      fonts.fontconfig = {
+        enable = pkgs.stdenv.isLinux;
+        defaultFonts = {
+          serif = [ current.serif.name ];
+          sansSerif = [ current.sansSerif.name ];
+          monospace = [ current.monospace.name ];
+          emoji = [ current.emoji.name ];
+        };
+      };
+    };
+}

modules/home/fonts/emoji/default.nix

@@ -0,0 +1,3 @@
+{
+  imports = [ ./noto-color.nix ];
+}

modules/home/fonts/emoji/noto-color.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  modules.fonts.emoji.noto-color = {
+    name = "Noto Color Emoji";
+    package = pkgs.noto-fonts-color-emoji;
+    sizes.default = 16.5;
+  };
+}