diff --git a/bash/bash_aliases b/bash/bash_aliases index a75a270bb..6e33ea24b 100644 --- a/bash/bash_aliases +++ b/bash/bash_aliases @@ -1,7 +1,8 @@ # vim: ft=sh # Vim stuff -alias vim="${HOME}/.dotfiles/nix/bin/nvim" +alias vim="${HOME}/.local/bin/nvim" +#alias vim="${HOME}/.dotfiles/nix/bin/nvim" alias :q="exit" alias :wq="exit" alias q="exit" @@ -22,9 +23,9 @@ alias pip-upgrade="pip3 list --outdated --format=freeze | grep -v '^\-e' | cut - # Legacy mappings alias ifconfig="ip addr" -# SSH hop script +# SSH hop scripts +alias sshs="${HOME}/.private-scripts/sshs.sh" alias pgen="ssh -A -t -i ~/.ssh/no_pass 10.10.0.1 ~/bin/pgen" -alias spgen="ssh -A -t -i ~/.ssh/no_pass 10.10.0.1 ~/bin/spgen" # Prefer a Vim in a new terminal over gVim alias gvim="/usr/bin/urxvt -e /bin/bash -c vim -i" @@ -37,7 +38,6 @@ alias starti3="${HOME}/scripts/i3/starti3.sh" alias papillon="flatpak run com.github.Eloston.UngoogledChromium --app='https://papillon.john.me.tz/hud.php?refresh=3600&theme=dark'" # Force python3 -alias pip="pip3" alias python="python3" # Backlight control diff --git a/bash/bashrc b/bash/bashrc index d96f89ab1..a94a0a119 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -77,8 +77,10 @@ if [ -f ${HOME}/.dotfiles/bash/bash_aliases ]; then fi # Perl configs -PERL5LIB="${HOME}/perl5/lib/perl5:${HOME}/perl5/lib/perl5/x86_64-linux-thread-multi:${PERL5LIB}"; export PERL5LIB; -PERL_LOCAL_LIB_ROOT="${HOME}/perl5/lib/perl5:${HOME}/perl5/lib/perl5/x86_64-linux-thread-multi:${PERL_LOCAL_LIB_ROOT}"; export PERL_LOCAL_LIB_ROOT; +PERL5LIB="${HOME}/perl5/lib/perl5/x86_64-linux-gnu-thread-multi:${HOME}/.local/usr/local/lib/perl5/5.38.0:${HOME}/perl5/lib/perl5:${HOME}/perl5/lib/perl5/x86_64-linux-thread-multi:${PERL5LIB}"; export PERL5LIB; +PERL_LOCAL_LIB_ROOT="/var/home/jpm/.local/usr/local/lib/perl5/5.38.0:${HOME}/perl5/lib/perl5:${HOME}/perl5/lib/perl5/x86_64-linux-thread-multi:${PERL_LOCAL_LIB_ROOT}"; export PERL_LOCAL_LIB_ROOT; +#PERL_LIB="/var/home/jpm/.local/usr/local/lib/perl5/5.38.0"; export PERL_LIB; +PERL_LIB="/usr/local/lib/perl"; export PERL_LIB; PERL_MB_OPT="--install_base \"${HOME}/perl5\""; export PERL_MB_OPT; PERL_MM_OPT="INSTALL_BASE=${HOME}/perl5"; export PERL_MM_OPT; @@ -107,3 +109,5 @@ else fi source "$HOME/.cargo/env" +source ~/perl5/perlbrew/etc/bashrc +. "$HOME/.cargo/env"