diff --git a/.gitignore b/.gitignore index 9f15caa..5d44c0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +.vscode .directory 1-compiled +ubuntu1.sh diff --git a/aliases.sh b/aliases.sh index 42cbbbc..9f43a53 100644 --- a/aliases.sh +++ b/aliases.sh @@ -27,23 +27,12 @@ alias fdiff="sdiff -t --tabsize=4 -w \$(tput cols) -b" alias rsync-prog="rsync -Pav" alias parallel="parallel --no-notice" -export IDF_TOOLS_PATH=/opt/esp -alias get_idf=". ${IDF_TOOLS_PATH}/esp-idf/export.sh" - -if [[ -e /opt/eagle/eagle/eagle ]]; then - alias eagle=$(readlink -f /opt/eagle/eagle/eagle) -fi - # Stopwatch alias timer='echo "Timer started. Stop with Ctrl-D." && date && time cat && date' # IP addresses alias pubip="dig +short myip.opendns.com @resolver1.opendns.com" -if [[ ! "$(which dropbox)" && "$(which caja-dropbox)" ]]; then - alias dropbox=caja-dropbox -fi - if [[ "$(which ncdu)" ]]; then alias dush="ncdu --color dark -rr" else diff --git a/1-parallel-template b/archive/1-parallel-template similarity index 100% rename from 1-parallel-template rename to archive/1-parallel-template diff --git a/ffmpegBatch.sh b/archive/ffmpegBatch.sh similarity index 100% rename from ffmpegBatch.sh rename to archive/ffmpegBatch.sh diff --git a/path_enviornment.sh b/path_enviornment.sh index 28cb61c..e665ff0 100644 --- a/path_enviornment.sh +++ b/path_enviornment.sh @@ -67,7 +67,7 @@ __LOAD_DIRS=( /opt/makemkv /opt/icestorm /opt/gemini - $HOME/.gem/ruby/2.7.0 + $HOME/.local/share/gem/ruby/3.0.0 ) for DIR_EXPAND in ${__LOAD_DIRS[@]}; do loadDirectory $DIR_EXPAND @@ -89,3 +89,15 @@ if [ -d "$HOME/.local" ] ; then export XDG_DATA_HOME="$HOME/.local/share" fi fi + +unset pathStripAdd pathStrip loadDirectory + +########### +# If rust is a thing, load it +if [[ -d "$HOME/.cargo" ]]; then + [[ -x "$HOME/.cargo/env" ]] && ( + echo "sourcing..." + source "$HOME/.cargo/env" + echo "sourced..." + ) +fi