diff --git a/devenv.nix b/devenv.nix
index 29560002bb81a45c4d703999348bc0ea8a9bdc78..9bacbdae5597e6667e970dc0f02725d31b198421 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -55,62 +55,23 @@
 #set -euo pipefail
 set -x
 
-commands_coreutils=("echo" "cut" "paste" "md5sum" "wc" "pwd" "sort" "realpath" "rm" "cat" "touch" "stat" "mkdir" "ln" "trap" "env")
+export PATH="''${PATH}":${pkgs.coreutils}/bin
+export PATH="''${PATH}":${pkgs.findutils}/bin
+export PATH="''${PATH}":${pkgs.jq}/bin/
+export PATH="''${PATH}":${pkgs.rsync}/bin/
+export PATH="''${PATH}":${pkgs.bash}/bin/
+export PATH="''${PATH}":${pkgs.curl}/bin/
+export PATH="''${PATH}":${pkgs.moreutils}/bin/
+export PATH="''${PATH}":${pkgs.gnutar}/bin
+export PATH="''${PATH}":${pkgs.gzip}/bin/
+export PATH="''${PATH}":${pkgs.procps}/bin/
+export PATH="''${PATH}":${pkgs.exa}/bin/
+export PATH="''${PATH}":${pkgs.git}/bin/
+export PATH="''${PATH}":${pkgs.gnugrep}/bin/
+export PATH="''${PATH}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/
+
+export -f PATH
 
-for cmd in "''${commands_coreutils[@]}"; do
-    eval "''${cmd}() { ${pkgs.coreutils}/bin/''${cmd} \"\$@\"; }"
-    export -f "''${cmd}"
-done
-
-find() {
-  ${pkgs.findutils}/bin/find "$@"
-}
-
-export -f find
-
-rsync() {
-  ${pkgs.rsync}/bin/rsync "$@"
-}
-
-export -f rsync
-
-sh() {
-  ${pkgs.bash}/bin/sh "$@"
-}
-
-export -f sh
-
-exa() {
-  ${pkgs.exa}/bin/exa "$@"
-}
-
-export -f exa
-
-grep() {
-  ${pkgs.gnugrep}/bin/grep "$@"
-}
-
-export -f grep
-
-ps() {
-  ${pkgs.procps}/bin/ps "$@"
-}
-
-export -f ps
-
-pgrep() {
-  ${pkgs.procps}/bin/pgrep "$@"
-}
-
-export -f pgrep
-
-version() {
-  ${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/version "$@"
-}
-
-export -f version
-
-set -x
 
 if [ -z "'CI_JOB_TOKEN" ]; then
     version=''$(git describe --tags --always --dirty)
@@ -137,60 +98,17 @@ ${config.devenv.root}/bin/go-compile.sh \
   scripts.deploy-app.exec =  ''
 #!${pkgs.bash}/bin/bash
 
-commands_coreutils=("echo" "mv" "cut" "sleep" "md5sum"  "pwd" "sort" "realpath" "rm" "cat" "touch" "stat" "mkdir" "ln" "trap" "env")
-
-for cmd in "''${commands_coreutils[@]}"; do
-    eval "''${cmd}() { ${pkgs.coreutils}/bin/''${cmd} \"\$@\"; }"
-    export -f "''${cmd}"
-done
-
-jq() {
-  ${pkgs.jq}/bin/jq "$@"
-}
-
-export -f jq
-
-curl() {
-  ${pkgs.curl}/bin/curl "$@"
-}
-
-export -f curl
-
-sponge() {
-  ${pkgs.moreutils}/bin/sponge "$@"
-}
-
-export -f sponge
-
-tar() {
-  ${pkgs.gnutar}/bin/tar "$@"
-}
-
-export -f tar
-
-gzip() {
-  ${pkgs.gzip}/bin/gzip "$@"
-}
-
-export -f gzip
-
-exa() {
-  ${pkgs.exa}/bin/exa "$@"
-}
-
-export -f exa
-
-git() {
-  ${pkgs.git}/bin/git "$@"
-}
-
-export -f git
-
-version() {
-  ${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/version "$@"
-}
-
-export -f version
+export PATH="''${PATH}":${pkgs.coreutils}/bin
+export PATH="''${PATH}":${pkgs.jq}/bin/
+export PATH="''${PATH}":${pkgs.curl}/bin/
+export PATH="''${PATH}":${pkgs.moreutils}/bin/
+export PATH="''${PATH}":${pkgs.gnutar}/bin
+export PATH="''${PATH}":${pkgs.gzip}/bin/
+export PATH="''${PATH}":${pkgs.exa}/bin/
+export PATH="''${PATH}":${pkgs.git}/bin/
+export PATH="''${PATH}":${inputs.version.defaultPackage."${builtins.currentSystem}"}/bin/
+
+export -f PATH
 
 if [[ -f .env-gitlab-ci ]]; then
     source .env-gitlab-ci