From 75a63ffc094e0148040555aba30c56a1a094f038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eduard-Cristian=20Bolo=C8=99?=
 <eduardb@users.noreply.github.com>
Date: Thu, 17 Oct 2024 11:32:50 +0200
Subject: [PATCH] Updates

---
 git/gitconfig        |   7 +
 iterm2/Profiles.json | 422 +++++++++++++++++++------------------------
 zsh/zshrc            |  31 +++-
 3 files changed, 211 insertions(+), 249 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index c21be23b..07239927 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -13,6 +13,7 @@
 	pull = pull --ff-only
 	cor = !git for-each-ref --sort=-committerdate --format='%(refname:short) (%(committerdate:relative))' refs/heads | fzf --reverse --height 35% --nth 1 | awk '{print $1}' | xargs git checkout
 	cleanup = !git branch --merged origin/dev | grep -v 'dev$' | xargs git branch -d
+	sh = "!f() { root=$(pwd)/ && cd ${root%%/.git/*} && git rev-parse && exec \"$@\"; }; f"
 [protocol]
 	version = 2
 [gpg]
@@ -45,3 +46,9 @@
     conflictstyle = diff3
 [push]
 	autoSetupRemote = true
+[credential "https://github.com"]
+	helper = 
+	helper = !/opt/homebrew/bin/gh auth git-credential
+[credential "https://gist.github.com"]
+	helper = 
+	helper = !/opt/homebrew/bin/gh auth git-credential
diff --git a/iterm2/Profiles.json b/iterm2/Profiles.json
index c7a0319a..bc55a317 100644
--- a/iterm2/Profiles.json
+++ b/iterm2/Profiles.json
@@ -1,133 +1,126 @@
 {
 "Profiles": [
 {
-  "Ansi 1 Color" : {
-    "Green Component" : 0.10840655118227005,
-    "Red Component" : 0.81926977634429932,
-    "Blue Component" : 0.14145714044570923
+  "Prompt Before Closing 2" : false,
+  "Selected Text Color" : {
+    "Red Component" : 0.71764705882352942,
+    "Color Space" : "sRGB",
+    "Blue Component" : 0.79607843137254897,
+    "Alpha Component" : 1,
+    "Green Component" : 0.79607843137254897
   },
-  "Tags" : [
-
-  ],
-  "Ansi 12 Color" : {
-    "Green Component" : 0.50962930917739868,
-    "Red Component" : 0.44058024883270264,
-    "Blue Component" : 0.51685798168182373
+  "Rows" : 25,
+  "Ansi 11 Color" : {
+    "Green Component" : 0.40717673301696777,
+    "Red Component" : 0.32436618208885193,
+    "Blue Component" : 0.43850564956665039
   },
-  "Ansi 2 Color" : {
-    "Green Component" : 0.54115492105484009,
-    "Red Component" : 0.44977453351020813,
-    "Blue Component" : 0.020208755508065224
+  "Use Italic Font" : true,
+  "Foreground Color" : {
+    "Red Component" : 0.49487279774621129,
+    "Color Space" : "sRGB",
+    "Blue Component" : 0.615325927734375,
+    "Alpha Component" : 1,
+    "Green Component" : 0.6026467269652207
   },
-  "Normal Font" : "MesloLGSForPowerline-Regular 13",
-  "Bold Color" : {
-    "Red Component" : 0.57647058823529407,
+  "Right Option Key Sends" : 0,
+  "Show Status Bar" : true,
+  "Character Encoding" : 4,
+  "Selection Color" : {
+    "Red Component" : 0.16470588235294117,
     "Color Space" : "sRGB",
-    "Blue Component" : 0.63137254901960782,
+    "Blue Component" : 0.6705882352941176,
     "Alpha Component" : 1,
-    "Green Component" : 0.62745098039215685
+    "Green Component" : 0.57647058823529407
   },
-  "Custom Directory" : "No",
+  "Mouse Reporting" : true,
+  "Cursor Boost" : 0,
   "Ansi 4 Color" : {
     "Green Component" : 0.46265947818756104,
     "Red Component" : 0.12754884362220764,
     "Blue Component" : 0.78231418132781982
   },
-  "Ansi 5 Color" : {
-    "Green Component" : 0.10802463442087173,
-    "Red Component" : 0.77738940715789795,
-    "Blue Component" : 0.43516635894775391
-  },
-  "Rows" : 25,
-  "Default Bookmark" : "No",
-  "Cursor Guide Color" : {
-    "Red Component" : 0.65000000000000002,
-    "Color Space" : "Calibrated",
-    "Blue Component" : 1,
-    "Alpha Component" : 0.25,
-    "Green Component" : 0.91000000000000003
-  },
   "Non-ASCII Anti Aliased" : true,
-  "Use Bright Bold" : true,
-  "Ansi 10 Color" : {
-    "Green Component" : 0.35665956139564514,
-    "Red Component" : 0.27671992778778076,
-    "Blue Component" : 0.38298487663269043
-  },
-  "Use Cursor Guide" : false,
-  "Ambiguous Double Width" : false,
+  "Sync Title" : false,
+  "Disable Window Resizing" : true,
+  "Description" : "Default",
+  "Close Sessions On End" : true,
   "Jobs to Ignore" : [
     "rlogin",
     "ssh",
     "slogin",
     "telnet"
   ],
-  "Show Status Bar" : true,
-  "Ansi 15 Color" : {
-    "Green Component" : 0.95794391632080078,
-    "Red Component" : 0.98943418264389038,
-    "Blue Component" : 0.86405980587005615
+  "Scrollback Lines" : 0,
+  "Draw Powerline Glyphs" : true,
+  "Status Bar Layout" : {
+    "components" : [
+      {
+        "class" : "iTermStatusBarJobComponent",
+        "configuration" : {
+          "knobs" : {
+            "maxwidth" : 1.7976931348623157e+308,
+            "base: priority" : 5,
+            "minwidth" : 0,
+            "base: compression resistance" : 1,
+            "shared text color" : {
+              "Red Component" : 0.89999997615814209,
+              "Color Space" : "sRGB",
+              "Blue Component" : 0.62999999523162842,
+              "Alpha Component" : 1,
+              "Green Component" : 0.62999999523162842
+            }
+          },
+          "layout advanced configuration dictionary value" : {
+            "font" : ".AppleSystemUIFont 12",
+            "auto-rainbow style" : 0,
+            "algorithm" : 1
+          }
+        }
+      }
+    ],
+    "advanced configuration" : {
+      "remove empty components" : false,
+      "font" : ".SFNS-Regular 12",
+      "algorithm" : 1,
+      "auto-rainbow style" : 0
+    }
   },
-  "Foreground Color" : {
-    "Red Component" : 0.49487279774621129,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.615325927734375,
-    "Alpha Component" : 1,
-    "Green Component" : 0.6026467269652207
+  "Flashing Bell" : false,
+  "Cursor Guide Color" : {
+    "Red Component" : 0.65000000000000002,
+    "Color Space" : "Calibrated",
+    "Blue Component" : 1,
+    "Alpha Component" : 0.25,
+    "Green Component" : 0.91000000000000003
   },
-  "Working Directory" : "\/Users\/eduard",
-  "Use Tab Color" : false,
-  "Blinking Cursor" : false,
-  "Disable Window Resizing" : true,
-  "Sync Title" : false,
-  "Prompt Before Closing 2" : false,
   "BM Growl" : true,
-  "Command" : "",
-  "Description" : "Default",
-  "Smart Cursor Color" : false,
-  "Mouse Reporting" : true,
-  "Screen" : -1,
-  "Selection Color" : {
-    "Red Component" : 0.16470588235294117,
+  "Ansi 3 Color" : {
+    "Green Component" : 0.46751424670219421,
+    "Red Component" : 0.64746475219726562,
+    "Blue Component" : 0.023484811186790466
+  },
+  "Use Non-ASCII Font" : true,
+  "Link Color" : {
+    "Red Component" : 0,
     "Color Space" : "sRGB",
-    "Blue Component" : 0.6705882352941176,
+    "Blue Component" : 0.73333333333333328,
     "Alpha Component" : 1,
-    "Green Component" : 0.57647058823529407
-  },
-  "Columns" : 80,
-  "Idle Code" : 0,
-  "Ansi 13 Color" : {
-    "Green Component" : 0.33896297216415405,
-    "Red Component" : 0.34798634052276611,
-    "Blue Component" : 0.72908437252044678
+    "Green Component" : 0.35686274509803922
   },
-  "Title Components" : 513,
-  "Custom Command" : "No",
-  "ASCII Anti Aliased" : true,
-  "Non Ascii Font" : "HackNerdFontComplete-Regular 12",
-  "Vertical Spacing" : 1,
-  "Use Bold Font" : true,
-  "Option Key Sends" : 0,
-  "Selected Text Color" : {
-    "Red Component" : 0.71764705882352942,
+  "Shortcut" : "",
+  "Background Image Location" : "",
+  "Bold Color" : {
+    "Red Component" : 0.57647058823529407,
     "Color Space" : "sRGB",
-    "Blue Component" : 0.79607843137254897,
+    "Blue Component" : 0.63137254901960782,
     "Alpha Component" : 1,
-    "Green Component" : 0.79607843137254897
-  },
-  "Background Color" : {
-    "Green Component" : 0.11783610284328461,
-    "Red Component" : 0,
-    "Blue Component" : 0.15170273184776306
-  },
-  "Character Encoding" : 4,
-  "Ansi 11 Color" : {
-    "Green Component" : 0.40717673301696777,
-    "Red Component" : 0.32436618208885193,
-    "Blue Component" : 0.43850564956665039
+    "Green Component" : 0.62745098039215685
   },
-  "Use Italic Font" : true,
+  "Use Cursor Guide" : false,
   "Unlimited Scrollback" : true,
+  "Custom Command" : "No",
+  "Title Components" : 513,
   "Keyboard Map" : {
     "0xf700-0x260000" : {
       "Text" : "[1;6A",
@@ -290,123 +283,35 @@
       "Action" : 10
     }
   },
-  "Window Type" : 0,
-  "Cursor Boost" : 0,
-  "Background Image Location" : "",
-  "Blur" : false,
-  "Badge Color" : {
-    "Red Component" : 1,
-    "Color Space" : "Calibrated",
-    "Blue Component" : 0,
-    "Alpha Component" : 0.5,
-    "Green Component" : 0
-  },
-  "Scrollback Lines" : 0,
-  "Send Code When Idle" : false,
-  "Close Sessions On End" : true,
-  "Terminal Type" : "xterm-256color",
-  "Visual Bell" : true,
-  "Flashing Bell" : false,
-  "Status Bar Layout" : {
-    "components" : [
-      {
-        "class" : "iTermStatusBarJobComponent",
-        "configuration" : {
-          "knobs" : {
-            "maxwidth" : 1.7976931348623157e+308,
-            "base: priority" : 5,
-            "minwidth" : 0,
-            "shared text color" : {
-              "Red Component" : 0.89999997615814209,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.62999999523162842,
-              "Alpha Component" : 1,
-              "Green Component" : 0.62999999523162842
-            },
-            "base: compression resistance" : 1
-          },
-          "layout advanced configuration dictionary value" : {
-            "font" : ".AppleSystemUIFont 12",
-            "auto-rainbow style" : 0,
-            "algorithm" : 1
-          }
-        }
-      },
-      {
-        "class" : "iTermStatusBarGitComponent",
-        "configuration" : {
-          "knobs" : {
-            "base: compression resistance" : 1,
-            "iTermStatusBarGitComponentPollingIntervalKey" : 2,
-            "base: priority" : 5,
-            "minwidth" : 0,
-            "shared text color" : {
-              "Red Component" : 0.90000000000000002,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.63,
-              "Alpha Component" : 1,
-              "Green Component" : 0.90000000000000002
-            },
-            "maxwidth" : 1.7976931348623157e+308
-          },
-          "layout advanced configuration dictionary value" : {
-            "font" : ".AppleSystemUIFont 12",
-            "auto-rainbow style" : 0,
-            "algorithm" : 1
-          }
-        }
-      },
-      {
-        "class" : "iTermStatusBarSpringComponent",
-        "configuration" : {
-          "knobs" : {
-            "base: priority" : 5,
-            "iTermStatusBarSpringComponentSpringConstantKey" : 0.01,
-            "base: compression resistance" : 1,
-            "iTermStatusBarSpringComponentSizeMultipleKey" : 1
-          },
-          "layout advanced configuration dictionary value" : {
-            "font" : ".AppleSystemUIFont 12",
-            "auto-rainbow style" : 0,
-            "algorithm" : 1
-          }
-        }
-      },
-      {
-        "class" : "iTermStatusBarCPUUtilizationComponent",
-        "configuration" : {
-          "knobs" : {
-            "base: priority" : 5,
-            "base: compression resistance" : 1,
-            "shared text color" : {
-              "Red Component" : 0.63,
-              "Color Space" : "sRGB",
-              "Blue Component" : 0.63,
-              "Alpha Component" : 1,
-              "Green Component" : 0.90000000000000002
-            }
-          },
-          "layout advanced configuration dictionary value" : {
-            "font" : ".AppleSystemUIFont 12",
-            "auto-rainbow style" : 0,
-            "algorithm" : 1
-          }
-        }
-      }
-    ],
-    "advanced configuration" : {
-      "font" : ".AppleSystemUIFont 12",
-      "auto-rainbow style" : 0,
-      "algorithm" : 1
-    }
-  },
-  "Silence Bell" : false,
   "Ansi 14 Color" : {
     "Green Component" : 0.56485837697982788,
     "Red Component" : 0.50599193572998047,
     "Blue Component" : 0.56363654136657715
   },
-  "Name" : "Eduard",
+  "Ansi 2 Color" : {
+    "Green Component" : 0.54115492105484009,
+    "Red Component" : 0.44977453351020813,
+    "Blue Component" : 0.020208755508065224
+  },
+  "Send Code When Idle" : false,
+  "ASCII Anti Aliased" : true,
+  "Tags" : [
+    "Dynamic"
+  ],
+  "Ansi 9 Color" : {
+    "Green Component" : 0.21325300633907318,
+    "Red Component" : 0.74176257848739624,
+    "Blue Component" : 0.073530435562133789
+  },
+  "Use Bold Font" : true,
+  "Silence Bell" : false,
+  "Ansi 12 Color" : {
+    "Green Component" : 0.50962930917739868,
+    "Red Component" : 0.44058024883270264,
+    "Blue Component" : 0.51685798168182373
+  },
+  "Window Type" : 0,
+  "Use Bright Bold" : true,
   "Cursor Text Color" : {
     "Red Component" : 0,
     "Color Space" : "sRGB",
@@ -414,8 +319,7 @@
     "Alpha Component" : 1,
     "Green Component" : 0.20392156862745098
   },
-  "Minimum Contrast" : 0,
-  "Shortcut" : "",
+  "Default Bookmark" : "No",
   "Cursor Color" : {
     "Red Component" : 0.51372549019607838,
     "Color Space" : "sRGB",
@@ -423,52 +327,90 @@
     "Alpha Component" : 1,
     "Green Component" : 0.58039215686274515
   },
-  "Transparency" : 0,
-  "Ansi 0 Color" : {
-    "Red Component" : 0,
+  "Ansi 1 Color" : {
+    "Green Component" : 0.10840655118227005,
+    "Red Component" : 0.81926977634429932,
+    "Blue Component" : 0.14145714044570923
+  },
+  "Name" : "Eduard",
+  "Blinking Cursor" : false,
+  "Guid" : "8E3E86A3-E3CB-4DCE-B5CA-0EA360EB68F7",
+  "Idle Code" : 0,
+  "Ansi 10 Color" : {
+    "Green Component" : 0.35665956139564514,
+    "Red Component" : 0.27671992778778076,
+    "Blue Component" : 0.38298487663269043
+  },
+  "Ansi 8 Color" : {
+    "Red Component" : 0.21568627450980393,
     "Color Space" : "sRGB",
-    "Blue Component" : 0.25098039215686274,
+    "Blue Component" : 0.36862745098039218,
     "Alpha Component" : 1,
-    "Green Component" : 0.20392156862745098
+    "Green Component" : 0.33725490196078434
   },
-  "Guid" : "8E3E86A3-E3CB-4DCE-B5CA-0EA360EB68F7",
-  "Horizontal Spacing" : 1,
-  "Ansi 3 Color" : {
-    "Green Component" : 0.46751424670219421,
-    "Red Component" : 0.64746475219726562,
-    "Blue Component" : 0.023484811186790466
+  "Badge Color" : {
+    "Red Component" : 1,
+    "Color Space" : "Calibrated",
+    "Blue Component" : 0,
+    "Alpha Component" : 0.5,
+    "Green Component" : 0
   },
-  "Link Color" : {
+  "Smart Cursor Color" : false,
+  "Ambiguous Double Width" : false,
+  "Cursor Type" : 2,
+  "Ansi 0 Color" : {
     "Red Component" : 0,
     "Color Space" : "sRGB",
-    "Blue Component" : 0.73333333333333328,
+    "Blue Component" : 0.25098039215686274,
     "Alpha Component" : 1,
-    "Green Component" : 0.35686274509803922
+    "Green Component" : 0.20392156862745098
   },
-  "Use Non-ASCII Font" : true,
+  "Blur" : false,
+  "Vertical Spacing" : 1,
+  "Normal Font" : "MesloLGSForPowerline-Regular 13",
   "Ansi 7 Color" : {
     "Green Component" : 0.89001238346099854,
     "Red Component" : 0.91611063480377197,
     "Blue Component" : 0.79781103134155273
   },
-  "Ansi 8 Color" : {
-    "Red Component" : 0.21568627450980393,
-    "Color Space" : "sRGB",
-    "Blue Component" : 0.36862745098039218,
-    "Alpha Component" : 1,
-    "Green Component" : 0.33725490196078434
-  },
-  "Ansi 9 Color" : {
-    "Green Component" : 0.21325300633907318,
-    "Red Component" : 0.74176257848739624,
-    "Blue Component" : 0.073530435562133789
+  "Command" : "",
+  "Terminal Type" : "xterm-256color",
+  "Horizontal Spacing" : 1,
+  "Option Key Sends" : 0,
+  "Minimum Contrast" : 0,
+  "Ansi 15 Color" : {
+    "Green Component" : 0.95794391632080078,
+    "Red Component" : 0.98943418264389038,
+    "Blue Component" : 0.86405980587005615
   },
   "Ansi 6 Color" : {
     "Green Component" : 0.57082360982894897,
     "Red Component" : 0.14679534733295441,
     "Blue Component" : 0.52502274513244629
   },
-  "Right Option Key Sends" : 0
+  "Transparency" : 0,
+  "Background Color" : {
+    "Green Component" : 0.11783610284328461,
+    "Red Component" : 0,
+    "Blue Component" : 0.15170273184776306
+  },
+  "Screen" : -1,
+  "Non Ascii Font" : "HackNF-Regular 13",
+  "Ansi 13 Color" : {
+    "Green Component" : 0.33896297216415405,
+    "Red Component" : 0.34798634052276611,
+    "Blue Component" : 0.72908437252044678
+  },
+  "Use Tab Color" : false,
+  "Columns" : 80,
+  "Visual Bell" : true,
+  "Custom Directory" : "No",
+  "Ansi 5 Color" : {
+    "Green Component" : 0.10802463442087173,
+    "Red Component" : 0.77738940715789795,
+    "Blue Component" : 0.43516635894775391
+  },
+  "ASCII Ligatures" : false
 }
 ]
 }
diff --git a/zsh/zshrc b/zsh/zshrc
index a042e739..c06ff32f 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -25,13 +25,13 @@ ENABLE_CORRECTION="true"
 COMPLETION_WAITING_DOTS="true"
 
 ### nvm
-export NVM_DIR=~/.nvm
-zstyle ':omz:plugins:nvm' lazy true
+# export NVM_DIR=~/.nvm
+# zstyle ':omz:plugins:nvm' lazy true
 ### end nvm
 
-plugins=(adb ansible autojump brew command-not-found cp docker docker-compose extract genpass git git-extras git-flow gpg-agent gradle lol macos mvn nvm ripgrep sudo timer yarn)
+plugins=(ansible autojump bgnotify brew command-not-found cp docker docker-compose extract genpass git git-extras gpg-agent gradle kubectl lol macos mvn sudo terraform timer)
 
-RPROMPT='$(jenv_prompt_info)'" "'$(rbenv_prompt_info)'"$RPROMPT"
+# RPROMPT='$(jenv_prompt_info)'" "'$(rbenv_prompt_info)'"$RPROMPT"
 
 source $ZSH/oh-my-zsh.sh
 
@@ -94,6 +94,10 @@ alias 'dcu'='docker-compose unpause'
 
 alias 'gitsc'='git switch --create'
 
+alias 'scrcpyf'='adb devices -l | tail +2 | fzf -1 -0 --reverse --height 35% | cut -d" " -f1 | xargs scrcpy -s'
+
+alias 'tailscale'='/Applications/Tailscale.app/Contents/MacOS/Tailscale'
+
 bindkey -e
 bindkey '[C' forward-word
 bindkey '[D' backward-word
@@ -109,6 +113,7 @@ export ANDROID_SDK=$ANDROID_HOME
 
 export PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/tools/proguard/bin
 
+export KOTLIN_HOME=$(brew --prefix kotlin)/libexec
 
 function mkd() {
   mkdir -p $1 && cd $_
@@ -144,13 +149,21 @@ source /opt/homebrew/opt/git-extras/share/git-extras/git-extras-completion.zsh
 source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 #end zsh-syntax-highlighting
 
-# 1Password CLI
-eval "$(op completion zsh)"; compdef _op op
-# end 1Password CLI
+# # 1Password CLI
+# eval "$(op completion zsh)"; compdef _op op
+# # end 1Password CLI
+
+# OrbStack
+# if (( $+commands[orbctl] )); then
+#   eval "$(orbctl completion zsh)"
+#   compdef _orb orbctl
+#   compdef _orb orb
+# fi
+# end OrbStack
 
 ### GCloud 
-source "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc"
-source "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc"
+# source "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/path.zsh.inc"
+# source "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc"
 ### end GCloud 
 
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"