diff --git a/modules/common/git.nix b/modules/common/git.nix
index 32cb99f..dbca01f 100644
--- a/modules/common/git.nix
+++ b/modules/common/git.nix
@@ -77,7 +77,7 @@ in {
 
   home-manager.sharedModules = [
     (homeArgs: let
-      homeConfig = homeArgs.config;
+      config' = homeArgs.config;
 
       gitUrl    = self.best.services.forgejo.settings.server.ROOT_URL;
       gitDomain = head <| match "https://(.*)/" gitUrl;
@@ -96,8 +96,8 @@ in {
       '';
 
       programs.git = enabled {
-        userName  = homeConfig.programs.jujutsu.settings.user.name;
-        userEmail = homeConfig.programs.jujutsu.settings.user.email;
+        userName  = config'.programs.jujutsu.settings.user.name;
+        userEmail = config'.programs.jujutsu.settings.user.email;
 
         lfs = enabled;
 
diff --git a/modules/common/nushell/config.nu b/modules/common/nushell/config.nu
index e260773..e61cdd5 100644
--- a/modules/common/nushell/config.nu
+++ b/modules/common/nushell/config.nu
@@ -18,6 +18,8 @@ $env.config.cursor_shape.emacs = "line"
 $env.config.cursor_shape.vi_insert = "line"
 $env.config.cursor_shape.vi_normal = "block"
 
+$env.CARAPACE_BRIDGES = "inshellisense,carapace,zsh,fish,bash"
+
 $env.config.completions.algorithm = "substring"
 $env.config.completions.sort = "smart"
 $env.config.completions.case_sensitive = false
@@ -536,8 +538,3 @@ def --wrapped jc [...arguments: string@"nu-complete jc"]: [any -> table, any ->
     $run.stdout | from json
   }
 }
-
-source ~/.config/nushell/zoxide.nu
-
-$env.CARAPACE_BRIDGES = "inshellisense,carapace,zsh,fish,bash"
-source ~/.config/nushell/carapace.nu
diff --git a/modules/common/nushell/default.nix b/modules/common/nushell/default.nix
index 06cc79d..a5229d4 100644
--- a/modules/common/nushell/default.nix
+++ b/modules/common/nushell/default.nix
@@ -27,48 +27,47 @@ in {
         fish          # For completions.
         zsh           # For completions.
         inshellisense # For completions.
-
-        zoxide   # For better cd.
       ;
     };
   };
 
   home-manager.sharedModules = [(homeArgs: let
-    homeConfig = homeArgs.config;
+    config' = homeArgs.config;
   in {
-    xdg.configFile = {
-      "nushell/carapace.nu".source = pkgs.runCommand "carapace.nu" {} ''
-        ${getExe pkgs.carapace} _carapace nushell > $out
-      '';
-
-      "nushell/zoxide.nu".source = pkgs.runCommand "zoxide.nu" {} ''
-        ${getExe pkgs.zoxide} init nushell --cmd cd > $out
-      '';
-
-      "nushell/ls_colors.txt".source = pkgs.runCommand "ls_colors.txt" {} ''
-        ${getExe pkgs.vivid} generate gruvbox-dark-hard > $out
-      '';
+    programs.carapace = enabled {
+      enableNushellIntegration = true;
     };
 
     programs.direnv = enabled {
-      nix-direnv = enabled;
-
       enableNushellIntegration = true;
+
+      nix-direnv = enabled;
+    };
+
+    programs.zoxide = enabled {
+      enableNushellIntegration = true;
+
+      options = [ "--cmd cd" ];
     };
 
     programs.nushell = enabled {
       configFile.text = readFile ./config.nu;
-      envFile.text    = readFile ./environment.nu;
+
+      extraConfig = ''
+        $env.LS_COLORS = open ${pkgs.runCommand "ls_colors.txt" {} ''
+          ${getExe pkgs.vivid} generate gruvbox-dark-hard > $out
+        ''}
+      '';
 
       environmentVariables = let
         environmentVariables = config.environment.variables;
 
-        homeVariables      = homeConfig.home.sessionVariables;
+        homeVariables      = config'.home.sessionVariables;
         # homeVariablesExtra = pkgs.runCommand "home-variables-extra.env" {} ''
         #     alias export=echo
         #     # echo foo > $out
         #     # FIXME
-        #     eval $(cat ${homeConfig.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh) > $out
+        #     eval $(cat ${config'.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh) > $out
         #   ''
         #     # |> (aaa: (_: break _) aaa)
         #     |> readFile
@@ -79,7 +78,7 @@ in {
         #     |> foldl' (x: y: x // y) {};
         homeVariablesExtra = {};
       in environmentVariables // homeVariables // homeVariablesExtra
-        |> mapAttrs (const <| replaceString "$HOME" homeConfig.home.homeDirectory);
+        |> mapAttrs (const <| replaceString "$HOME" config'.home.homeDirectory);
 
       shellAliases = removeAttrs config.environment.shellAliases [ "ls" "l" ] // {
         cdtmp = "cd (mktemp --directory)";
diff --git a/modules/common/nushell/environment.nu b/modules/common/nushell/environment.nu
deleted file mode 100644
index bf1124b..0000000
--- a/modules/common/nushell/environment.nu
+++ /dev/null
@@ -1 +0,0 @@
-# Crickets...