Move monospace fonts into a theme

lib/nixos/configuration.nix

@@ -1,6 +1,7 @@
 {
   inputs,
   desktop ? false,
+  self,
 }: {pkgs, ...}: let
   configure-gtk = pkgs.writeTextFile {
     name = "configure-gtk";
@@ -16,6 +17,8 @@
     '';
   };
 
+  theme = import "${self}/lib/theme" {inherit pkgs;};
+
   username = "opdavies";
 in {
   nixpkgs.config.allowUnfree = true;
@@ -185,7 +188,8 @@ in {
       };
     };
 
-    packages = with pkgs; [
+    packages = with pkgs;
+      [
         (nerdfonts.override {
           fonts = [
             "AnonymousPro"
@@ -194,9 +198,11 @@ in {
             "IntelOneMono"
             "Iosevka"
             "JetBrainsMono"
-          "Meslo"
           ];
         })
+      ]
+      ++ [
+        theme.fonts.monospace.package
       ];
   };
 

lib/nixos/default.nix

@@ -5,7 +5,7 @@
 }: {
   desktop ? false,
 }: let
-  configuration = import ./configuration.nix {inherit desktop inputs;};
+  configuration = import ./configuration.nix {inherit desktop inputs self;};
   hardwareConfiguration = import ./hardware-configuration.nix;
 in
   inputs.nixpkgs.lib.nixosSystem {

lib/nixos/home-manager/modules/alacritty.nix

@@ -1,4 +1,14 @@
 {
+  lib,
+  pkgs,
+  self,
+  ...
+}: let
+  inherit (lib) strings;
+  inherit (strings) toInt;
+
+  theme = import "${self}/lib/theme" {inherit pkgs;};
+in {
   programs.alacritty = {
     enable = true;
 
@@ -11,11 +21,10 @@
       };
 
       font = {
-        size = 12.0;
+        size = toInt "${theme.fonts.monospace.size}";
 
         bold.style = "Regular";
-        normal.family = "GeistMono Nerd Font Mono";
+        normal.family = "${theme.fonts.monospace.name}";
-        # fc-list : family | sort | grep "Nerd Font"
 
         offset.y = 12;
         glyph_offset.y = 6;

lib/theme/default.nix

@@ -0,0 +1,11 @@
+{pkgs, ...}: {
+  fonts = {
+    monospace = {
+      name = "MesloLGSDZ Nerd Font Mono";
+      # fc-list : family | sort | grep "Nerd Font"
+
+      package = pkgs.nerdfonts.override {fonts = ["Meslo"];};
+      size = "10";
+    };
+  };
+}