2 files changed, 5 insertions, 1 deletions
diff --git a/modules/tools/nixvim/default.nix b/modules/tools/nixvim/default.nix
index 6050695..be17856 100644
--- a/modules/tools/nixvim/default.nix
+++ b/modules/tools/nixvim/default.nix
@@ -76,6 +76,9 @@
       };
     };
 
-    home.sessionVariables.EDITOR = "nvim";
+    home.sessionVariables = {
+      EDITOR = lib.mkForce (lib.getExe config.programs.nixvim.package);
+      MANPAGER = "${lib.getExe config.programs.nixvim.package} +Man!";
+    };
   };
 }
diff --git a/modules/tools/nixvim/plugins/lsp.nix b/modules/tools/nixvim/plugins/lsp.nix
index 1621d43..fa7dbe2 100644
--- a/modules/tools/nixvim/plugins/lsp.nix
+++ b/modules/tools/nixvim/plugins/lsp.nix
@@ -6,6 +6,7 @@
     plugins.lsp = {
       enable = true;
       inlayHints = true;
+      autoLoad = true;
       keymaps.lspBuf = {
         K = "hover";
         gD = "references";