From 79f724e25351d5cb71720631ba2e19a288f97df9 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sat, 23 Mar 2024 23:29:34 -0400
Subject: [PATCH] desktop: moved fractal from gnome and nheko from kde into one
 matrix choice in desktop module

---
 modules/desktop.nix       | 11 +++++++++++
 modules/gnome/default.nix |  1 -
 modules/kde.nix           |  1 -
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/desktop.nix b/modules/desktop.nix
index 7c03d04d..f87a253e 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -18,12 +18,23 @@
 
   environment.systemPackages = with pkgs; [
     firefox
+    fractal
     gnome.gnome-software
     google-chrome
     tauon
     zoom-us
   ];
 
+  fonts.packages = with pkgs; [
+    (nerdfonts.override { fonts = [ "Hack" "DroidSansMono" ]; })
+    fira-code
+    fira-code-symbols
+    liberation_ttf
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+  ];
+
   fonts.fontDir.enable = true;
   
   system.fsPackages = [ pkgs.bindfs ];
diff --git a/modules/gnome/default.nix b/modules/gnome/default.nix
index 8f846d8b..c056c3dc 100644
--- a/modules/gnome/default.nix
+++ b/modules/gnome/default.nix
@@ -7,7 +7,6 @@
     ];
 
   environment.systemPackages = with pkgs; [
-    fractal
     gnomeExtensions.appindicator
     gnomeExtensions.blur-my-shell
     gnomeExtensions.gsconnect
diff --git a/modules/kde.nix b/modules/kde.nix
index 6e4c077f..590c8980 100644
--- a/modules/kde.nix
+++ b/modules/kde.nix
@@ -23,7 +23,6 @@
     kdePackages.kio-gdrive
     kdePackages.sddm-kcm
     maliit-keyboard
-    nheko
   ];
 
   environment.sessionVariables.NIXOS_OZONE_WL = "1";