diff --git a/.zshrc b/.zshrc index 26ce70e..9197d8a 100644 --- a/.zshrc +++ b/.zshrc @@ -1,6 +1,15 @@ # If you come from bash you might have to change your $PATH. # export PATH=$HOME/bin:/usr/local/bin:$PATH +if type brew &>/dev/null; then + echo "brew completion" + FPATH=$(brew --prefix)/share/zsh/site-functions:$FPATH + fpath=($HOME/.asdf/completions $fpath) + + autoload -Uz compinit + compinit +fi + autoload -Uz compinit && compinit # you need to git clone git@github.com:zsh-users/antigen.git to $HOME if [[ -d $HOME/antigen ]]; then diff --git a/Brewfile b/Brewfile index a75206f..6ffa46c 100644 --- a/Brewfile +++ b/Brewfile @@ -27,6 +27,9 @@ brew "tree" brew "wget" # tools +brew "youtube-dl" +brew "ffmpeg" +brew "imagemagic" brew "mas" brew "p7zip" brew "dos2unix" @@ -72,40 +75,45 @@ brew "yarn" # brew "wrk" if ENV.key? 'CI_MODE' -cask "iterm2" +cask "alfred" +cask "appcleaner" +cask "bartender" +cask "calibre" +cask "charles" +cask "cyberduck" +cask "dash" +cask "dozer" +cask "day-o" cask "eudic" +cask "font-fira-code" +cask "font-source-code-pro" +cask "google-chrome" +cask "iina" +cask "iterm2" cask "java" +cask "kawa" +cask "karabiner-elements" cask "licecap" +cask "maccy" +cask "mos" +cask "mpv" cask "nextcloud" -# cask "1password" -cask "alfred" -cask "google-chrome" -# cask "firefox-developer-edition" -# cask "sublime-text" +cask "nitroshare" cask "visual-studio-code" -cask "font-source-code-pro" -cask "font-fira-code" -cask "dash" -cask "karabiner-elements" -cask "dozer" cask "shadowsocksx-ng" -cask "iina" cask "neteasemusic" -# cask "qqmusic" cask "google-trends" -cask "appcleaner" cask "oversight" # open broadcaster software cask "obs" # note-taking app cask "obsidian" # cask "dropbox" -cask "nitroshare" +cask "postman" cask "qmk-toolbox" +cask "upic" cask "via" cask "vlc" -cask "upic" -cask "mos" mas "WeChat", id: 836500024 mas "Unsplash Wallpapers", id: 1284863847 @@ -117,6 +125,3 @@ mas "Pages", id: 409201541 mas "Numbers", id: 409203825 mas "Keynote", id: 409183694 end - - - diff --git a/zsh/env.zsh b/zsh/env.zsh index 36f6afa..aae468b 100644 --- a/zsh/env.zsh +++ b/zsh/env.zsh @@ -9,7 +9,9 @@ export EDITOR=vim export NODE_HOME=/usr/local/node-v6.11.4-linux-64/ export PATH="$NODE_HOME/bin/:$PATH" -export PATH="$PATH:$HOME/phabricator/arcanist/bin/" +if [[ -d $HOME/phabricator/ ]]; then + export PATH="$PATH:$HOME/phabricator/arcanist/bin/" +fi export ANDROID_HOME="$HOME/Android/Sdk" export PATH="$PATH:$ANDROID_HOME/bin/" @@ -26,7 +28,7 @@ fi # eval "$(jenv init -)" # fi -# JDK +# JDK if [[ -d "/usr/local/jdk1.8.0_131" ]]; then export JAVA_HOME=/usr/local/jdk1.8.0_131 export PATH=$PATH:$JAVA_HOME/bin/ diff --git a/zsh/osx.zsh b/zsh/osx.zsh index 4c63d2d..b09ba76 100644 --- a/zsh/osx.zsh +++ b/zsh/osx.zsh @@ -1,3 +1,9 @@ -. $(brew --prefix asdf)/asdf.sh +if [[ -d $HOME/.asdf/ ]]; then + . $HOME/.asdf/asdf.sh + . $HOME/.asdf/completions/asdf.bash +fi +if [[ -d "/usr/local/opt/gnu-getopt/bin" ]]; then + PATH="/usr/local/opt/gnu-getopt/bin:$PATH" +fi