@@ -1,37 +1,11 @@

 #:depends-on:utils

 #:depends-on:nix

 #:depends-on:java

-#:depends-on:pfff

 ###

-#while [[ -n "${path[${path[(i)<<<]},${path[(i)>>>]}]}" ]]; do

-#  path[${path[(i)<<<]},${path[(i)>>>]}]=()

-#done

+orig_paths=("${path[@]}")

+for fw_p in "$orig_paths[@]"; do

+  push_exe_path "$fw_p"

+done

-prepend_exe_path "$HOME/Library/Python/2.7/bin"

-prepend_exe_path "$HOME/go/bin"

-prepend_exe_path "$HOME/.rvm/bin"

-prepend_exe_path /Library/Frameworks/Mono.framework/Versions/Current/Commands

-prepend_exe_path /usr/local/share/dotnet

-prepend_exe_path /bin

-prepend_exe_path /usr/bin

-prepend_exe_path /Developer/usr/bin

-prepend_exe_path /usr/local/bin

-prepend_exe_path "$HOME/.cargo/bin"

-prepend_exe_path /opt/local/bin

-prepend_exe_path /usr/X11/bin

-prepend_exe_path "$HOME/vim8/bin"

-prepend_exe_path "$HOME/.cabal/bin"

-prepend_exe_path "$HOME/.local/bin"

-prepend_exe_path "$JAVA_HOME"/bin

-prepend_exe_path "$HOME/.nix-profile/bin"

-prepend_exe_path "$HOME/bin"

-prepend_exe_path /opt/homebrew/bin

-

-prepend_exe_path /sbin

-prepend_exe_path /usr/sbin

-prepend_exe_path /usr/local/sbin

-prepend_exe_path /opt/local/sbin

-prepend_exe_path "$HOME/.nix-profile/sbin"

-

-PATH="${PATH%:}"

+push_exe_path "$JAVA_HOME"/bin

@@ -4,19 +4,30 @@ interactive_echo() {

   esac

 }

+remove_path() {

+  cur_idx=$path[(i)$1]

+  while (( $cur_idx <= $#path )); do

+    path[$cur_idx]=()

+    cur_idx=$path[(i)$1]

+  done

+}

+

 add_exe_path() {

+  remove_path "$1"

   if [[ -d $1 ]]; then

     path+=("$@")

   fi

 }

 push_exe_path() {

+  remove_path "$1"

   if [[ -d $1 ]]; then

     path+=("$@")

   fi

 }

 prepend_exe_path() {

+  remove_path "$1"

   if [[ -d $1 ]]; then

     path[1]=("$@" "$path[1]")

   fi

@@ -51,7 +51,6 @@ else

   init_scripts=( $PLUGIN_DIR/*.{,z}sh(N) )

-  PATH="<<<:$PATH:>>>"

   if [[ -f ~/zshrc.depends ]]; then

     source ~/zshrc.depends

   fi