From 7e275c530d70f964ba63f5e72e75d51e55efd9f4 Mon Sep 17 00:00:00 2001 From: Marc Cataford Date: Sun, 28 Jan 2024 11:22:42 -0500 Subject: [PATCH 1/3] feat: add oh-my-zsh install --- bootstrap.sh | 3 ++- steps.sh | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 0e93f51..3b55d1d 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -3,12 +3,13 @@ # Ensuring steps are defined. . ./steps.sh -TOTAL_STEPS=5 +TOTAL_STEPS=6 # Refer to steps.sh for step definition. bootstrap() { ensure_apt_up_to_date ensure_apt_dependencies + ensure_omz ensure_nvm inject_shell_configuration inject_vim_configuration diff --git a/steps.sh b/steps.sh index d7c5fec..f0ae978 100644 --- a/steps.sh +++ b/steps.sh @@ -38,6 +38,11 @@ ensure_apt_dependencies() { fi } +ensure_omz() { + pre_step "Installs Oh My ZSH" + curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | bash +} + ensure_nvm() { pre_step "Installing nvm to manage node version" curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash From 7cbc3fae945500e5ae861f6ac61eacaf2cc3fac4 Mon Sep 17 00:00:00 2001 From: Marc Cataford Date: Sun, 28 Jan 2024 11:23:07 -0500 Subject: [PATCH 2/3] feat(aliases): remove v as alias --- shell_extras | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/shell_extras b/shell_extras index 5555546..c384008 100644 --- a/shell_extras +++ b/shell_extras @@ -19,7 +19,8 @@ alias tm="tmux new -s $1" # All roads lead to nvim. alias vim=nvim -alias v=nvim + +alias ghpr="gh pr create -w" ############## # FUNCTIONS # From 362df6ae6c6191e86a9341673addd1ebf5a47247 Mon Sep 17 00:00:00 2001 From: Marc Cataford Date: Sun, 28 Jan 2024 12:54:49 -0500 Subject: [PATCH 3/3] refactor(shell-extras): remove handling for bashrc --- shell_extras | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/shell_extras b/shell_extras index c384008..590c862 100644 --- a/shell_extras +++ b/shell_extras @@ -28,14 +28,7 @@ alias ghpr="gh pr create -w" # Autoupdates the env setup. function env_autoupdate { - SHELL_CONFIG_PATH="" - - if [[ -n $(echo $SHELL | grep zsh) ]]; then - SHELL_CONFIG_PATH="$HOME/.zshrc" - else - SHELL_CONFIG_PATH="$HOME/.bashrc" - fi - + SHELL_CONFIG_PATH="$HOME/.zshrc" { cd ~/.env_goodies