diff --git a/.config/fish/config.fish b/.config/fish/config.fish index e8dd7eb..9c0824a 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1 +1,2 @@ set -gx EDITOR vim +load_nvm diff --git a/.config/fish/functions/load_nvm.fish b/.config/fish/functions/load_nvm.fish new file mode 100644 index 0000000..5fc596b --- /dev/null +++ b/.config/fish/functions/load_nvm.fish @@ -0,0 +1,16 @@ +function load_nvm --on-variable="PWD" + set -l default_node_version (nvm version default) + set -l node_version (nvm version) + set -l nvmrc_path (nvm_find_nvmrc) + if test -n "$nvmrc_path" + set -l nvmrc_node_version (nvm version (cat $nvmrc_path)) + if test "$nvmrc_node_version" = "N/A" + nvm install (cat $nvmrc_path) + else if test nvmrc_node_version != node_version + nvm use $nvmrc_node_version + end + else if test "$node_version" != "$default_node_version" + echo "Reverting to default Node version" + nvm use default + end +end diff --git a/.config/fish/functions/nvm.fish b/.config/fish/functions/nvm.fish new file mode 100644 index 0000000..5761a36 --- /dev/null +++ b/.config/fish/functions/nvm.fish @@ -0,0 +1,3 @@ +function nvm + bass source ~/.nvm/nvm.sh --no-use ';' nvm $argv +end diff --git a/.config/fish/functions/nvm_find_nvmrc.fish b/.config/fish/functions/nvm_find_nvmrc.fish new file mode 100644 index 0000000..d7af2c7 --- /dev/null +++ b/.config/fish/functions/nvm_find_nvmrc.fish @@ -0,0 +1,3 @@ +function nvm_find_nvmrc + bass source ~/.nvm/nvm.sh --no-use ';' nvm_find_nvmrc +end diff --git a/.config/install-scripts/002-shell.sh b/.config/install-scripts/002-shell.sh index 558a1ee..80ccd15 100755 --- a/.config/install-scripts/002-shell.sh +++ b/.config/install-scripts/002-shell.sh @@ -10,4 +10,8 @@ if [[ ! -f "/usr/bin/fish" ]]; then fi chsh -s /usr/bin/fish - +/usr/bin/fish +curl -L https://get.oh-my.fish | fish +omf install cbjohnson +omf theme cbjohnson +omf install bass diff --git a/.config/install-scripts/005-nvm.sh b/.config/install-scripts/005-nvm.sh new file mode 100644 index 0000000..3d24f81 --- /dev/null +++ b/.config/install-scripts/005-nvm.sh @@ -0,0 +1,2 @@ +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash +