From 04863064ed2fb8bae0a19e84b6bb04f747937783 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <taylor.bockman@zefr.com>
Date: Tue, 26 Jul 2022 16:39:44 -0700
Subject: [PATCH 1/3] stuff

---
 dotfiles/bash/bash_profile | 14 +++++++++-----
 dotfiles/bash/bashrc       |  9 +++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile
index 889b3a6..2b8bee5 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,10 +13,12 @@ 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
diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc
index 105dbd6..35b52cb 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"

From 83e96388a49d1c21b5a3cac55a52572b97a511e3 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <angrygoats@noreply@xchg.sh>
Date: Sat, 30 Jul 2022 12:09:17 -0400
Subject: [PATCH 2/3] Add manjaro vmware guest fixes

---
 manjaro/FIXES.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 manjaro/FIXES.md

diff --git a/manjaro/FIXES.md b/manjaro/FIXES.md
new file mode 100644
index 0000000..15f94cd
--- /dev/null
+++ b/manjaro/FIXES.md
@@ -0,0 +1,50 @@
+# 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:
+
+```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

From 382f13652d5b7f0753f21b914906da4632e39169 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <angrygoats@noreply@xchg.sh>
Date: Sat, 30 Jul 2022 12:09:46 -0400
Subject: [PATCH 3/3] Update 'manjaro/FIXES.md'

---
 manjaro/FIXES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/manjaro/FIXES.md b/manjaro/FIXES.md
index 15f94cd..2789fdf 100644
--- a/manjaro/FIXES.md
+++ b/manjaro/FIXES.md
@@ -7,7 +7,7 @@
 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 
+#### Reproducing 
 
 Type the following commands 
 
@@ -20,6 +20,8 @@ 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
 ```