diff --git a/modules/cli/nixvim.nix b/modules/cli/nixvim.nix
index f5f2c08..6b1bc75 100644
--- a/modules/cli/nixvim.nix
+++ b/modules/cli/nixvim.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, userConfig, ... }:
 
 {
   programs.nixvim = {
@@ -227,8 +227,17 @@
           nixd = {
             enable = true;
             filetypes = [ "nix" ];
+            formatting = {
+              command = [ "nixfmt" ];
+            };
+
+            nixpkgs.expr = ''
+              import (builtins.getFlake "/etc/nixos/").inputs.nixpkgs { }
+            '';
+            home-manager.expr = ''
+              (builtins.getFlake "/home/${userConfig.username}/.home-manager").homeConfigurations."${userConfig.username}@${userConfig.hostName}".options
+            '';
           };
-          nil_ls.enable = true;
           # other
           marksman.enable = true;
         };
diff --git a/modules/packages.nix b/modules/packages.nix
index 73b04b9..64358f1 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -39,6 +39,7 @@ in
       bc
       nh
       runc
+      nixfmt
 
       # Music
       spotify