Add fonts.nix configuration file

yousiki · Mar 11, 2024 · 7c229e6 · 7c229e6
1 parent af9b27d
commit 7c229e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/configurations/nixos/mai/default.nix b/src/configurations/nixos/mai/default.nix
@@ -7,9 +7,9 @@
     ./_hardware-configuration.nix
 
     # Host-specific profiles
-    commonProfiles.fonts
     commonProfiles.nix
     commonProfiles.packages
+    nixosProfiles.fonts
 
     # Home-manager module
     globals.inputs.home-manager.nixosModules.home-manager

diff --git a/src/profiles/common/fonts.nix → src/profiles/nixos/fonts.nix b/src/profiles/common/fonts.nix → src/profiles/nixos/fonts.nix
@@ -19,15 +19,7 @@ with lib; let
     wqy_microhei
     wqy_zenhei
   ];
-in
-  mkMerge [
-    {
-      fonts.fontDir.enable = true;
-    }
-    (mkIf pkgs.stdenv.isLinux {
-      fonts.packages = fontPackages;
-    })
-    (mkIf pkgs.stdenv.isDarwin {
-      fonts.fonts = fontPackages;
-    })
-  ]
+in {
+  fonts.fontDir.enable = true;
+  fonts.packages = fontPackages;
+}