diff --git a/machines/enka/bat/default.nix b/machines/enka/bat/default.nix
index 231d29d..3d342aa 100644
--- a/machines/enka/bat/default.nix
+++ b/machines/enka/bat/default.nix
@@ -1,7 +1,7 @@
 { theme, homeConfiguration, enabled, ... }:
 
 homeConfiguration [ "nixos" "root" ] {
-  home.sessionVariables = {
+  programs.nushell.environmentVariables = {
     MANPAGER = ''"bat --plain --language man"'';
     PAGER    = ''"bat --plain"'';
   };
diff --git a/machines/enka/helix/default.nix b/machines/enka/helix/default.nix
index 75b6008..278bfc1 100644
--- a/machines/enka/helix/default.nix
+++ b/machines/enka/helix/default.nix
@@ -1,11 +1,10 @@
 { lib, pkgs, homeConfiguration, homePackages, enabled, ... }: lib.recursiveUpdate
 
 (homeConfiguration [ "nixos" "root" ] {
-  programs.nushell.shellAliases.x = "hx";
+  programs.nushell.environmentVariables.EDITOR = "hx";
+  programs.nushell.shellAliases.x              = "hx";
 
   programs.helix = enabled {
-    defaultEditor = true;
-
     settings.theme = "base16_transparent";
 
     settings.editor = {
diff --git a/machines/enka/nushell/default.nix b/machines/enka/nushell/default.nix
index 78d0eb5..5208bad 100644
--- a/machines/enka/nushell/default.nix
+++ b/machines/enka/nushell/default.nix
@@ -11,7 +11,9 @@
     configFile.source = ./configuration.nu;
     envFile.source    = ./environment.nu;
 
-    environmentVariables = config.environment.variables;
+    environmentVariables = {
+      inherit (config.environment.variables) NIX_LD;
+    };
 
     shellAliases = {
       cdtmp = "cd (mktemp --directory)";