diff --git a/modules/nixvim/options.nix b/modules/nixvim/options.nix
index c006f6d..91cf697 100644
--- a/modules/nixvim/options.nix
+++ b/modules/nixvim/options.nix
@@ -15,7 +15,6 @@ in {
     globals = {
       mapleader = " ";
       maplocalleader = ",";
-      inlay_hints_visible = true;
     };
     opts = {
       termguicolors = true;
@@ -76,6 +75,7 @@ in {
       xz
       icu74
       alejandra
+      nixpkgs-fmt
       vscode-extensions.ms-vscode.cpptools
     ];
     extraPlugins = with pkgs.vimPlugins; [
diff --git a/modules/nixvim/plugins/lsp/languages/nix.nix b/modules/nixvim/plugins/lsp/languages/nix.nix
index 12b659f..014a120 100644
--- a/modules/nixvim/plugins/lsp/languages/nix.nix
+++ b/modules/nixvim/plugins/lsp/languages/nix.nix
@@ -3,7 +3,7 @@
     servers = {
       nil-ls = {
         enable = true;
-        settings.formatting.command = ["alejandra"];
+        settings.formatting.command = ["nixpkgs-fmt"];
       };
     };
   };
diff --git a/modules/nixvim/plugins/lsp/lsp.nix b/modules/nixvim/plugins/lsp/lsp.nix
index 10b89ca..9f43754 100644
--- a/modules/nixvim/plugins/lsp/lsp.nix
+++ b/modules/nixvim/plugins/lsp/lsp.nix
@@ -13,10 +13,6 @@
         "<leader>ca" = "code_action";
       };
     };
-    onAttach = ''
-      if client.server_capabilities.inlayHintProvider then
-        vim.lsp.inlay_hint.enable(bufnr, true)
-      end
-    '';
+    inlayHints = true;
   };
 }