chore(scripts): update cargo install script

base/bashrc

@@ -18,6 +18,9 @@ export XDG_RUNTIME_DIR="$HOME/.local/run"
 # Paths
 export PATH="$XDG_BIN_HOME:$DOTFILES/local/bin:$HOME/.local/go/bin:$XDG_DATA_HOME/cargo/bin:$PATH"
 
+source "$DOTFILES/config/exports"
+source "$DOTFILES/config/functions"
+source "$DOTFILES/config/alias"
 x-load-configs
 
 # shellcheck source=../config/fzf/fzf.bash
@@ -31,78 +34,5 @@ x-have rbenv && {
   eval "$(rbenv init - bash)"
 }
 
-# Enable the subsequent settings only in interactive sessions
+eval "$(starship init bash)"
-case $- in
+source "$DOTFILES/config/alias"
-*i*) ;;
-*) return ;;
-esac
-
-# Path to your oh-my-bash installation.
-export OSH="$HOME/.local/share/oh-my-bash"
-
-[ -d "$OSH" ] && {
-  export OSH_THEME="powerline-multiline"
-
-  # PowerLine theme config
-  export POWERLINE_LEFT_PROMPT="cwd scm"
-  export POWERLINE_RIGHT_PROMPT="python_venv ruby in_vim battery user_info"
-
-  # Display red dots whilst waiting for completion.
-  export COMPLETION_WAITING_DOTS="true"
-
-  # Uncomment the following line if you want to disable marking untracked files
-  # under VCS as dirty. This makes repository status check for large repositories
-  # much, much faster.
-  export DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-  # To disable the uses of "sudo" by oh-my-bash, please set "false" to
-  # this variable.  The default behavior for the empty value is "true".
-  export OMB_USE_SUDO=true
-
-  # To enable/disable display of Python virtualenv and condaenv
-  export OMB_PROMPT_SHOW_PYTHON_VENV=true # enable
-  # OMB_PROMPT_SHOW_PYTHON_VENV=false # disable
-
-  # Which completions would you like to load? (completions can be found in ~/.oh-my-bash/completions/*)
-  # Custom completions may be added to ~/.oh-my-bash/custom/completions/
-  # Example format: completions=(ssh git bundler gem pip pip3)
-  # Add wisely, as too many completions slow down shell startup.
-  export completions=(
-    git
-    composer
-    ssh
-  )
-
-  # Which aliases would you like to load? (aliases can be found in ~/.oh-my-bash/aliases/*)
-  # Custom aliases may be added to ~/.oh-my-bash/custom/aliases/
-  # Example format: aliases=(vagrant composer git-avh)
-  # Add wisely, as too many aliases slow down shell startup.
-  export aliases=(
-    general
-  )
-
-  # Which plugins would you like to load? (plugins can be found in ~/.oh-my-bash/plugins/*)
-  # Custom plugins may be added to ~/.oh-my-bash/custom/plugins/
-  # Example format: plugins=(rails git textmate ruby lighthouse)
-  # Add wisely, as too many plugins slow down shell startup.
-  export plugins=(
-    git
-    bashmarks
-  )
-
-  # Which plugins would you like to conditionally load? (plugins can be found in ~/.oh-my-bash/plugins/*)
-  # Custom plugins may be added to ~/.oh-my-bash/custom/plugins/
-  # Example format:
-  #  if [ "$DISPLAY" ] || [ "$SSH" ]; then
-  #      plugins+=(tmux-autoattach)
-  #  fi
-
-  source "$OSH/oh-my-bash.sh"
-
-  # Preferred editor for local and remote sessions
-  # if [[ -n $SSH_CONNECTION ]]; then
-  #   export EDITOR='vim'
-  # else
-  #   export EDITOR='mvim'
-  # fi
-}

base/zshrc

@@ -100,7 +100,5 @@ TMUX_WINDOW_NAME_PLUGIN="$DOTFILES/config/tmux/plugins/tmux-window-name/scripts/
   add-zsh-hook chpwd tmux-window-name
 }
 
-# Start starship
 eval "$(starship init zsh)"
-
+source "$DOTFILES/config/alias"
-source $DOTFILES/config/alias

config/exports-apps

@@ -7,6 +7,7 @@
 # Antigen configuration
 # https://github.com/zsh-users/antigen/wiki/Configuration
 export ADOTDIR="$XDG_DATA_HOME/antigen"
+export ANTIGEN_CACHE="$XDG_CACHE_HOME/antigen"
 export ANTIGEN_SYSTEM_RECEIPT_F=".local/share/antigen/antigen_system_lastupdate"
 export ANTIGEN_PLUGIN_RECEIPT_F=".local/share/antigen/antigen_plugin_lastupdate"
 

config/functions

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 #
 # shell functions
-
-set -euo pipefail

scripts/install-cargo-packages.sh

@@ -2,17 +2,27 @@
 # Install cargo/rust packages.
 #
 # shellcheck source=shared.sh
+source "$HOME/.dotfiles/config/exports"
+source "$HOME/.dotfiles/config/alias"
+source "$HOME/.dotfiles/config/functions"
 source "$HOME/.dotfiles/scripts/shared.sh"
 
 msg "Starting to install rust/cargo packages"
 
 ! x-have cargo && {
   msg "cargo could not be found. installing cargo with rustup.rs"
-  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path -y
 }
 
 source "$CARGO_HOME/env"
 
+! x-have rustup && {
+  msg_err "rustup could not be found. Aborting..."
+  exit 1
+}
+
+rustup default system
+
 packages=(
   # starship.rs
   "starship"