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