From a18c87ed5b0cb492df40aea3ac9e6734fed1016e Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Fri, 28 May 2021 15:30:37 +0100
Subject: [PATCH] Fix go exports

---
 irssi/.irssi/config.j2                       | 118 +++++++++++++++++++
 shell-common/.config/shell-common/exports.sh |  14 +--
 2 files changed, 125 insertions(+), 7 deletions(-)
 create mode 100644 irssi/.irssi/config.j2

diff --git a/irssi/.irssi/config.j2 b/irssi/.irssi/config.j2
new file mode 100644
index 0000000..8ebc63f
--- /dev/null
+++ b/irssi/.irssi/config.j2
@@ -0,0 +1,118 @@
+servers = (
+  {
+    address = "eu.tilde.chat";
+    chatnet = "tildechat";
+    port = "6697";
+    use_tls = "yes";
+    tls_verify = "no";
+    autoconnect = "yes";
+  },
+  {
+    address = "irc.freenode.net";
+    chatnet = "freenode";
+    port = "6667";
+    use_tls = "no";
+    tls_verify = "no";
+    autoconnect = "yes";
+  }
+);
+
+chatnets = {
+  tildechat = {
+    type = "IRC";
+    autosendcmd = "^MSG NickServ identify {{ tildechat_ident }}";
+  };
+  freenode = {
+    type = "IRC";
+    autosendcmd = "^MSG nickserv identify {{ freenode_ident }}";
+  };
+};
+
+channels = (
+  { name = "#dimension"; chatnet = "tilechat"; autojoin = "yes"; },
+  { name = "#dimension"; chatnet = "tildechat"; autojoin = "yes"; },
+  { name = "#meta"; chatnet = "tildechat"; autojoin = "yes"; },
+  {
+    name = "#idlerpg";
+    chatnet = "tildechat";
+    autojoin = "yes";
+    password = "-botmd";
+    botmasks = "ubergeek@thunix.net";
+    autosendcmd = "^MSG idlerpg_bot login Matalok {{ tildechat_idlerpg }}";
+  },
+  { name = "#geekhack"; chatnet = "freenode"; autojoin = "yes"; },
+  { name = "#livlug"; chatnet = "Freenode"; autojoin = "yes"; },
+  { name = "#gemini"; chatnet = "tildechat"; autojoin = "yes"; }
+);
+settings = {
+  core = { 
+    real_name = "Unknown";
+    user_name = "nikdoof";
+    nick = "nikdoof";
+  };
+  "fe-text" = { actlist_sort = "refnum"; colors_ansi_24bit = "yes"; };
+  "fe-common/core" = {
+    activity_hide_level = "QUITS JOINS PARTS KICKS MODES TOPIC NICKS";
+    theme = "IamCyan";
+  };
+};
+logs = { };
+hilights = ( { text = "matalok"; nick = "yes"; word = "yes"; } );
+windows = {
+  1 = { immortal = "yes"; name = "(status)"; level = "ALL"; };
+  2 = {
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "IRC";
+        name = "#geekhack";
+        tag = "freenode";
+      }
+    );
+  };
+  3 = {
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "IRC";
+        name = "#livlug";
+        tag = "freenode";
+      }
+    );
+  };
+  4 = {
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "IRC";
+        name = "#dimension";
+        tag = "tildechat";
+      }
+    );
+  };
+  5 = {
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "IRC";
+        name = "#meta";
+        tag = "tildechat";
+      }
+    );
+  };
+  6 = {
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "IRC";
+        name = "#idlerpg";
+        tag = "tildechat";
+      }
+    );
+  };
+  7 = { immortal = "yes"; name = "hilight"; sticky = "yes"; };
+};
+mainwindows = {
+  1 = { first_line = "9"; lines = "37"; };
+  7 = { first_line = "1"; lines = "8"; };
+};
diff --git a/shell-common/.config/shell-common/exports.sh b/shell-common/.config/shell-common/exports.sh
index 9e343e0..098b271 100644
--- a/shell-common/.config/shell-common/exports.sh
+++ b/shell-common/.config/shell-common/exports.sh
@@ -16,15 +16,15 @@ else
 fi
 
 # Go stuff
-if [ -d /usr/local/go ]; then
+export GOPATH=$HOME/go/
+if [ -z ${GOROOT+x} ] && [ -d /usr/local/go ]; then
 	export GOROOT=/usr/local/go/
-	export GOPATH=$HOME/go/
-	export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
+	export PATH=$PATH:$HOME/go/bin
+fi
 
-    # https://github.com/oz/tz
-    if [ -f $HOME/go/bin/tz ]; then
-        export TZ_LIST="America/New_York,America/Los_Angeles,Europe/Paris"
-    fi
+# https://github.com/oz/tz
+if [ -f $HOME/go/bin/tz ]; then
+	export TZ_LIST="America/New_York,America/Los_Angeles,Europe/Paris"
 fi
 
 # OSX Specific envs