updating brew dependencies

the-gigi · Mar 19, 2020 · efb9afb · efb9afb
1 parent 3b84962
commit efb9afb
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 6 deletions.
diff --git a/bootstrap/brew-cask.txt b/bootstrap/brew-cask.txt
@@ -5,10 +5,8 @@ calibre
 docker
 dropbox
 firefox
-google-cloud-sdk
 iterm2
 macdown
-macdown
 paintbrush
 pycharm-ce
 slack

diff --git a/bootstrap/brew-tap.txt b/bootstrap/brew-tap.txt
@@ -0,0 +1,15 @@
+gettext
+go
+httpie
+jq
+k3d
+k9s
+kubectl
+kubernetes-helm
+minikube
+node
+octant
+python3
+rust
+tmux
+tree
diff --git a/bootstrap/brew.txt b/bootstrap/brew.txt
@@ -4,12 +4,17 @@ httpie
 jq
 k3d
 k9s
+kind
 kubectl
 kubernetes-helm
+kubebuilder
+kustomize
 minikube
 node
 octant
 python3
+pyenv
 rust
 tmux
 tree
+pipenv
diff --git a/components/general.sh b/components/general.sh
@@ -3,7 +3,10 @@ export EDITOR=vim
 # Don't save commands that have a space prefix in the history
 export HISTCONTROL=ignorespace
 
-alias shrug='echo "\_(ツ)_/¯"'
+# Enable the repeat command
+enable -r repeat
+
+alias shrug='echo "¯\_(ツ)_/¯"'
 
 # Directory listing in a nice format
 alias lla='ls -lAGh'

diff --git a/components/prompt/paths.txt b/components/prompt/paths.txt
@@ -1,2 +1,2 @@
-$HOME/git:\(G)
+$HOME/git:(🐙)
 $HOME:~
diff --git a/components/prompt/prompt.sh b/components/prompt/prompt.sh
@@ -1,10 +1,16 @@
 #! /usr/bin/env zsh
 
 script_name=${(%):-%N}
-prompt_dir="$(cd "$(dirname "$script_name")" >/dev/null 2>&1 && pwd)"
+PROMPT_DIR="$(cd "$(dirname "$script_name")" >/dev/null 2>&1 && pwd)"
 
 alias escape_path='sed -e "s/\//\\\\\//g"'
 
+function get_paths()
+{
+  envsubst < <(cat ~/.dotfiles.local/paths.txt "${PROMPT_DIR}/paths.txt")
+}
+
+
 function calc_current_dir()
 {
   cwd=$PWD
@@ -17,7 +23,7 @@ function calc_current_dir()
       cwd=$(echo "$PWD" | sed -e "s/$key/$(echo $value)/")
       break
     fi
-  done < <(envsubst < "${prompt_dir}/paths.txt")
+  done < <(get_paths)
   echo "${cwd}"
 }
 

diff --git a/setup.sh b/setup.sh
@@ -13,6 +13,11 @@ BOOTSTRAP_DIR=${DOT_DIR}/bootstrap
 
 # Local dotfiles dir for additions and customizations
 mkdir -p "$LOCAL_DOT_DIR"
+${LOCAL_DOT_DIR}/paths.txt
+${LOCAL_DOT_DIR}/brew.txt
+${LOCAL_DOT_DIR}/brew-link.txt
+${LOCAL_DOT_DIR}/brew-cask.txt
+
 
 # Symlink all rc files to the home dir (run commands. See https://en.wikipedia.org/wiki/Run_commands)
 for file in ${DOT_DIR}/rcfiles.d; do
@@ -30,6 +35,12 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
 brew tap homebrew/cask-cask
 brew tap homebrew/cask-versions
 
+
+## Add taps  with brew
+for item in $(cat ${BOOTSTRAP_DIR}/brew-tap.txt); do
+  brew tap $item
+done
+
 ## Install stuff with brew
 for item in $(cat ${BOOTSTRAP_DIR}/brew.txt); do
   brew install $item
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,10 +5,8 @@ calibre @@
     docker
     dropbox
     firefox
-    google-cloud-sdk
     iterm2
     macdown
-    macdown
     paintbrush
     pycharm-ce
     slack
@@ Expand Down @@