From 277f6a3f79473f25ec1b8dea31a229432949ad68 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Wed, 9 Jul 2025 20:20:52 -0400
Subject: [PATCH] Don't use stylix for fonts

---
 flake.nix                         |  4 +---
 home-manager/gtk.nix              | 10 ---------
 modules/desktop/dconf/default.nix |  4 ++--
 modules/desktop/desktop.nix       |  5 +----
 modules/desktop/fonts.nix         | 12 +++++++++++
 modules/desktop/packages.nix      |  2 ++
 stylix.nix                        | 35 +++----------------------------
 7 files changed, 21 insertions(+), 51 deletions(-)
 delete mode 100644 home-manager/gtk.nix
 create mode 100644 modules/desktop/fonts.nix

diff --git a/flake.nix b/flake.nix
index 51ec8df..d1bd7b1 100755
--- a/flake.nix
+++ b/flake.nix
@@ -82,11 +82,9 @@
           ++ opt isDesktop (
             (dirFiles ".nix" ./modules/desktop)
             ++ [
+              inputs.home-manager.nixosModules.home-manager
               inputs.stylix.nixosModules.stylix
               ./stylix.nix
-
-              inputs.home-manager.nixosModules.home-manager
-              ./home-manager.nix
             ]
           );
       };
diff --git a/home-manager/gtk.nix b/home-manager/gtk.nix
deleted file mode 100644
index 5c01fc2..0000000
--- a/home-manager/gtk.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{pkgs, ...}: {
-  gtk = {
-    enable = true;
-
-    iconTheme = {
-      name = "Papirus";
-      package = pkgs.papirus-icon-theme;
-    };
-  };
-}
diff --git a/modules/desktop/dconf/default.nix b/modules/desktop/dconf/default.nix
index a4f90fe..d328150 100644
--- a/modules/desktop/dconf/default.nix
+++ b/modules/desktop/dconf/default.nix
@@ -116,9 +116,9 @@
           font-hinting = "slight";
           font-antialiasing = "grayscale";
 
-          font-name = "Cantarell 11";
+          font-name = "sans";
           document-font-name = font-name;
-          monospace-font-name = "FiraCode Nerd Font 11";
+          monospace-font-name = "monospace";
         };
 
         #         "org/gnome/Ptyxis".default-profile-uuid = "quadradical";
diff --git a/modules/desktop/desktop.nix b/modules/desktop/desktop.nix
index 026f323..583d198 100644
--- a/modules/desktop/desktop.nix
+++ b/modules/desktop/desktop.nix
@@ -1,8 +1,5 @@
 {
-  environment.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
-    GTK_USE_PORTAL = "1";
-  };
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   services = {
     desktopManager.gnome.enable = true;
diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix
new file mode 100644
index 0000000..563d646
--- /dev/null
+++ b/modules/desktop/fonts.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  fonts = {
+    enableDefaultPackages = false;
+    packages = with pkgs; [inter nerd-fonts.fira-code twitter-color-emoji];
+    fontconfig.defaultFonts = rec {
+      serif = ["Inter"];
+      sansSerif = serif;
+      monospace = ["FiraCode Nerd Font"];
+      emoji = ["Twitter Color Emoji"];
+    };
+  };
+}
diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix
index 16c9116..f9c39af 100644
--- a/modules/desktop/packages.nix
+++ b/modules/desktop/packages.nix
@@ -16,9 +16,11 @@
     resources
     libreoffice
     wl-clipboard
+    google-cursor
     prismlauncher
     authenticator
     cinny-desktop
+    papirus-icon-theme
     nexusmods-app-unfree
     hunspellDicts.en_CA-large
   ];
diff --git a/stylix.nix b/stylix.nix
index 43182fc..eef5d79 100755
--- a/stylix.nix
+++ b/stylix.nix
@@ -5,38 +5,9 @@
     image = ./background.jpg;
     enableReleaseChecks = false;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml";
-
-    cursor = {
-      name = "GoogleDot-Blue";
-      package = pkgs.google-cursor;
-      size = 24;
-    };
-
-    fonts = {
-      serif = {
-        name = "Cantarell";
-        package = pkgs.cantarell-fonts;
-      };
-
-      sansSerif = {
-        name = "Cantarell";
-        package = pkgs.cantarell-fonts;
-      };
-
-      monospace = {
-        name = "FiraCode Nerd Font";
-        package = pkgs.nerd-fonts.fira-code;
-      };
-
-      emoji = {
-        name = "Twitter Color Emoji";
-        package = pkgs.twitter-color-emoji;
-      };
-
-      sizes = {
-        applications = 11;
-        desktop = 11;
-      };
+    targets = {
+      fontconfig.enable = false;
+      font-packages.enable = false;
     };
   };
 }