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..b3d1ae5 100644
--- a/home/modules/neovim.nix
+++ b/home/modules/neovim.nix
@@ -21,6 +21,12 @@ in
     # };
   };
   config = lib.mkIf cfg.enable {
+    # Set nvim as manpager and default editor
+    home.sessionVariables = {
+      EDITOR = "nvim";
+      MANPAGER = "nvim +Man!";
+    };
+
     programs.neovim =
       let
         nvim-treesitter = pkgs.vimPlugins.nvim-treesitter;