From a76c488bbcf608d90f3f4bb7c15598fc5111d26f Mon Sep 17 00:00:00 2001
From: Paul Walker <paul@blacksun.org.uk>
Date: Sat, 14 Jan 2023 23:30:12 +0000
Subject: [PATCH] bash: move nvm/rbenv/yarn to bashrc.d

---
 bashrc.d/local/framework.bash | 1 +
 bashrc.d/nvm.bash             | 3 +++
 bashrc.d/rbenv.bash           | 4 ++--
 bashrc.d/yarn.bash            | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 bashrc.d/local/framework.bash
 create mode 100644 bashrc.d/nvm.bash
 create mode 100644 bashrc.d/yarn.bash

diff --git a/bashrc.d/local/framework.bash b/bashrc.d/local/framework.bash
new file mode 100644
index 0000000..b5c99e8
--- /dev/null
+++ b/bashrc.d/local/framework.bash
@@ -0,0 +1 @@
+eval "`dircolors -b ~/.dircolors`"
\ No newline at end of file
diff --git a/bashrc.d/nvm.bash b/bashrc.d/nvm.bash
new file mode 100644
index 0000000..acc6ed5
--- /dev/null
+++ b/bashrc.d/nvm.bash
@@ -0,0 +1,3 @@
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
diff --git a/bashrc.d/rbenv.bash b/bashrc.d/rbenv.bash
index b9e0619..7333ab1 100644
--- a/bashrc.d/rbenv.bash
+++ b/bashrc.d/rbenv.bash
@@ -1,4 +1,4 @@
 if [ -f "$HOME/.rbenv/bin/rbenv" ] ; then
-  eval "$($HOME/.rbenv/bin/rbenv init - bash)"
+    addpath $HOME/.rbenv/bin
+    eval "$($HOME/.rbenv/bin/rbenv init - bash)"
 fi
-
diff --git a/bashrc.d/yarn.bash b/bashrc.d/yarn.bash
new file mode 100644
index 0000000..fe7247a
--- /dev/null
+++ b/bashrc.d/yarn.bash
@@ -0,0 +1 @@
+export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"