diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 870187d..27c4494 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -78,13 +78,9 @@ in
         unrar
         inputs.w17.packages.x86_64-linux.default
         aichat
-        (pkgs.nerdfonts.override {
-          fonts = [
-            "JetBrainsMono"
-            "FiraCode"
-            "FiraMono"
-          ];
-        })
+        nerd-fonts.jetbrains-mono
+        nerd-fonts.fira-code
+        nerd-fonts.fira-mono
         nix-output-monitor
         nodePackages.pnpm
         npm-check-updates
diff --git a/home-manager/programs/topgrade.nix b/home-manager/programs/topgrade.nix
index a57b6f5..66ccace 100644
--- a/home-manager/programs/topgrade.nix
+++ b/home-manager/programs/topgrade.nix
@@ -22,6 +22,7 @@ in
           "bun"
           "tldr"
           "flutter"
+          "nix"
         ];
       };
       git.repos = [ configPath ];