diff --git a/modules/common/nushell/default.nix b/modules/common/nushell/default.nix
index 9a4506f..9f92de7 100644
--- a/modules/common/nushell/default.nix
+++ b/modules/common/nushell/default.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }: let
-  inherit (lib) attrValues const enabled getExe mapAttrs mkIf optionalAttrs readFile removeAttrs replaceString;
+  inherit (lib) attrValues enabled filter first foldl' getExe last match mkIf nameValuePair optionalAttrs readFile removeAttrs splitString;
 in {
   environment = optionalAttrs config.isLinux {
     sessionVariables.SHELLS = getExe pkgs.nushell;
@@ -103,12 +103,6 @@ in {
       };
     };
 
-    programs.direnv = enabled {
-      nix-direnv = enabled;
-
-      enableNushellIntegration = true;
-    };
-
     programs.nushell = enabled {
       configFile.text = readFile ./config.nu;
       envFile.text    = readFile ./environment.nu;
@@ -131,8 +125,7 @@ in {
         #     |> map (keyAndValue: nameValuePair (first keyAndValue) (last keyAndValue))
         #     |> foldl' (x: y: x // y) {};
         homeVariablesExtra = {};
-      in environmentVariables // homeVariables // homeVariablesExtra
-        |> mapAttrs (const <| replaceString "$HOME" homeConfig.home.homeDirectory);
+      in environmentVariables // homeVariables // homeVariablesExtra;
 
       shellAliases = removeAttrs config.environment.shellAliases [ "ls" "l" ] // {
         cdtmp = "cd (mktemp --directory)";