From 9eca4f3e7bfa08c03e94f75f341df5707ad11b4f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 25 Jul 2025 00:29:49 +0100
Subject: [PATCH] Move fonts configuration

---
 hosts/t480/configuration.nix |  1 -
 modules/nixos/default.nix    |  1 -
 modules/nixos/fonts.nix      | 30 ------------------------------
 modules2/fonts.nix           | 16 ++++++++++++++++
 4 files changed, 16 insertions(+), 32 deletions(-)
 delete mode 100644 modules/nixos/fonts.nix
 create mode 100644 modules2/fonts.nix

diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 7fcbd679..efe28e15 100644
--- a/hosts/t480/configuration.nix
+++ b/hosts/t480/configuration.nix
@@ -37,7 +37,6 @@
     desktop = {
       dconf.enable = true;
       dwm.enable = true;
-      fonts.enable = true;
       media.makemkv.enable = true;
       st.enable = true;
       thunar.enable = true;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 7d90a936..f732bb95 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -3,7 +3,6 @@
     ./avahi.nix
     ./dconf.nix
     ./dwm
-    ./fonts.nix
     ./gitea-actions-runner.nix
     ./gnupg.nix
     ./kanata.nix
diff --git a/modules/nixos/fonts.nix b/modules/nixos/fonts.nix
deleted file mode 100644
index 371b2fe1..00000000
--- a/modules/nixos/fonts.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.desktop.fonts;
-in
-{
-  options.features.desktop.fonts.enable = mkEnableOption "Enable fonts";
-
-  config = mkIf cfg.enable {
-    fonts = {
-      fontconfig = {
-        enable = true;
-      };
-
-      packages = with pkgs; [
-        nerd-fonts.jetbrains-mono
-        nerd-fonts.meslo-lg
-        terminus_font
-        terminus_font_ttf
-      ];
-    };
-  };
-}
diff --git a/modules2/fonts.nix b/modules2/fonts.nix
new file mode 100644
index 00000000..edf9dcee
--- /dev/null
+++ b/modules2/fonts.nix
@@ -0,0 +1,16 @@
+{
+  flake.modules.nixos.pc =
+    { pkgs, ... }:
+    {
+      fonts = {
+        fontconfig.enable = true;
+
+        packages = with pkgs; [
+          nerd-fonts.jetbrains-mono
+          nerd-fonts.meslo-lg
+          terminus_font
+          terminus_font_ttf
+        ];
+      };
+    };
+}