diff --git a/home.nix b/home.nix
index f7732e6..1979b87 100644
--- a/home.nix
+++ b/home.nix
@@ -22,11 +22,6 @@
 
   home.file = { };
 
-  home.sessionVariables = {
-    EDITOR = "nvim";
-    MANPAGER = "nvim +Man!";
-  };
-
   # wayland.windowManager.hyprland = {
   #   enable = true;
   #   package = pkgs.hyprland;
diff --git a/home/modules/neovim.nix b/home/modules/neovim.nix
index 5cae4eb..24726f0 100644
--- a/home/modules/neovim.nix
+++ b/home/modules/neovim.nix
@@ -39,6 +39,12 @@ in
         withPython3 = true;
         withRuby = true;
 
+        # Set nvim as manpager and default editor
+        home.sessionVariables = {
+          EDITOR = "nvim";
+          MANPAGER = "nvim +Man!";
+        };
+
         # TODO: nvim config nix import
         extraLuaConfig = ''
           -- bootstrap lazy.nvim, LazyVim and your plugins