{font-packages,fontconfig}: init (#1381)

Link: https://github.com/nix-community/stylix/pull/1381

Reviewed-by: Flameopathic <64027365+Flameopathic@users.noreply.github.com>
Reviewed-by: awwpotato <awwpotato@voidq.com>
Reviewed-by: Matt Sturgeon <matt@sturgeon.me.uk>
Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com>

modules/font-packages/darwin.nix

@@ -0,0 +1,13 @@
+{ mkTarget, ... }:
+mkTarget {
+  name = "font-packages";
+  humanName = "Font packages";
+
+  configElements =
+    { fonts }:
+    {
+      fonts = {
+        inherit (fonts) packages;
+      };
+    };
+}

modules/font-packages/hm.nix

@@ -0,0 +1,13 @@
+{ mkTarget, ... }:
+mkTarget {
+  name = "font-packages";
+  humanName = "Font packages";
+
+  configElements =
+    { fonts }:
+    {
+      home = {
+        inherit (fonts) packages;
+      };
+    };
+}

modules/font-packages/meta.nix

@@ -0,0 +1,15 @@
+{ lib, ... }:
+{
+  name = "Font packages";
+  maintainers = [ lib.maintainers.mightyiam ];
+  description = ''
+    This module makes the Stylix fonts available in the environment of each of
+    the platforms that this module supports.
+
+    ### Related modules
+
+    <!-- If updating this section, make sure to update it on the linked pages too. -->
+
+    - [Fontconfig](fontconfig.md)
+  '';
+}

modules/font-packages/nixos.nix

@@ -0,0 +1,13 @@
+{ mkTarget, ... }:
+mkTarget {
+  name = "font-packages";
+  humanName = "Font packages";
+
+  configElements =
+    { fonts }:
+    {
+      fonts = {
+        inherit (fonts) packages;
+      };
+    };
+}

modules/fontconfig/hm.nix

@@ -0,0 +1,9 @@
+{ mkTarget, ... }:
+mkTarget {
+  name = "fontconfig";
+  humanName = "Fontconfig";
+
+  configElements = {
+    fonts.fontconfig.enable = true;
+  };
+}

modules/fontconfig/meta.nix

@@ -0,0 +1,17 @@
+{ lib, ... }:
+{
+  name = "Fontconfig";
+  homepage = "https://fontconfig.org";
+  maintainers = [ lib.maintainers.mightyiam ];
+  description = ''
+    On NixOS, `fonts.fontconfig.defaultFonts` options are declared without
+    enabling `fonts.fontconfig.enable`. On Home Manager, only the
+    `fonts.fontconfig.enable` option is declared and enabled.
+
+    ### Related modules
+
+    <!-- If updating this section, make sure to update it on the linked pages too. -->
+
+    - [Font packages](font-packages.md)
+  '';
+}

modules/fontconfig/nixos.nix

@@ -0,0 +1,16 @@
+{ mkTarget, ... }:
+mkTarget {
+  name = "fontconfig";
+  humanName = "Fontconfig";
+
+  configElements =
+    { fonts }:
+    {
+      fonts.fontconfig.defaultFonts = {
+        monospace = [ fonts.monospace.name ];
+        serif = [ fonts.serif.name ];
+        sansSerif = [ fonts.sansSerif.name ];
+        emoji = [ fonts.emoji.name ];
+      };
+    };
+}

stylix/darwin/default.nix

@@ -9,7 +9,6 @@ let
 in
 {
   imports = [
-    ./fonts.nix
     ./palette.nix
     ../fonts.nix
     ../home-manager-integration.nix

stylix/darwin/fonts.nix

@@ -1,7 +0,0 @@
-{ config, lib, ... }:
-
-{
-  config.fonts = lib.mkIf config.stylix.enable {
-    inherit (config.stylix.fonts) packages;
-  };
-}

stylix/hm/default.nix

@@ -10,7 +10,6 @@ in
 {
   imports = [
     ./cursor.nix
-    ./fonts.nix
     ./icon.nix
     ./palette.nix
     ../cursor.nix

stylix/hm/fonts.nix

@@ -1,11 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.stylix.fonts;
-in
-{
-  config = lib.mkIf config.stylix.enable {
-    fonts.fontconfig.enable = true;
-    home.packages = cfg.packages;
-  };
-}

stylix/nixos/default.nix

@@ -10,7 +10,6 @@ in
 {
   imports = [
     ./cursor.nix
-    ./fonts.nix
     ./palette.nix
     ../cursor.nix
     ../fonts.nix

stylix/nixos/fonts.nix

@@ -1,17 +0,0 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.stylix.fonts;
-in
-{
-  config.fonts = lib.mkIf config.stylix.enable {
-    inherit (cfg) packages;
-
-    fontconfig.defaultFonts = {
-      monospace = [ cfg.monospace.name ];
-      serif = [ cfg.serif.name ];
-      sansSerif = [ cfg.sansSerif.name ];
-      emoji = [ cfg.emoji.name ];
-    };
-  };
-}