diff --git a/systems/fonts.nix b/systems/fonts.nix
index 9b88664..1dadaea 100644
--- a/systems/fonts.nix
+++ b/systems/fonts.nix
@@ -11,78 +11,79 @@
     noto-fonts-emoji
     roboto
     liberation_ttf
-    (nerdfonts.override {
-      fonts = [
-        # "0xProto"
-        "3270"
-        # "Agave"
-        # "AnonymousPro"
-        # "Arimo"
-        # "AurulentSansMono"
-        # "BigBlueTerminal"
-        # "BitstreamVeraSansMono"
-        # "CascadiaCode"
-        # "CascadiaMono"
-        # "CodeNewRoman"
-        # "ComicShannsMono"
-        # "CommitMono"
-        # "Cousine"
-        # "D2Coding"
-        # "DaddyTimeMono"
-        "DejaVuSansMono"
-        # "DroidSansMono"
-        # "EnvyCodeR"
-        # "FantasqueSansMono"
-        "FiraCode"
-        # "FiraMono"
-        # "GeistMono"
-        # "Go-Mono"
-        # "Gohu"
-        # "Hack"
-        # "Hasklig"
-        # "HeavyData"
-        # "Hermit"
-        # "IBMPlexMono"
-        # "Inconsolata"
-        # "InconsolataGo"
-        # "InconsolataLGC"
-        # "IntelOneMono"
-        # "Iosevka"
-        # "IosevkaTerm"
-        # "IosevkaTermSlab"
-        "JetBrainsMono"
-        # "Lekton"
-        # "LiberationMono"
-        # "Lilex"
-        # "MPlus"
-        # "MartianMono"
-        # "Meslo"
-        # "Monaspace"
-        # "Monofur"
-        # "Monoid"
-        # "Mononoki"
-        # "NerdFontsSymbolsOnly"
-        # "Noto"
-        # "OpenDyslexic"
-        # "Overpass"
-        # "ProFont"
-        # "ProggyClean"
-        # "Recursive"
-        # "RobotoMono"
-        # "ShareTechMono"
-        # "SourceCodePro"
-        # "SpaceMono"
-        # "Terminus"
-        # "Tinos"
-        "Ubuntu"
-        # "UbuntuMono"
-        # "UbuntuSans"
-        # "VictorMono"
-        # "ZedMono"
-        # "iA-Writer"
-      ];
-    })
     dejavu_fonts
     roboto-serif
-  ];
+  ] ++ map (x: nerd-fonts.${x}) [
+      # "_0xproto"
+      "_3270"
+      # "agave"
+      # "anonymice"
+      # "arimo"
+      # "aurulent-sans-mono"
+      # "bigblue-terminal"
+      # "bitstream-vera-sans-mono"
+      # "blex-mono"
+      # "caskaydia-cove"
+      # "caskaydia-mono"
+      # "code-new-roman"
+      # "comic-shanns-mono"
+      # "commit-mono"
+      # "cousine"
+      # "d2coding"
+      # "daddy-time-mono"
+      "dejavu-sans-mono"
+      # "departure-mono"
+      # "droid-sans-mono"
+      # "envy-code-r"
+      # "fantasque-sans-mono"
+      "fira-code"
+      "fira-mono"
+      # "geist-mono"
+      # "go-mono"
+      # "gohufont"
+      # "hack"
+      # "hasklug"
+      # "heavy-data"
+      # "hurmit"
+      # "im-writing"
+      # "inconsolata"
+      # "inconsolata-go"
+      # "inconsolata-lgc"
+      # "intone-mono"
+      # "iosevka"
+      # "iosevka-term"
+      # "iosevka-term-slab"
+      "jetbrains-mono"
+      # "lekton"
+      # "liberation"
+      # "lilex"
+      # "martian-mono"
+      # "meslo-lg"
+      # "monaspace"
+      # "monofur"
+      # "monoid"
+      # "mononoki"
+      # "mplus"
+      # "noto"
+      # "open-dyslexic"
+      # "overpass"
+      # "override"
+      # "overrideDerivation"
+      # "profont"
+      # "proggy-clean-tt"
+      # "recurseForDerivations"
+      # "recursive-mono"
+      # "roboto-mono"
+      # "sauce-code-pro"
+      # "shure-tech-mono"
+      # "space-mono"
+      # "symbols-only"
+      # "terminess-ttf"
+      # "tinos"
+      "ubuntu"
+      # "ubuntu-mono"
+      # "ubuntu-sans"
+      # "victor-mono"
+      # "zed-mono"
+    ];
 }