diff --git a/bash/.bashrc b/bash/.bashrc
index f5a9b64..bc04aed 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -21,8 +21,8 @@ export JAVA_HOME=$JAVA_HOME_8
 alias adventure='emacs -batch -l dunnet'
 alias afk='pmset displaysleepnow'
 alias dnsflush='sudo killall -HUP mDNSResponder'
-alias java8="set -gx JAVA_HOME $JAVA_HOME_8"
-alias java11="set -gx JAVA_HOME $JAVA_HOME_11"
+alias java8="export JAVA_HOME=$JAVA_HOME_8"
+alias java11="export JAVA_HOME=$JAVA_HOME_11"
 alias md5sum="md5 -r $argv"
 alias vi='nvim'
 
diff --git a/fish/config.fish b/fish/config.fish
index 67c93bb..42db4cf 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -10,11 +10,7 @@ set -x LANG en_US.UTF-8
 set -x MANPAGER 'nvim +Man!'
 set -x FZF_DEFAULT_COMMAND 'fd --type f --hidden --follow --exclude .git'
 set -x FZF_DEFAULT_OPTS '--height 40%'
-
-# Java environment
-set JAVA_HOME_8  (/usr/libexec/java_home -v 1.8)
-set JAVA_HOME_11 (/usr/libexec/java_home -v 11)
-set -x JAVA_HOME $JAVA_HOME_8
+set -x JAVA_HOME (/usr/libexec/java_home -v 1.8)
 
 # Path
 set --erase PATH
@@ -29,8 +25,6 @@ test -d /sbin           ; and set -x PATH $PATH /sbin
 # Aliases
 alias adventure='emacs -batch -l dunnet'
 alias afk='pmset displaysleepnow'
-alias java8="set -gx JAVA_HOME $JAVA_HOME_8"
-alias java11="set -gx JAVA_HOME $JAVA_HOME_11"
 alias md5sum="md5 -r $argv"
 alias sha256sum="shasum -a 256 $argv"
 alias vi='nvim'
diff --git a/fish/functions/jvm.fish b/fish/functions/jvm.fish
new file mode 100644
index 0000000..75decf6
--- /dev/null
+++ b/fish/functions/jvm.fish
@@ -0,0 +1,21 @@
+function jvm --argument-names __jvm_version
+	# Only works on Mac
+	if test (uname -s) != Darwin
+		echo "Unsupported OS: "(uname -s)
+		return 1
+	end
+
+	if test -z "$__jvm_version"
+		echo "Usage: jvm <java_version>"
+		#echo
+		#/usr/libexec/java_home --verbose
+		return 2
+	end
+
+	set --local __jvm_homedir (/usr/libexec/java_home -v $__jvm_version)
+
+	if test $status -eq 0
+		echo "Setting JAVA_HOME to $__jvm_homedir"
+		set -gx JAVA_HOME $__jvm_homedir
+	end
+end