diff --git a/Droidnix/README.org b/Droidnix/README.org
index feab623fb..c323779a5 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -192,13 +192,6 @@ outputs =
       lib.nixosSystem {
         inherit system;
         modules = [
-          #nerdfonts
-          ({ config, pkgs, ... }: {
-                      environment.systemPackages = with pkgs; [
-                        nerdfonts.packages.iosevka
-                        nerdfonts.packages.firacode
-                      ];
-                    })
 
           # Import machine-specific configurations
           ./assets/flake/machines/traveldroid/top.nix
@@ -918,11 +911,12 @@ This is top file of this level which contains just an import statement for all r
 ** =generated/system/core/fonts.nix=
 This file installs and configures fonts
 #+BEGIN_SRC nix :tangle generated/system/core/fonts.nix :noweb tangle :mkdirp yes :eval never-html
+
 { config, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    nerdfonts.iosevka
-    nerdfonts.firacode
+    nerdfonts.packages.iosevka
+    nerdfonts.packages.firacode
   ];
 }
 #+END_SRC
diff --git a/Droidnix/flake.nix b/Droidnix/flake.nix
index a89df37d5..51bd3348e 100644
--- a/Droidnix/flake.nix
+++ b/Droidnix/flake.nix
@@ -49,13 +49,6 @@ outputs =
       lib.nixosSystem {
         inherit system;
         modules = [
-          #nerdfonts
-          ({ config, pkgs, ... }: {
-                      environment.systemPackages = with pkgs; [
-                        nerdfonts.packages.iosevka
-                        nerdfonts.packages.firacode
-                      ];
-                    })
 
           # Import machine-specific configurations
           ./assets/flake/machines/traveldroid/top.nix
diff --git a/Droidnix/generated/system/core/fonts.nix b/Droidnix/generated/system/core/fonts.nix
index 1f97990ea..79ae71eb3 100644
--- a/Droidnix/generated/system/core/fonts.nix
+++ b/Droidnix/generated/system/core/fonts.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   environment.systemPackages = with pkgs; [
-    nerdfonts.iosevka
-    nerdfonts.firacode
+    nerdfonts.packages.iosevka
+    nerdfonts.packages.firacode
   ];
 }