From 4da248eadc018cc9176695b21caa6130f7e3eca7 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Tue, 2 Feb 2021 09:03:51 +0000
Subject: [PATCH] Few bash changes

---
 bash/.bash_functions |  9 ++++-----
 bash/.bash_profile   | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/bash/.bash_functions b/bash/.bash_functions
index 8b1b760..4979076 100644
--- a/bash/.bash_functions
+++ b/bash/.bash_functions
@@ -1,4 +1,3 @@
-
 # Git pulls latest dotfiles
 function update-dotfiles() {
     prevdir=$PWD
@@ -14,15 +13,15 @@ function update-dotfiles() {
 }
 
 function add-sshkey() {
-    TIMEOUT="1h"
+    TIMEOUT="2h"
     NAME=$1
 
     if [ -z "$NAME" ]; then
         echo "Current Keys"
         ssh-add -L
     else
-        if [ -f "$HOME/.ssh/id_ed25519_${NAME}" ]; then
-            ssh-add -t $TIMEOUT "$HOME/.ssh/id_ed25519_${NAME}"
+        if [ -f "${HOME}/.ssh/id_ed25519_${NAME}" ]; then
+            ssh-add -t $TIMEOUT "${HOME}/.ssh/id_ed25519_${NAME}"
         else
             echo "No key named ${NAME} found..."
         fi
@@ -39,4 +38,4 @@ function demoprompt() {
         PS1="\$ "
         clear
     fi
-}
\ No newline at end of file
+}
diff --git a/bash/.bash_profile b/bash/.bash_profile
index 9de46cc..14de8f3 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -8,19 +8,32 @@ fi
 # User specific environment and startup programs
 export TZ=GB
 export LANG=en_GB.UTF-8
-export EDITOR=nano
-export VISUAL=nano
+
+if [ -x /usr/bin/nano ]; then
+	export EDITOR=nano
+	export VISUAL=nano
+else
+	export EDITOR=vi
+	export VISUAL=vi
+fi
 
 # OSX Specific envs
 if [ $(uname) == "Darwin" ]; then
 	# Shhh Catlina, we don't care!
 	export BASH_SILENCE_DEPRECATION_WARNING=1
 
-    # M1 specific hacks
+	# M1 specific hacks
 	if [ $(uname -p) == "arm" ]; then
 		# Stop golang progs having fun with Rosetta 2 (https://yaleman.org/post/2021/2021-01-01-apple-m1-terraform-and-golang/)
 		export GODEBUG=asyncpreemptoff=1
 	fi
 fi
 
+# Go stuff
+if [ -d /usr/local/go ]; then
+	export GOROOT=/usr/local/go/
+	export GOPATH=$HOME/go/
+	export PATH=$PATH:/usr/local/go/bin
+fi
+
 export PS1="\[\e[0;90m\][\[\e[0;37m\]\u\[\e[0;37m\]@\[\e[0;37m\]\H\[\e[0;90m\]] \[\e[0;90m\](\[\e[0;37m\]\W\[\e[0;90m\]) \[\e[0;37m\]\$\[\e[0m\] "