diff --git a/fish/llvmenv b/fish/llvmenv
deleted file mode 100644
index b94105a..0000000
--- a/fish/llvmenv
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env fish
-
-if type -q llvmenv
-	set -gxa PATH (llvmenv prefix)/bin
-end
-
-## EOF
diff --git a/fish/path b/fish/path
new file mode 100644
index 0000000..d026e49
--- /dev/null
+++ b/fish/path
@@ -0,0 +1,13 @@
+#!/usr/bin/env fish
+
+if test -d ~/.gem/ruby
+	set -gxa PATH ~/.gem/ruby/2.*/bin
+end
+if test -d ~/.cabal/bin
+	set -gxa PATH ~/.cabal/bin
+end
+if test -d $_agw_dir_bin/llvm/$_agw_llvm_ver/bin
+	set -gxa PATH $_agw_dir_bin/llvm/$_agw_llvm_ver/bin
+end
+
+## EOF
diff --git a/system/env/00-vars.sh b/system/env/00-vars.sh
index c44f41a..78af0a7 100644
--- a/system/env/00-vars.sh
+++ b/system/env/00-vars.sh
@@ -10,7 +10,7 @@ export GTK_USE_PORTAL=1
 export KRITA_NO_STYLE_OVERRIDE=1
 
 # misc
-export PATH=$HOME/.local/bin:$HOME/.gem/ruby/2.6.0/bin:$HOME/.cabal/bin:$PATH
+export PATH=$HOME/.local/bin:$PATH
 export DOOMWADDIR=/media/store/games/doom/iwads
 export EDITOR=vi
 export WINEPREFIX=$HOME/progs/winepfx