From 81d1cd5632491c2fd07281cfb25746ec48577d71 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Fri, 24 Jan 2025 17:34:29 +0100
Subject: [PATCH] font fixes

---
 sys/machines/nixdesk/default.nix |  1 +
 sys/profiles/programs/fonts.nix  |  9 +++++----
 sys/profiles/themes/dark.nix     | 18 +++++++++++-------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/sys/machines/nixdesk/default.nix b/sys/machines/nixdesk/default.nix
index c165a30..0ab6dac 100644
--- a/sys/machines/nixdesk/default.nix
+++ b/sys/machines/nixdesk/default.nix
@@ -91,6 +91,7 @@
     rocmSupport = true;
     allowUnfreePredicate = pkg:
       builtins.elem (lib.getName pkg) [
+        "apple_cursor"
         "steam"
         "steam-unwrapped"
         "discord"
diff --git a/sys/profiles/programs/fonts.nix b/sys/profiles/programs/fonts.nix
index ac63a57..f023102 100644
--- a/sys/profiles/programs/fonts.nix
+++ b/sys/profiles/programs/fonts.nix
@@ -11,6 +11,7 @@
       noto-fonts
       noto-fonts-emoji
       source-code-pro
+      noto-fonts-cjk-sans
       iosevka
 
       nerd-fonts.symbols-only
@@ -31,9 +32,9 @@
     enableDefaultPackages = false;
 
     # user defined fonts
-    fontconfig.defaultFonts = {
-      monospace = ["DejaVu Sans Mono for Powerline"];
-      sansSerif = ["DejaVu Sans"];
-    };
+    # fontconfig.defaultFonts = {
+    #   monospace = ["DejaVu Sans Mono for Powerline"];
+    #   sansSerif = ["DejaVu Sans"];
+    # };
   };
 }
diff --git a/sys/profiles/themes/dark.nix b/sys/profiles/themes/dark.nix
index f19bedc..cc2f7a1 100644
--- a/sys/profiles/themes/dark.nix
+++ b/sys/profiles/themes/dark.nix
@@ -13,19 +13,23 @@
     };
     polarity = "dark";
     cursor = {
-      package = pkgs.whitesur-cursors;
-      name = "whitesur-cursors";
-      size = 16;
+      package = pkgs.apple-cursor;
+      name = "macOS";
+      size = 20;
     };
     fonts = {
       sizes = {
         terminal = 9;
         applications = 10;
       };
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+      monospace = {
+        package = pkgs.nerd-fonts.fira-code;
+        name = "FiraCode Nerd Font";
+      };
     };
   };
-
-  fonts.packages = [
-    self.packages.${pkgs.system}.cartograph-cf
-  ];
 }