From 1646e040999009d09417f50990dee245f74df9c4 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@ifi.uio.no>
Date: Sun, 7 Sep 2025 16:17:38 +0200
Subject: [PATCH] Slight refactor of importing fonts

---
 home/fonts/default.nix    | 17 +++++++++--------
 system/darwin/default.nix |  4 +++-
 system/nixos/default.nix  |  5 ++++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/home/fonts/default.nix b/home/fonts/default.nix
index cdccd96..22c64eb 100644
--- a/home/fonts/default.nix
+++ b/home/fonts/default.nix
@@ -1,8 +1,9 @@
-{ pkgs }:
-with pkgs;
-[
-  iosevka
-  source-code-pro
-  source-sans
-  source-serif
-]
+{ pkgs, ... }:
+{
+  fonts.packages = with pkgs; [
+    iosevka
+    source-code-pro
+    source-sans
+    source-serif
+  ];
+}
diff --git a/system/darwin/default.nix b/system/darwin/default.nix
index 4abcc03..f1b1d97 100644
--- a/system/darwin/default.nix
+++ b/system/darwin/default.nix
@@ -1,7 +1,9 @@
 { pkgs, ... }:
 {
 
-  fonts.packages = import ../../home/fonts { inherit pkgs; };
+  imports = [
+    ../../home/fonts
+  ];
 
   nix.linux-builder.enable = true;
 
diff --git a/system/nixos/default.nix b/system/nixos/default.nix
index e3e1966..8ec2d52 100644
--- a/system/nixos/default.nix
+++ b/system/nixos/default.nix
@@ -1,8 +1,11 @@
 { pkgs, ... }:
 {
 
+  imports = [
+    ../../home/fonts
+  ];
+
   fonts = {
-    packages = import ../../home/fonts { inherit pkgs; };
     fontconfig = {
       enable = true;
       defaultFonts = {