diff --git a/packages/devkit/default.nix b/packages/devkit/default.nix
index 2b45cbb..c8242e9 100644
--- a/packages/devkit/default.nix
+++ b/packages/devkit/default.nix
@@ -6,9 +6,6 @@
   yazi = pkgs.callPackage ./yazi {};
   zellij = pkgs.callPackage ./zellij {
     shell = zsh;
-    addPath = [ghostty git lazygit starship yazi zsh];
-  };
-  zsh = pkgs.callPackage ./zsh {
-    addPath = [git lazygit starship yazi];
   };
+  zsh = pkgs.callPackage ./zsh {};
 }
diff --git a/packages/devkit/zellij/default.nix b/packages/devkit/zellij/default.nix
index ed80e79..d3a4c74 100644
--- a/packages/devkit/zellij/default.nix
+++ b/packages/devkit/zellij/default.nix
@@ -5,7 +5,6 @@
   lib,
   zellij ? pkgs.zellij,
   shell ? pkgs.zsh,
-  addPath ? [],
 }: let
   colors = import ../colors.nix;
 
@@ -50,14 +49,7 @@
     '';
 
   drv = symlinkJoin ({
-      paths = pkgs.writeShellScriptBin "zellij" ''
-        ${
-          if (builtins.length addPath) > 0
-          then "export PATH=\"$PATH:${lib.makeBinPath addPath}\""
-          else ""
-        }
-        ${lib.getExe zellij} "$@"
-      '';
+      paths = zellij;
 
       nativeBuildInputs = [makeWrapper];
 
diff --git a/packages/devkit/zsh/.zshrc b/packages/devkit/zsh/.zshrc
index 10ef729..5f13006 100644
--- a/packages/devkit/zsh/.zshrc
+++ b/packages/devkit/zsh/.zshrc
@@ -33,8 +33,10 @@ setopt SHARE_HISTORY
 unsetopt EXTENDED_HISTORY
 
 # Start starship for interactive shells
-if [[ "$TERM" != "dump" ]]; then
-	eval "$(starship init zsh)"
+if command -v "starship" >/dev/null 2>&1; then
+	if [[ "$TERM" != "dump" ]]; then
+		eval "$(starship init zsh)"
+	fi
 fi
 
 # Syntax highlighting
diff --git a/packages/devkit/zsh/default.nix b/packages/devkit/zsh/default.nix
index e697f7d..b1650a2 100644
--- a/packages/devkit/zsh/default.nix
+++ b/packages/devkit/zsh/default.nix
@@ -4,7 +4,6 @@
   pkgs,
   lib,
   zsh ? pkgs.zsh,
-  addPath ? [],
   # .zshrc
   zshrc-prepend ? "",
   zshrc-append ? "",
@@ -16,14 +15,7 @@
   zshrc-append-file = pkgs.writeText ".zshrc_append" zshrc-append;
 
   drv = symlinkJoin ({
-      paths = pkgs.writeShellScriptBin "zsh" ''
-        ${
-          if (builtins.length addPath) > 0
-          then "export PATH=\"$PATH:${lib.makeBinPath addPath}\""
-          else ""
-        }
-        ${lib.getExe zsh} "$@"
-      '';
+      paths = zsh;
 
       nativeBuildInputs = [makeWrapper];