diff --git a/modules/common/shell/0_nushell.nu b/modules/common/shell/0_nushell.nu
index 41816c4..fa7b2e9 100644
--- a/modules/common/shell/0_nushell.nu
+++ b/modules/common/shell/0_nushell.nu
@@ -219,10 +219,6 @@ do --env {
       if ($env.IN_NIX_SHELL? | is-not-empty) {
         $suffix ++= [ $"(ansi light_blue_bold)nix" ]
       }
-      # .VENV
-      if ($env.VIRTUAL_ENV? | is-not-empty) {
-        $suffix ++= [ $"(ansi light_green_bold)($env.VIRTUAL_ENV_PROMPT)" ]
-      }
 
       $suffix | each { $'(ansi light_yellow_bold)•(ansi reset) ($in)(ansi reset)' } | str join " "
     }
@@ -230,7 +226,6 @@ do --env {
     ([ $prefix, $body, $suffix ] | str join " ") + (char newline)
   }
 
-  $env.VIRTUAL_ENV_DISABLE_PROMPT = true
   $env.PROMPT_INDICATOR = $"(ansi light_yellow_bold)┃(ansi reset) "
   $env.PROMPT_INDICATOR_VI_NORMAL = $env.PROMPT_INDICATOR
   $env.PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR
diff --git a/modules/common/shell/zoxide.nix b/modules/common/shell/zoxide.nix
index 3e193af..0d570aa 100644
--- a/modules/common/shell/zoxide.nix
+++ b/modules/common/shell/zoxide.nix
@@ -1,54 +1,47 @@
-{ lib, pkgs, ... }:
-let
+{ lib, pkgs, ... }: let
   inherit (lib) getExe;
   zoxide = getExe pkgs.zoxide;
-in
-{
-  home-manager.sharedModules = [
-    {
-      programs.zoxide = {
-        enable = true;
-        options = [ "--cmd cd" ];
-        enableNushellIntegration = false;
-      };
+in {
+  home-manager.sharedModules = [{
+    programs.zoxide = {
+      enable = true;
+      options = [ "--cmd cd" ];
+      enableNushellIntegration = false;
+    };
 
-      programs.nushell.extraConfig = # nu
-        ''
-          # Zoxide integration with full path
-          $env.config = ($env.config? | default {})
-          $env.config.hooks = ($env.config.hooks? | default {})
-          $env.config.hooks.env_change = ($env.config.hooks.env_change? | default {})
-          $env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD? | default [])
+    programs.nushell.extraConfig = /* nu */ ''
+      # Zoxide integration with full path
+      $env.config = ($env.config? | default {})
+      $env.config.hooks = ($env.config.hooks? | default {})
+      $env.config.hooks.env_change = ($env.config.hooks.env_change? | default {})
+      $env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD? | default [])
 
-          let __zoxide_hooked = ($env.config.hooks.env_change.PWD | any { try { get __zoxide_hook } catch { false } })
-          if not $__zoxide_hooked {
-            $env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD | append {
-              __zoxide_hook: true,
-              code: {|_, dir| ${zoxide} add -- $dir}
-            })
-          }
+      let __zoxide_hooked = ($env.config.hooks.env_change.PWD | any { try { get __zoxide_hook } catch { false } })
+      if not $__zoxide_hooked {
+        $env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD | append {
+          __zoxide_hook: true,
+          code: {|_, dir| ${zoxide} add -- $dir}
+        })
+      }
 
-          def --env __zoxide_z [...rest: string] {
-            let path = if ($rest | length) == 0 {
-              $env.HOME
-            } else if ($rest | length) == 1 and ($rest.0 == "-") {
-              $env.OLDPWD
-            } else if ($rest | length) == 1 and (($rest.0 | path expand) | path exists) {
-              $rest.0
-            } else {
-              ${zoxide} query --exclude (pwd) -- ...$rest | str trim -r -c (char newline)
-            }
-            cd $path
-          }
+      def --env __zoxide_z [...rest: string] {
+        let path = if ($rest | length) == 0 {
+          $env.HOME
+        } else if ($rest | length) == 1 and ($rest.0 == "-") {
+          $env.OLDPWD
+        } else {
+          ${zoxide} query --exclude (pwd) -- ...$rest | str trim -r -c (char newline)
+        }
+        cd $path
+      }
 
-          def --env __zoxide_zi [...rest: string] {
-            let path = ${zoxide} query --interactive -- ...$rest | str trim -r -c (char newline)
-            cd $path
-          }
+      def --env __zoxide_zi [...rest: string] {
+        let path = ${zoxide} query --interactive -- ...$rest | str trim -r -c (char newline)
+        cd $path
+      }
 
-          alias cd = __zoxide_z
-          alias cdi = __zoxide_zi
-        '';
-    }
-  ];
+      alias cd = __zoxide_z
+      alias cdi = __zoxide_zi
+    '';
+  }];
 }