From 0b51e4e76f64b5cddd6eb3513d96f9ccfb87cd21 Mon Sep 17 00:00:00 2001
From: Scott Carroll <scottc@scottc.net>
Date: Sat, 26 Apr 2025 10:14:13 +0100
Subject: [PATCH] Use .dotfiles version of nvim automatically.  Enable tmux

---
 bashprofile/.bashrc | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/bashprofile/.bashrc b/bashprofile/.bashrc
index b004d1b..5961bc9 100644
--- a/bashprofile/.bashrc
+++ b/bashprofile/.bashrc
@@ -118,16 +118,21 @@ fi
 
 eval "$(starship init bash)"
 
-#if command -v tmux &> /dev/null && [ -n "$PS1" ] && [[ ! "$TERM" =~ screen ]] && [[ ! "$TERM" =~ tmux ]] && [ -z "$TMUX" ]; then
-#  exec tmux
-#fi
-
-# tmux attach-session -t default || tmux new-session -s default
+if [ -r "$HOME/.dotfiles/nvim-linux-`uname -m`/bin/nvim" ]
+then
+  (
+    cd $HOME/.dotfiles/nvim-linux-`uname -m`/bin
+    test -x vi || ln -s nvim vi
+  )
+  PATH="$HOME/.dotfiles/nvim-linux-`uname -m`/bin:$PATH"
+fi
 
 export MANPAGER='nvim +Man!'
 
-if command -v tmux>/dev/null; then
-  [ -z "$TMUX" ] && tmux new-session -A -s default
+test -r $HOME/.bashrc-local && . $HOME/.bashrc-local
+
+if [ -z "$TMUX" ]
+then
+  tmux attach-session -t default || tmux new-session -s default
 fi
 
-test -r $HOME/.bashrc-local && . $HOME/.bashrc-local