feat: git checkout interactive with fuzzy search

miszo · Oct 5, 2023 · 4327631 · 4327631
1 parent 8397bc4
commit 4327631
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/home/.chezmoiscripts/darwin/run_after_install-packages.sh.tmpl b/home/.chezmoiscripts/darwin/run_after_install-packages.sh.tmpl
@@ -2,8 +2,8 @@
 
 set -eufo pipefail
 
-{{ $packagesTimestampPath := joinPath .chezmoi.homeDir "chezmoi_install_packages_timestamp.txt" -}}
-{{ $brewfilePath := joinPath .chezmoi.homeDir "Brewfile" -}}
+{{ $brewBundleTimestampPath := joinPath .chezmoi.homeDir ".config" "brew" "brew_bundle_timestamp.txt" -}}
+{{ $brewfilePath := joinPath .chezmoi.homeDir ".config" "brew" "Brewfile" -}}
 {{ $toolVersionsPath := joinPath .chezmoi.homeDir ".tool-versions" -}}
 {{ $fallbackDate := "1970-01-01T00:00:00+0000" -}}
 {{ $dateFormat := "%Y-%m-%dT%H:%M:%S%z" -}}
@@ -31,33 +31,33 @@ function get_fallback_date_utc() {
   echo {{ $fallbackDate | quote }}
 }
 
-function set_install_fallback_timestamp() {
-  echo "Setting current timestamp in {{ $packagesTimestampPath }}"
-  get_fallback_date_utc > {{ $packagesTimestampPath | quote }}
+function set_bundle_fallback_timestamp() {
+  echo "Setting current timestamp in {{ $brewBundleTimestampPath }}"
+  get_fallback_date_utc > {{ $brewBundleTimestampPath | quote }}
 }
 
-function set_install_timestamp() {
-  echo "Setting current timestamp in {{ $packagesTimestampPath }}"
-  get_current_date_utc > {{ $packagesTimestampPath | quote }}
+function set_bundle_timestamp() {
+  echo "Setting current timestamp in {{ $brewBundleTimestampPath }}"
+  get_current_date_utc > {{ $brewBundleTimestampPath | quote }}
 }
 
-function get_install_timestamp() {
-  if ! [ -e {{ $packagesTimestampPath | quote }} ]; then
-    set_install_fallback_timestamp
+function get_bundle_timestamp() {
+  if ! [ -e {{ $brewBundleTimestampPath | quote }} ]; then
+    set_bundle_fallback_timestamp
   fi
-  cat {{ $packagesTimestampPath | quote }}
+  date -r {{ $brewBundleTimestampPath }} +{{ $dateFormat | quote }}
 }
 
 function get_brewfile_timestamp() {
   date -r {{ $brewfilePath }} +{{ $dateFormat | quote }}
 }
 
 function main() {
-  if [[ $(get_brewfile_timestamp) > $(get_install_timestamp) ]];
+  if [[ $(get_brewfile_timestamp) > $(get_bundle_timestamp) ]];
   then
     brew_bundle
     asdf_install
-    set_install_timestamp;
+    set_bundle_timestamp;
   fi
 }
 

diff --git a/home/Brewfile.tmpl → home/dot_config/brew/Brewfile.tmpl b/home/Brewfile.tmpl → home/dot_config/brew/Brewfile.tmpl
@@ -13,6 +13,7 @@ brew 'bat'
 brew 'bison'
 brew 'cloc'
 brew 'exa'
+brew 'fzf'
 brew 'gh'
 brew 'git'
 brew 'gitleaks'

diff --git a/home/dot_config/git/config.tmpl b/home/dot_config/git/config.tmpl
@@ -16,6 +16,8 @@
   a = add .
   nb = checkout -b
   co = checkout
+  coi = !git checkout $(git branch | fzf | xargs)
+  coia = !git checkout $(git branch -a | fzf | xargs)
   com = checkout master
   ci = commit
   cim = commit -m

diff --git a/home/dot_config/zsh/dot_zsh_functions.zsh → ...dot_config/zsh/dot_zsh_functions.zsh.tmpl b/home/dot_config/zsh/dot_zsh_functions.zsh → ...dot_config/zsh/dot_zsh_functions.zsh.tmpl
@@ -1,8 +1,29 @@
+{{- $brewBundleTimestampPath := joinPath .chezmoi.homeDir ".config" "brew" "brew_bundle_timestamp.txt" -}}
+{{- $brewfilePath := joinPath .chezmoi.homeDir ".config" "brew" "Brewfile" -}}
+{{ $fallbackDate := "1970-01-01T00:00:00+0000" -}}
+{{ $dateFormat := "%Y-%m-%dT%H:%M:%S%z" -}}
+
+function get_current_date_utc() {
+  date -u +{{ $dateFormat | quote }}
+}
+
+function set_bundle_timestamp() {
+  echo "Setting current timestamp in {{ $brewBundleTimestampPath }}"
+  get_current_date_utc > {{ $brewBundleTimestampPath | quote }}
+}
+
+function brew_bundle() {
+  echo "Run brew bundle..."
+  brew bundle --no-lock --file={{ $brewfilePath }}
+  set_bundle_timestamp;
+}
+
 function brew_update {
     brew upgrade &&
     brew update &&
     brew cleanup &&
     asdf reshim
+
 }
 
 function miszo_git_local_config {