From 1ba93177f260cbf427f1b2d7274d1ac04ea8edd6 Mon Sep 17 00:00:00 2001
From: Al Berez <a-b@users.noreply.github.com>
Date: Sat, 17 Feb 2024 04:18:44 +0000
Subject: [PATCH 1/4] Make nvim default editor

---
 bash-it/env.bash | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 bash-it/env.bash

diff --git a/bash-it/env.bash b/bash-it/env.bash
new file mode 100644
index 0000000..297882f
--- /dev/null
+++ b/bash-it/env.bash
@@ -0,0 +1,5 @@
+# set vim to be the default editor
+export GIT_EDITOR=nvim
+export EDITOR=nvim
+
+export CDPATH=".:$HOME/workspace"
\ No newline at end of file

From 95b9a3690f9880b9001b455f5453f263c4a96892 Mon Sep 17 00:00:00 2001
From: Al Berez <a-b@users.noreply.github.com>
Date: Fri, 16 Feb 2024 20:48:50 -0800
Subject: [PATCH 2/4] Move default editor config to setup script

---
 set-up-new-machine.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/set-up-new-machine.sh b/set-up-new-machine.sh
index 14f9718..efb6463 100755
--- a/set-up-new-machine.sh
+++ b/set-up-new-machine.sh
@@ -210,6 +210,11 @@ cat >> ~/.$(basename $SHELL)rc <<EOF
 export GIT_DUET_CO_AUTHORED_BY=1
 export GIT_DUET_SET_GIT_USER_CONFIG=true
 
+export GIT_EDITOR=nvim
+export EDITOR=nvim
+
+export CDPATH=".:$HOME/workspace"
+
 export TERM=xterm-256color
 
 source ~/workspace/capi-workspace/lib/pullify.bash

From 0880457c7f9726fcf258a6679c584245c767d035 Mon Sep 17 00:00:00 2001
From: Al Berez <a-b@users.noreply.github.com>
Date: Fri, 16 Feb 2024 20:49:47 -0800
Subject: [PATCH 3/4] cleanup

---
 bash-it/env.bash | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 bash-it/env.bash

diff --git a/bash-it/env.bash b/bash-it/env.bash
deleted file mode 100644
index 297882f..0000000
--- a/bash-it/env.bash
+++ /dev/null
@@ -1,5 +0,0 @@
-# set vim to be the default editor
-export GIT_EDITOR=nvim
-export EDITOR=nvim
-
-export CDPATH=".:$HOME/workspace"
\ No newline at end of file

From 6f2b417967dbdfffbe131ea92539d9e6042ade29 Mon Sep 17 00:00:00 2001
From: Al Berez <a-b@users.noreply.github.com>
Date: Fri, 16 Feb 2024 20:52:39 -0800
Subject: [PATCH 4/4] add vi alias pointed to nvim

---
 set-up-new-machine.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/set-up-new-machine.sh b/set-up-new-machine.sh
index efb6463..98e8571 100755
--- a/set-up-new-machine.sh
+++ b/set-up-new-machine.sh
@@ -224,6 +224,7 @@ source ~/workspace/capi-workspace/lib/unclaim-bosh-lite.bash
 PATH="$PATH:$HOME/workspace/capi-workspace/bin"
 alias roundup_bosh_lites="print_env_info"
 alias gst="git status"
+alias vi=nvim
 EOF
 
 # prepare cloudcontroller_ng for running tests