From 8039a82736c991c6bc027d9fe9f4dd4078d19632 Mon Sep 17 00:00:00 2001
From: Lee Tang <i@d0zingcat.dev>
Date: Sun, 15 Jan 2023 02:27:27 +0800
Subject: [PATCH] update scripts for new macbook air

Signed-off-by: Lee Tang <i@d0zingcat.dev>
---
 .Brewfile.Darwin.gooddeAir | 70 ++++++++++++++++++++++++++++++++++++++
 .zshrc                     |  9 ++---
 setup.sh                   |  6 ++--
 3 files changed, 76 insertions(+), 9 deletions(-)
 create mode 100644 .Brewfile.Darwin.gooddeAir

diff --git a/.Brewfile.Darwin.gooddeAir b/.Brewfile.Darwin.gooddeAir
new file mode 100644
index 0000000..7c1f196
--- /dev/null
+++ b/.Brewfile.Darwin.gooddeAir
@@ -0,0 +1,70 @@
+tap "homebrew/bundle"
+tap "homebrew/cask"
+tap "homebrew/cask-drivers"
+tap "homebrew/core"
+tap "homebrew/services"
+brew "readline"
+brew "asdf"
+brew "sqlite"
+brew "xz"
+brew "autojump"
+brew "bat"
+brew "bpytop"
+brew "cmake"
+brew "dosbox"
+brew "fd"
+brew "fzf"
+brew "glib"
+brew "glibc" if OS.linux?
+brew "gnupg" if OS.mac?
+brew "go"
+brew "helm"
+brew "kubernetes-cli"
+brew "kubectx"
+brew "qemu"
+brew "lima"
+brew "lsd"
+brew "zlib"
+brew "mysql"
+brew "neovim"
+brew "node"
+brew "openssl@3"
+brew "pinentry-mac"
+brew "postgresql"
+brew "pyenv"
+brew "redis"
+brew "ripgrep"
+brew "rust"
+brew "starship"
+brew "stylua"
+brew "syncthing", restart_service: true
+brew "teleport"
+brew "telnet"
+brew "terraform"
+brew "tmux"
+brew "trzsz-go"
+brew "wakeonlan"
+brew "wget"
+brew "coreutils"
+brew "difftastic"
+cask "bartender"
+cask "brave-browser"
+cask "charles"
+cask "datagrip"
+cask "discord"
+#cask "google-chrome"
+cask "google-drive"
+#cask "lark"
+#cask "logitech-options"
+cask "notion"
+#cask "openvpn-connect"
+cask "raycast"
+cask "spotify"
+cask "stats"
+cask "telegram"
+cask "visual-studio-code"
+cask "wezterm"
+cask "1password"
+cask "clash-for-windows"
+cask "logi-options-plus"
+cask "docker"
diff --git a/.zshrc b/.zshrc
index 3220b5d..481550b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -31,9 +31,12 @@ export CPPFLAGS=$CPPFLAGS
 export ZSH_HIGHLIGHT_MAXLENGTH=60
 
 
+FPATH="$brew_opt/share/zsh/site-functions:${ASDF_DIR}/completions:${FPATH}"
 DISABLE_MAGIC_FUNCTIONS=true
 source $HOME/.antigen/antigen.zsh
 
+
+
 antigen use oh-my-zsh
 
 antigen bundle git
@@ -89,12 +92,10 @@ alias clean_tmux_session='ls ~/.tmux/resurrect/* -1dtr | head -n 100  | xargs rm
 
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-[ -f ~/.asdf/asdf.sh ] && source ~/.asdf/asdf.sh
 [ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh
 [ -f /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc ] &&  .  /usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/completion.zsh.inc
 [ -f /usr/share/fzf/completion.zsh ] && source /usr/share/fzf/completion.zsh
 [ -f /usr/share/fzf/key-bindings.zsh ] && source /usr/share/fzf/key-bindings.zsh 
-[ -f /opt/asdf-vm/asdf.sh ] && source /opt/asdf-vm/asdf.sh
 
 
 # menu
@@ -168,10 +169,6 @@ function rsync_work() {
 
 #export LESS_TERMCAP_so=$'\E[30;43m'
 
-if [ $arch = 'arm64' ]; then
-    eval "$(/opt/homebrew/bin/brew shellenv)"
-    . /opt/homebrew/opt/asdf/libexec/asdf.sh
-fi
 
 #export LDFLAGS="-L/usr/local/opt/llvm/lib -L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib -L/usr/local/opt/zlib/lib -L/usr/local/opt/bzip2/lib"
 #export CPPFLAGS="-I/usr/local/opt/llvm/include -I/usr/local/opt/zlib/include -I/usr/local/opt/bzip2/include"
diff --git a/setup.sh b/setup.sh
index b5d3cc2..622225a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -25,7 +25,7 @@ CONFIG_FILES=(
 )
 
 CUSTOM_FILES=(
-    "ssh/config .ssh/config"
+#    "ssh/config .ssh/config"
     "git/config .gitconfig"
 )
 
@@ -110,8 +110,7 @@ function backup() {
 }
 
 function recover() {
-#    sudo xcode-select --install
-#    sudo softwareupdate --install-rosetta
+    #softwareupdate --install-rosetta
     OS="$(uname)"
 
     # Homebrew
@@ -121,6 +120,7 @@ function recover() {
     fi
     if [ "$OS" = 'Darwin' ]; then
         export PATH=/usr/local/bin/:$PATH
+        xcode-select --install
     elif [ "$OS" = 'Linux' ]; then
         export PATH=/home/linuxbrew/.linuxbrew/bin/:$PATH
     fi