From e7a291db30ce73c7f0cee454c4abe7b02a307066 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tsouza@redlattice.com>
Date: Tue, 13 Aug 2024 09:16:04 -0400
Subject: [PATCH] updates from RL

---
 home/bin/gstate                         | 24 ++++++++++++------------
 home/config/nvim/lazy-lock.json         |  1 +
 home/config/nvim/lua/plugins/all.lua    |  1 +
 home/config/nvim/lua/settings_after.lua |  2 +-
 home/jobs/redlattice.sh                 |  7 +++++--
 home/jobs/tidelift.sh                   |  3 +--
 home/shell_aliases                      | 12 ++++++++++--
 7 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/home/bin/gstate b/home/bin/gstate
index f8633fe..288646d 100755
--- a/home/bin/gstate
+++ b/home/bin/gstate
@@ -1,17 +1,17 @@
 #!/bin/bash
 
 heading() {
-  # or "\e" on *nix
-  HEAD="\033[96m\033[1m"
-  DONE="\033[0m"
-  echo -e "${HEAD}${1}${DONE}"
+    # or "\e" on *nix
+    HEAD="\033[96m\033[1m"
+    DONE="\033[0m"
+    echo -e "${HEAD}${1}${DONE}"
 }
 
 # 0) find local git repo, or fail now
 GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
 if [[ "$GIT_ROOT" == "" ]]; then
-  echo "! can't find nearby git repository" >&2
-  exit 1
+    echo "! can't find nearby git repository" >&2
+    exit 1
 fi
 
 # 1) show git branches
@@ -26,18 +26,18 @@ echo
 
 # 3) stashed changes
 if [[ -n $(git stash list) ]]; then
-  heading Stash
-  git stash list | sed "s/^/  /"
-  echo
+    heading Stash
+    git stash list | sed "s/^/  /"
+    echo
 fi
 
 # 4) divergence from source
 UPSTREAM=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null)
 if [[ -n "${UPSTREAM}" ]]; then
-  heading "upstream [${UPSTREAM}] divergence"
-  git diff -r $UPSTREAM --name-only --color | sed "s/^/  /"
+    heading "upstream [${UPSTREAM}] divergence"
+    git diff -r $UPSTREAM --name-only --color | sed "s/^/  /"
 else
-  heading "WARNING- no upstream configured"
+    heading "WARNING- no upstream configured"
 fi
 echo
 
diff --git a/home/config/nvim/lazy-lock.json b/home/config/nvim/lazy-lock.json
index 57d394d..839a688 100644
--- a/home/config/nvim/lazy-lock.json
+++ b/home/config/nvim/lazy-lock.json
@@ -7,6 +7,7 @@
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "earthly.vim": { "branch": "main", "commit": "66bf86d8292d71e6f2f5e8ea371471c9809efde6" },
   "fzf": { "branch": "master", "commit": "7320b7df62039c879c4f609bca946ea09b438a98" },
   "fzf.vim": { "branch": "master", "commit": "1e054c1d075d87903647db9320116d360eb8b024" },
   "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" },
diff --git a/home/config/nvim/lua/plugins/all.lua b/home/config/nvim/lua/plugins/all.lua
index 400d321..0827847 100644
--- a/home/config/nvim/lua/plugins/all.lua
+++ b/home/config/nvim/lua/plugins/all.lua
@@ -217,4 +217,5 @@ return {
       require('bamboo').load()
     end,
   },
+  { 'earthly/earthly.vim'},
 }
diff --git a/home/config/nvim/lua/settings_after.lua b/home/config/nvim/lua/settings_after.lua
index 579eca8..4634cb0 100644
--- a/home/config/nvim/lua/settings_after.lua
+++ b/home/config/nvim/lua/settings_after.lua
@@ -123,7 +123,7 @@ vim.api.nvim_set_keymap("n", "<C-J>", ":bprev<CR>", {silent = true})
 vim.api.nvim_set_keymap("n", "<C-K>", ":bnext<CR>", {silent = true})
 vim.api.nvim_set_keymap("n", "<C-o>", ":NERDTreeToggle<CR>", {silent = true})
 
-vim.api.nvim_set_keymap("n", "<F1>", ":set invnumber invrelativenumber<CR>", {silent = true })
+vim.api.nvim_set_keymap("n", "<F1>", ":set invrnu<CR>", {silent = true })
 vim.api.nvim_set_keymap("i", "<F1>", "<Esc>", {silent = true })
 vim.api.nvim_set_keymap("n", "<F8>", ":Tagbar<CR>", {silent = true })
 vim.api.nvim_set_keymap("n", "<F9>", ":FloatermToggle<CR>", {silent = true })
diff --git a/home/jobs/redlattice.sh b/home/jobs/redlattice.sh
index 11293ad..5689e11 100644
--- a/home/jobs/redlattice.sh
+++ b/home/jobs/redlattice.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
+function portaldsave() {
+  docker save portald:devel | gzip > portal.tar.gz
+}
+
 
 function rl() {
-    for var in "$@"
-    do
+    for var in "$@"; do
         open -a iTerm ~/rl/$var
         settitle $var
     done
diff --git a/home/jobs/tidelift.sh b/home/jobs/tidelift.sh
index 0a5cebf..457a005 100644
--- a/home/jobs/tidelift.sh
+++ b/home/jobs/tidelift.sh
@@ -7,8 +7,7 @@ function pulldep() {
 }
 
 function tide() {
-    for var in "$@"
-    do
+    for var in "$@"; do
         open -a iTerm ~/code/tidelift/$var
         settitle $var
     done
diff --git a/home/shell_aliases b/home/shell_aliases
index 84f1111..54eb009 100644
--- a/home/shell_aliases
+++ b/home/shell_aliases
@@ -1,8 +1,16 @@
+#!/bin/bash
+
 alias cat='bat'
+alias cprm='git remote get-url origin | tr -d "\n" | pbcopy'
+alias dcomp="docker compose"
+alias docker-compose="docker compose"
 alias dots='cd ~/code/dotfiles/'
 alias fuckingip="curl https://wtfismyip.com/json"
 alias g='git'
+alias gcd='cd $(git rev-parse --show-toplevel)'
 alias gp='git push -u'
-alias ls="exa -lhgxUm --git --time-style long-iso --group-directories-first"
-alias vimini="vim ~/.config/nvim/init.vim"
+alias ls="eza -lhgxUm --git --time-style long-iso --group-directories-first"
+alias tree=tree -I 'node_modules|venv'
 alias vim=nvim
+alias vimini="vim ~/.config/nvim/init.vim"
+alias wx="curl https://wttr.in/Raleigh"