diff --git a/home/nvim.nix b/home/nvim.nix
index e269ba8..c955b3a 100644
--- a/home/nvim.nix
+++ b/home/nvim.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   pkgs,
   ...
@@ -43,6 +44,10 @@ in {
     ];
   };
 
+  home.sessionVariables = lib.mkIf config.programs.neovim.enable {
+    MANPAGER = "nvim +Man!";
+  };
+
   xdg.configFile."nvim" = {
     source = nvimConfig;
     recursive = true;
diff --git a/home/zsh.nix b/home/zsh.nix
index cf78e7f..614dd60 100644
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -56,6 +56,8 @@
       # Ghostty shell integration expects a resource directory; the Nix app
       # bundle lives in the store instead of /Applications.
       export GHOSTTY_RESOURCES_DIR="${pkgs.ghostty-bin}/Applications/Ghostty.app/Contents/Resources/ghostty"
+
+      export MANPAGER="nvim +Man!"
     '';
 
     initContent = lib.mkMerge [
diff --git a/modules/packages.nix b/modules/packages.nix
index 537f648..8cd689a 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -87,6 +87,7 @@ in {
     diff-so-fancy
     git-filter-repo
     git-lfs
+    goose
     graphite
     google-cloud-sdk
     gwsPackage