diff --git a/hm/dev/common.nix b/hm/dev/common.nix
index b4d162a..f0e4628 100644
--- a/hm/dev/common.nix
+++ b/hm/dev/common.nix
@@ -22,6 +22,7 @@
 
       # nix
       lix
+      nixpkgs-fmt
 
       # Always on (graphical)
     ] ++ lib.optionals config.frogeye.desktop.xorg [
@@ -62,9 +63,16 @@
       lua-ls.enable = true; # Lua (for Neovim debugging)
       perlpls.enable = config.frogeye.dev.perl; # Perl
       phpactor.enable = config.frogeye.dev.php; # PHP
-      nixd = {
+      # Nix
+      nil-ls = {
         enable = true;
-        settings.formatting.command = [ "nixpkgs-fmt" ];
+        settings = {
+          formatting.command = [ "nixpkgs-fmt" ];
+          nix.flake = {
+            autoArchive = true;
+            autoEvalInputs = true;
+          };
+        };
       };
       # TODO Something for SQL. sqls is deprecated, sqlls is not in Nixpkgs. Probably needs a DB connection configured anyways?
       yamlls.enable = true; # YAML