From a6ac79de70968d80fb46f8c55020143ef44bd017 Mon Sep 17 00:00:00 2001
From: Jacob Bohanon <jacobbohanon@gmail.com>
Date: Fri, 28 Apr 2023 06:52:15 -0400
Subject: [PATCH] various workflow changes

---
 nvim/init.vim             |  4 ++++
 zsh/config.d/gcloud.zsh   |  6 +++---
 zsh/config.d/pomodoro.zsh | 18 ++++++++++++++++++
 zsh/config.d/pyenv.zsh    |  3 +++
 zsh/config.d/solo.zsh     | 31 ++++++++++++++++++-------------
 zsh/mygvm                 |  4 ++--
 6 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 zsh/config.d/pomodoro.zsh
 create mode 100644 zsh/config.d/pyenv.zsh

diff --git a/nvim/init.vim b/nvim/init.vim
index 0db3258..608bace 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -229,6 +229,10 @@ require('lspconfig')['rust_analyzer'].setup{
     on_attach = on_attach,
     capabilities = capabilities,
 }
+require('lspconfig')['bashls'].setup{
+    on_attach = on_attach,
+    capabilities = capabilities,
+}
 EOF
 
 lua <<EOF
diff --git a/zsh/config.d/gcloud.zsh b/zsh/config.d/gcloud.zsh
index f9673c9..603c1b8 100644
--- a/zsh/config.d/gcloud.zsh
+++ b/zsh/config.d/gcloud.zsh
@@ -4,7 +4,7 @@ if [ -f "$HOME/google-cloud-sdk/path.zsh.inc" ]; then . "$HOME/google-cloud-sdk/
 # The next line enables shell command completion for gcloud.
 if [ -f "$HOME/google-cloud-sdk/completion.zsh.inc" ]; then . "$HOME/google-cloud-sdk/completion.zsh.inc"; fi
 
-alias startenvoydev="gcloud compute instances start bohanon-envoy-dev --zone us-central1-a --project solo-test-236622 && gcloud compute config-ssh --force-key-file-overwrite --project solo-test-236622"
-alias stopenvoydev="gcloud compute instances stop bohanon-envoy-dev --zone us-central1-a --project solo-test-236622"
-alias sshenvoydev="gcloud beta compute ssh --zone us-central1-a bohanon-envoy-dev --project solo-test-236622"
+alias startenvoydev="gcloud compute instances start bohanon-envoy-dev --zone us-central1-c --project solo-test-236622 && gcloud compute config-ssh --force-key-file-overwrite --project solo-test-236622"
+alias stopenvoydev="gcloud compute instances stop bohanon-envoy-dev --zone us-central1-c --project solo-test-236622"
+alias sshenvoydev="gcloud beta compute ssh --zone us-central1-c bohanon-envoy-dev --project solo-test-236622"
 
diff --git a/zsh/config.d/pomodoro.zsh b/zsh/config.d/pomodoro.zsh
new file mode 100644
index 0000000..e40f23f
--- /dev/null
+++ b/zsh/config.d/pomodoro.zsh
@@ -0,0 +1,18 @@
+# Requires https://github.com/caarlos0/timer
+# Requires spd-say
+
+declare -A pomo_options
+pomo_options["work"]="45"
+pomo_options["break"]="10"
+
+pomodoro () {
+    if [ -n "$1" -a -n "${pomo_options["$1"]}" ]; then
+        val=$1
+        echo $val
+        timer ${pomo_options["$val"]}m
+        spd-say "'$val' session done"
+    fi
+}
+
+alias wo="pomodoro 'work'"
+alias br="pomodoro 'break'"
diff --git a/zsh/config.d/pyenv.zsh b/zsh/config.d/pyenv.zsh
new file mode 100644
index 0000000..e577a86
--- /dev/null
+++ b/zsh/config.d/pyenv.zsh
@@ -0,0 +1,3 @@
+export PATH="$HOME/.pyenv/bin:$PATH"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
diff --git a/zsh/config.d/solo.zsh b/zsh/config.d/solo.zsh
index 0a1cc02..3ba8048 100644
--- a/zsh/config.d/solo.zsh
+++ b/zsh/config.d/solo.zsh
@@ -30,33 +30,38 @@ do
     fi
 done
 
+function nvim_readme() {
+    nvim ./README.md
+}
 
 # Aliases to reach different repos
 alias cdsi='cd $SOLO_DIR'
 alias cdg='cd $SOLO_DIR/gloo'
-alias nvg='cdg && nvim $SOLO_DIR/gloo/README.md'
+alias nvg='cdg && nvim_readme'
 alias cdgf='cd $SOLO_DIR/gloo-fed'
-alias nvgf='cdgf && nvim $SOLO_DIR/gloo-fed/README.md'
+alias nvgf='cdgf && nvim_readme'
 alias cdsp='cd $SOLO_DIR/solo-projects'
-alias nvsp='cdsp && nvim $SOLO_DIR/solo-projects/README.md'
+alias nvsp='cdsp && nvim_readme'
 alias cdsa='cd $SOLO_DIR/solo-apis'
-alias nvsa='cdsa && nvim $SOLO_DIR/solo-apis/README.md'
+alias nvsa='cdsa && nvim_readme'
 alias cdsk='cd $SOLO_DIR/solo-kit'
-alias nvsk='cdsk && nvim $SOLO_DIR/solo-kit/README.md'
+alias nvsk='cdsk && nvim_readme'
 alias cddp='cd $SOLO_DIR/dev-portal'
-alias nvdp='cddp && nvim $SOLO_DIR/dev-portal/README.md'
+alias nvdp='cddp && nvim_readme'
 alias cdgm='cd $SOLO_DIR/gloo-mesh'
-alias nvgm='cdgm && nvim $SOLO_DIR/gloo-mesh/README.md'
+alias nvgm='cdgm && nvim_readme'
 alias cdgmui='cd $SOLO_DIR/gloo-mesh-ui'
-alias nvgmui='cdgmui && nvim $SOLO_DIR/gloo-mesh-ui/README.md'
+alias nvgmui='cdgmui && nvim_readme'
 alias cdgme='cd $SOLO_DIR/gloo-mesh-enterprise'
-alias nvgme='cdgme && nvim $SOLO_DIR/gloo-mesh-enterprise/README.md'
+alias nvgme='cdgme && nvim_readme'
 alias cdea='cd $SOLO_DIR/ext-auth-service'
-alias nvea='cdea && nvim $SOLO_DIR/ext-auth-service/README.md'
+alias nvea='cdea && nvim_readme'
 alias cdrl='cd $SOLO_DIR/rate-limiter'
-alias nvrl='cdrl && nvim $SOLO_DIR/rate-limiter/README.md'
+alias nvrl='cdrl && nvim_readme'
 alias cdeg='cd $SOLO_DIR/envoy-gloo'
-alias nveg='cdeg && nvim $SOLO_DIR/envoy-gloo/README.md'
+alias nveg='cdeg && nvim_readme'
 alias cdee='cd $SOLO_DIR/envoy-gloo-ee'
-alias nvee='cdee && nvim $SOLO_DIR/envoy-gloo-ee/README.md'
+alias nvee='cdee && nvim_readme'
+alias cde='cd $SOLO_DIR/../envoyproxy/envoy'
+alias nve='cde && nvim_readme'
 
diff --git a/zsh/mygvm b/zsh/mygvm
index ca1616a..b6e93ca 100755
--- a/zsh/mygvm
+++ b/zsh/mygvm
@@ -64,9 +64,9 @@ remove_version() {
 }
 
 get_latest_patch_for_minor() {
-    version=$(curl -s "https://go.dev/dl/?mode=json" | grep -o "$1.*.linux-amd64.tar.gz" | head -n 1 | tr -d '\r\n' | sed 's/[.]linux-amd64[.]tar[.]gz//')
+    version=$(curl -s "https://go.dev/dl/?mode=json&include=all" | grep -o "$1.*.linux-amd64.tar.gz" | head -n 1 | tr -d '\r\n' | sed 's/[.]linux-amd64[.]tar[.]gz//')
     if [[ $version == '' ]]; then
-        echo "could not determine latest version for $1. Only n-1 are supported by this feature."
+        echo "could not determine latest version for $1."
         exit 1
     else
         echo "latest $1 patch: $version"