From 482bcef47a3b7ee63553c58d200065857ec42b1c Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 2 Mar 2024 20:30:02 +0300
Subject: 2024-03-02

---
 modules/darwin/common/default.nix |  1 +
 modules/darwin/common/stylix.nix  | 11 +++++++++++
 modules/darwin/default.nix        |  1 -
 modules/darwin/fonts.nix          | 16 ----------------
 4 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 modules/darwin/common/stylix.nix
 delete mode 100644 modules/darwin/fonts.nix

(limited to 'modules/darwin')

diff --git a/modules/darwin/common/default.nix b/modules/darwin/common/default.nix
index 4d4824f..04f7b29 100644
--- a/modules/darwin/common/default.nix
+++ b/modules/darwin/common/default.nix
@@ -6,6 +6,7 @@ _: {
     ./nix.nix
     ./secrets.nix
     ./shell.nix
+    ./stylix.nix
     ./users.nix
     ./xdg.nix
   ];
diff --git a/modules/darwin/common/stylix.nix b/modules/darwin/common/stylix.nix
new file mode 100644
index 0000000..b5bb119
--- /dev/null
+++ b/modules/darwin/common/stylix.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  inputs,
+  lib,
+  ...
+}:
+with lib; {
+  imports = [inputs.stylix.darwinModules.stylix];
+
+  fonts.fonts = mkAfter config.modules.common.stylix.fonts.extraPackages;
+}
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index fbc5c1e..ba7a2a7 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,7 +1,6 @@
 _: {
   imports = [
     ./common
-    ./fonts.nix
     ./gnupg.nix
     ./homebrew.nix
     ./profiles
diff --git a/modules/darwin/fonts.nix b/modules/darwin/fonts.nix
deleted file mode 100644
index c52d73e..0000000
--- a/modules/darwin/fonts.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.nixfiles.modules.fonts;
-in {
-  config = mkIf cfg.enable {
-    fonts = {
-      fonts = cfg.packages;
-
-      fontDir.enable = true;
-    };
-  };
-}
-- 
cgit 1.4.1