diff --git a/hm/common.nix b/hm/common.nix
index b8c7121..da45364 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -475,8 +475,8 @@ in
     ];
     sessionVariables = {
       # Favourite commands
-      PAGER = "${pkgs.less}/bin/less";
-      EDITOR = "${pkgs.neovim}/bin/nvim";
+      PAGER = "less";
+      EDITOR = "nvim";
 
       # Extra config
       BOOT9_PATH = "${config.xdg.dataHome}/citra-emu/sysdata/boot9.bin";
@@ -492,7 +492,7 @@ in
       YARN_DISABLE_SELF_UPDATE_CHECK = "true"; # This also disable the creation of a ~/.yarnrc file
     } // lib.optionalAttrs config.frogeye.desktop.xorg {
       # Favourite commands
-      VISUAL = "${pkgs.neovim}/bin/nvim";
+      VISUAL = "nvim";
       BROWSER = "${config.programs.qutebrowser.package}/bin/qutebrowser";
 
       # Extra config