From fc2492504c9aa9a5e7b94982bb67d3560a28e652 Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Wed, 6 Oct 2021 15:28:46 +0200
Subject: [PATCH 1/4] Move manpager setting to profile

---
 .zprofile | 1 +
 .zshenv   | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.zprofile b/.zprofile
index d9f6075..2eaf832 100644
--- a/.zprofile
+++ b/.zprofile
@@ -13,6 +13,7 @@ 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
diff --git a/.zshenv b/.zshenv
index fa0bcd5..adc3771 100644
--- a/.zshenv
+++ b/.zshenv
@@ -69,6 +69,3 @@ alias wttr='curl https://wttr.in/Salzburg'
 # Developing
 #
 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'"

From 012f6d19364e56d37cec5f579180b5e1145caefb Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Wed, 6 Oct 2021 15:29:56 +0200
Subject: [PATCH 2/4] Add cargo env

---
 .zshenv | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.zshenv b/.zshenv
index adc3771..1556e13 100644
--- a/.zshenv
+++ b/.zshenv
@@ -69,3 +69,8 @@ alias wttr='curl https://wttr.in/Salzburg'
 # Developing
 #
 alias valgrind='valgrind --track-origins=yes --leak-check=full'
+
+#
+# Cargo env
+#
+. "$HOME/.cargo/env"

From 0916d0d54ac4f0aa4e55f7702d7704400e07762f Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Wed, 6 Oct 2021 15:30:32 +0200
Subject: [PATCH 3/4] Use bat instead of less

---
 .zprofile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.zprofile b/.zprofile
index 2eaf832..4509012 100644
--- a/.zprofile
+++ b/.zprofile
@@ -8,7 +8,7 @@
 # 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'

From 1565ba2beb3aae7942d0ddb9f318d418f546f15c Mon Sep 17 00:00:00 2001
From: finga <finga@onders.org>
Date: Wed, 6 Oct 2021 15:31:42 +0200
Subject: [PATCH 4/4] Add go paths

Also improve comments.
---
 .zprofile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/.zprofile b/.zprofile
index 4509012..333b1d0 100644
--- a/.zprofile
+++ b/.zprofile
@@ -26,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