diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile index 35adea1..b125f29 100644 --- a/dotfiles/bash/bash_profile +++ b/dotfiles/bash/bash_profile @@ -1,3 +1,5 @@ +#!/usr/bin/bash + if [[ -f ~/.bashrc ]]; then source ~/.bashrc fi @@ -11,11 +13,14 @@ if [[ "$OSTYPE" == "darwin"* ]]; then export PATH="/usr/local/opt/tcl-tk/bin:$PATH" fi +if hash pyenv 2>/dev/null; then + export PYENV_ROOT="$HOME/.pyenv" + command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" + eval "$(pyenv init -)" +fi -# Add RVM to PATH for scripting. Make sure this is the last PATH variable change. -export PATH="$PATH:$HOME/.rvm/bin" - -[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env +# Local bin +export PATH=$HOME/bin:/usr/local/bin:$PATH test -r /home/vm/.opam/opam-init/init.sh && . /home/vm/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true . "$HOME/.cargo/env" diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc index b9e30ee..c9cb256 100644 --- a/dotfiles/bash/bashrc +++ b/dotfiles/bash/bashrc @@ -188,6 +188,15 @@ then fi fi +######### +# Other functions +######### + +aws-sso () { + aws sso login --profile $1 + aws2-wrap --profile $1 --exec "~/aws-save-creds" +} + # Add RVM to PATH for scripting. Make sure this is the last PATH variable change. export PATH="$PATH:$HOME/.rvm/bin" diff --git a/manjaro/FIXES.md b/manjaro/FIXES.md new file mode 100644 index 0000000..2789fdf --- /dev/null +++ b/manjaro/FIXES.md @@ -0,0 +1,52 @@ +# Manjaro Fixes + +## VMWare Workstation + +### VMWare Tools Adaptive Display Resolution Does not Work with Manjaro Guest + +On install Manjaro will have `open-vmware-tools` installed and running. However, this package appears to be *mostly* unmaintained +and doesn't seem to work out of the box. + +#### Reproducing + +Type the following commands + +```bash +sudo systemctl stop vmtoolsd.service +sudo systemctl start vmtoolsd.service +sudo systemctl restart vmtoolsd.service +``` + +The first two commands may not be necessary but I chose to completely bring it back down and up before restarting. After the +restart your screen resolution should adapt. If this is the case, apply the following fix to make it permanent: + +#### Fix + +```bash +sudo vi /usr/lib/systemd/system/vmtoolsd.service +``` + +and then in this section + +```bash +[Unit] +Description=VMware Tools +ConditionVirtualization=vmware +``` + +Add the following line at the end + +```bash +After=display-manager.service +``` + +So that it looks like: + +```bash +[Unit] +Description=VMware Tools +ConditionVirtualization=vmware +After=display-manager.service +``` + +and restart your guest. You should see the display adapt. \ No newline at end of file