From 0fceab177169b4bdd655ac3309fcc5e2982f93cf Mon Sep 17 00:00:00 2001
From: MorganGeek <wattiez.morgan@gmail.com>
Date: Sun, 21 Jun 2020 12:38:50 +0200
Subject: [PATCH] sync

---
 Brewfile          | 10 +++++++---
 dot_gitconfig     |  4 ++--
 dot_profile       |  2 +-
 dot_zsh_aliases   | 13 ++++++++++---
 dot_zsh_functions | 12 ++++++++++++
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/Brewfile b/Brewfile
index 339e205..25d21a8 100644
--- a/Brewfile
+++ b/Brewfile
@@ -19,6 +19,7 @@ tap "jesseduffield/lazygit" # provides lazygit, simple terminal UI for git comma
 tap "jesseduffield/lazydocker" # provides lazydocker, simple terminal UI for managnig docker
 tap "skanehira/docui" # provides docui, simple terminal UI for creating/configuring docker services
 tap "romkatv/powerlevel10k" # provides powerlevel10k
+tap "shopify/shopify" # provides toxiproxy
 
 
 cask "java"
@@ -47,12 +48,14 @@ cask "calibre"
 cask "vagrant"
 # VirtualBox
 cask "virtualbox"
-# Arduino
-cask "arduino"
 cask "koa11y" # desktop app for asserting websites accessibility
 cask "osxfuse" # telepresence https://www.telepresence.io/reference/install
 cask "qbittorrent"
 cask "vlc"
+cask "brave-browser"
+cask "dropbox"
+cask "rescuetime"
+cask "wireshark"
 
 # Mac app store
 mas 'Keynote', id: 409183694
@@ -182,4 +185,5 @@ brew "docui" # simple terminal UI for creating/configuring docker services
 brew "httpie" # provides http - a command line HTTP client that will make you smile.
 brew "hyperfine" # CLI benchmark tool
 brew "powerlevel10k"
-
+brew "translate-shell" # provides the trans command, more doc via https://www.ostechnix.com/use-google-translate-commandline-linux/
+brew "toxiproxy"
diff --git a/dot_gitconfig b/dot_gitconfig
index d9875b2..1e782d8 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -26,9 +26,9 @@
                  | awk '{n=$1+0;if(H[n]++>max)max=H[n]}END{for(i=0;i<24;i++){printf\"%02d -%5d \",i,H[i];for(n=0;n<H[i]/max*50;n++){printf \"*\"}print\"\"}}'"
 [help]
 	autocorrect = -1 # not more git psuh
+[init]
+	templateDir = /Users/morganwattiez/.git-template
 [core]
 	pager = diff-so-fancy | less --tabs=4 -RFX
 [diff]
 	noprefix = true
-[init]
-	templateDir = /Users/morganwattiez/.git-template
diff --git a/dot_profile b/dot_profile
index 758f082..674f433 100644
--- a/dot_profile
+++ b/dot_profile
@@ -4,7 +4,7 @@ export PATH="$PATH:$HOME/.rvm/bin"
 
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
 
-
+alias proxy='ssh -D 8000 -N $(whoami)@management.collibra.com -i ~/.ssh/id_ed25519'
 export JETBRAINS_LICENSE_SERVER=https://licenseserver.collibra.com
 
 export PATH="$HOME/.cargo/bin:$PATH"
diff --git a/dot_zsh_aliases b/dot_zsh_aliases
index bc2986c..309a8f9 100644
--- a/dot_zsh_aliases
+++ b/dot_zsh_aliases
@@ -20,6 +20,7 @@ alias support="jira issue jql \"project in (CICD) AND (Created > -2w AND resolut
 alias guardian="support"
 alias lastissues='jira issue jql "project IN (CICD) AND Created > -2w ORDER BY Created DESC, Priority DESC"'
 alias workingon="jira issue jql \"assignee = currentUser() AND resolution = Unresolved AND status not in ('In Review', 'Done', 'In Testing', 'Waiting For Build') OR QA = currentUser() AND status = 'In Testing' ORDER BY updated DESC, priority DESC\""
+alias toreview='jira issue jql "project in (CICD) AND Updated > -2w AND issue.property[development].openprs > 0 ORDER BY Created DESC, Priority ASC"'
 alias newissues="jira issue jql \"project IN (CICD) AND Created > -2w AND resolution = Unresolved AND status not in ('In Progress') ORDER BY Created DESC, Priority DESC\""
 alias n='newissues'
 alias backlog=cicdlist
@@ -64,15 +65,16 @@ alias markdown='glow'
 #alias done='task_done'
 
 # Management / Security / SSH / SSL
-alias mgmt='ssh $(whoami)@management.collibra.com -i ~/.ssh/id_ed25519'
+alias mgmt='ssh $(whoami)@dev-gate.collibra.com -i ~/.ssh/id_ed25519'
 alias m='mgmt'
-alias tunnel='sshuttle --dns -r "$(whoami)@management.collibra.com" 0/0'
+alias tunnel='ssh -D 8000 -N $(whoami)@dev-gate.collibra.com -i ~/.ssh/id_ed25519'
 alias sshpub='cat ~/.ssh/id_ed25519.pub'
 alias ssla="openssl x509 -alias -noout -in"  # Usage : ssla <cert>
 
 # Network
-alias ip='echo $(curl ident.me 2>/dev/null)'
+alias ip='echo $(curl ident.me -4 2>/dev/null)'
 alias ipinfo='curl "ipinfo.io/"$(ip)'
+alias getips='\egrep "\b(([0-9]{1,2}|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}(1[0-9][0-9]|2[0-4][0-9]|25[0-5]|[0-9]{1,2})\b"'
 
 # Misc
 alias h='cd $HOME'
@@ -124,6 +126,11 @@ alias gw='./gradlew'
 alias terraform_landscape='landscape'
 alias tf='terraform'
 
+# K8S
+alias k9s='COLORTERM=256bit k9s --all-namespaces'
+alias 9=k9s
+alias K=k9s
+
 # Show/hide hidden files in Finder
 alias show="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
 alias hide="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
diff --git a/dot_zsh_functions b/dot_zsh_functions
index 3564944..60a8ad4 100644
--- a/dot_zsh_functions
+++ b/dot_zsh_functions
@@ -272,3 +272,15 @@ function git-project {
         cd "$dir"
     fi
 }
+function jenkins-cli {
+    local script_location=$(find $HOME/code/jenkins-cloudbees-core -name "jenkins-cli.sh")
+    eval "$script_location $*"
+}
+function colorpic {
+    local picture_url="$1"
+    echo "Colorizing $picture_url"
+    local result_url=$(\curl -F "image=@$picture_url" -H "api-key:a91c8220-53b0-4afd-b97d-96825700cd3d" https://api.deepai.org/api/colorizer -s | jq '.output_url' | strings)
+    echo "Generated $result_url"
+    echo "Display in progress..."
+    eval "\curl -s $result_url | imgcat"
+}