From a673755bcaa2e9e3ab37bb3d0bc0e53e02ef6e33 Mon Sep 17 00:00:00 2001
From: Fergus Molloy <fergus@molloy.xyz>
Date: Sat, 2 Aug 2025 01:21:23 +0100
Subject: [PATCH] disable auto tmux

---
 zsh/.zshrc | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5bec62c..4bb4505 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -55,10 +55,10 @@ command -v starship >/dev/null 2>&1 && eval "$(starship init zsh)"
 command -v fastfetch >/dev/null 2>&1 && fastfetch
 
 # automatically enter a tmux session
-tmux start-server
-if [ -z "$TMUX" ]; then
-  tmux has-session -t dev 2> /dev/null && tmux new-session || tmux new-session -s dev
-fi
+# tmux start-server
+# if [ -z "$TMUX" ]; then
+#   tmux has-session -t dev 2> /dev/null && tmux new-session || tmux new-session -s dev
+# fi
 
 # load kitty shell integrations
 if test -n "$KITTY_INSTALLATION_DIR"; then
@@ -87,11 +87,13 @@ total	%*E
 # add common bin dirs to path
 export PATH="/home/fergus/.local/bin:$PATH"
 export PATH="/home/fergus/.local/bin:/home/fergus/.cargo/bin:$PATH"
+export PATH="/home/fergus/go/bin/:$PATH"
 
 # import any extra env that doesn't want to be kept in vsc
-[[ -f ~/.extra-env ]] && source ~/.extra-env
+[[ -f ~/.extra-env.zsh ]] && source ~/.extra-env.zsh
 
 # add common options
+alias -- less='less -R'
 alias -- cp='cp -r'
 alias -- mkdir='mkdir -p'
 alias -- rm='rm -vr'
@@ -114,6 +116,7 @@ alias -- gC='git commit -m'
 alias -- gD='git diff --staged -w'
 alias -- gP='git push'
 alias -- gPf='git push --force-with-lease'
+alias -- gPt='git push --follow-tags'
 alias -- gS='git switch -c'
 alias -- gaa='git add --all'
 alias -- gau='git add -u'
@@ -144,3 +147,11 @@ fi
 ZSH_HIGHLIGHT_HIGHLIGHTERS+=()
 
 
+
+# pnpm
+export PNPM_HOME="/home/fergus/.local/share/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end