diff --git a/configuration.nix b/configuration.nix
index e9bd760..1015881 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -244,4 +244,22 @@
             };
         };
     };
+
+    # Fonts
+    fonts = {
+        packages = with pkgs; [
+            symbola
+            noto-fonts
+            noto-fonts-cjk-sans
+            noto-fonts-emoji
+            fira-code
+            fira-code-symbols
+            jetbrains-mono
+            # Nerd fonts
+            (nerdfonts.override {
+                fonts = [ "FiraCode" "JetBrainsMono" ];
+            })
+        ];
+        enableDefaultPackages = false;
+    };
 }
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 0119811..30857dc 100755
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -8,9 +8,6 @@
         # Tailsccale
         tailscale
 
-        # Fonts
-        fira-code-nerdfont
-
         # KDE Packages
         kdePackages.kate
         kdePackages.elisa