diff --git a/.zprofile b/.zprofile
index d9f6075..333b1d0 100644
--- a/.zprofile
+++ b/.zprofile
@@ -8,11 +8,12 @@
 # for ssh logins, install and configure the libpam-umask package.
 #umask 022
 
-export PAGER='less'
+export PAGER='bat'
 export EDITOR='em'
 export VISUAL='em'
 export BROWSER='qutebrowser'
 export TERMINAL='urxvtcd'
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 
 # make the password-store use primary instead of clipboard
 export PASSWORD_STORE_X_SELECTION=primary
@@ -25,12 +26,22 @@ if [ -n "$BASH_VERSION" ]; then
     fi
 fi
 
-# set PATH so it includes user's private bin if it exists
+# if `$HOME/.local/bin` exists, add it to $PATH
 if [ -d "$HOME/.local/bin" ] ; then
     PATH="$HOME/.local/bin:$PATH"
 fi
 
-# set PATH so it includes user's .cargo/bin
+# if `$HOME/.cargo/bin` exists, add it to $PATH
 if [ -d "$HOME/.cargo/bin" ] ; then
     PATH="$HOME/.cargo/bin:$PATH"
 fi
+
+# if `$HOME/go/bin` exists, add it to $GOPATH
+if [ -d "$HOME/go/bin" ] ; then
+    GOPATH="$HOME/go/bin"
+fi
+
+# if `/usr/local/go/bin` exists, add it and $GOPATH to $PATH
+if [ -d "/usr/local/go/bin" ] ; then
+    PATH="/usr/local/go/bin:$GOPATH:$PATH"
+fi
diff --git a/.zshenv b/.zshenv
index fa0bcd5..1556e13 100644
--- a/.zshenv
+++ b/.zshenv
@@ -70,5 +70,7 @@ alias wttr='curl https://wttr.in/Salzburg'
 #
 alias valgrind='valgrind --track-origins=yes --leak-check=full'
 
-# use bat for showing manpages (for colors)
-export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+#
+# Cargo env
+#
+. "$HOME/.cargo/env"