Skip to content

Commit 83b3332

Browse files
committedFeb 21, 2024
Update brew settings and env vars
1 parent 1df8efb commit 83b3332

File tree

2 files changed

+48
-32
lines changed

2 files changed

+48
-32
lines changed
 

‎zsh_aliases

+11-8
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ alias rm='rm -i' # 'rm -i' prompts for every file
5656
alias ln='ln -i'
5757

5858
#upgrade
59-
alias reset-ruby='brew uninstall --force --ignore-dependencies ruby && sudo rm -rf /usr/local/lib/ruby && brew install ruby && gem-upgrade && gem install bundler'
59+
alias reset-ruby='brew uninstall --force --ignore-dependencies ruby && sudo rm -rf /opt/homebrew/lib/ruby && brew install ruby && gem-upgrade && gem install bundler'
6060
alias osx-upgrade="sudo softwareupdate -ia"
61-
alias brew-upgrade="brew update && brew bundle --global && brew upgrade && brew upgrade --cask --greedy && brew cleanup"
61+
alias brew-upgrade="(cd /opt/homebrew && git reset --hard origin/master) && brew update && brew bundle --global && brew upgrade && brew upgrade --cask --greedy && brew cleanup"
6262
alias pip-upgrade="pip freeze --local | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U"
6363
alias gem-upgrade="gem update --system; gem update"
6464
alias npm-upgrade="npm update -g"
@@ -133,8 +133,9 @@ alias railss="(bundle check || bundle install) \
133133

134134
#work session
135135
alias start-working="disable-hosts-blocking; \
136+
brew services start postgresql@14 & \
137+
brew services start redis@6.2 & \
136138
open -a 'Firefox Developer Edition' & \
137-
open -a Docker & \
138139
open -a Loopback & \
139140
open -a 'Audio Hijack' & \
140141
open -a 'Elgato Control Center' & \
@@ -143,7 +144,9 @@ alias start-working="disable-hosts-blocking; \
143144
open -a Slack &"
144145

145146
alias stop-working="enable-hosts-blocking; \
146-
osascript -e 'quit app \"Docker\"' \
147+
brew services stop postgresql@13 & \
148+
brew services stop redis@6.2 & \
149+
osascript \
147150
-e 'quit app \"Firefox Developer Edition\"' \
148151
-e 'quit app \"Loopback\"' \
149152
-e 'quit app \"Audio Hijack\"' \
@@ -153,15 +156,15 @@ alias stop-working="enable-hosts-blocking; \
153156
-e 'quit app \"Slack\"'"
154157

155158
#ruby
156-
alias change_ruby_2="RUBY_HOME=/usr/local/opt/ruby@2.7; \
157-
RUBY_GEMS_HOME=/usr/local/lib/ruby/gems/2.7.0; \
159+
alias change_ruby_2="export RUBY_HOME=/opt/homebrew/opt/ruby@2.7; \
160+
export RUBY_GEMS_HOME=/opt/homebrew/lib/ruby/gems/2.7.0; \
158161
export PATH=$RUBY_HOME/bin:$RUBY_GEMS_HOME/bin:$PATH; \
159162
export LDFLAGS=-L$RUBY_HOME/lib; \
160163
export CPPFLAGS=-I$RUBY_HOME/include; \
161164
export PKG_CONFIG_PATH=$RUBY_HOME/lib/pkgconfig"
162165

163-
alias change_ruby_3="RUBY_HOME=/usr/local/opt/ruby; \
164-
RUBY_GEMS_HOME=/usr/local/lib/ruby/gems/3.0.0; \
166+
alias change_ruby_3="export RUBY_HOME=/opt/homebrew/opt/ruby; \
167+
export RUBY_GEMS_HOME=/opt/homebrew/lib/ruby/gems/3.0.0; \
165168
export PATH=$RUBY_HOME/bin:$RUBY_GEMS_HOME/bin:$PATH; \
166169
export LDFLAGS=-L$RUBY_HOME/lib; \
167170
export CPPFLAGS=-I$RUBY_HOME/include; \

‎zshrc

+37-24
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
#!/bin/zsh
22

3+
LIB=/opt/homebrew/lib
4+
OPT=/opt/homebrew/opt
5+
36
export ZSHELL_HOME="$HOME/.zshell"
4-
export ZPLUG_HOME=/usr/local/opt/zplug
7+
export ZPLUG_HOME="$OPT/zplug"
58
export ZSH_CACHE_DIR="$HOME/.zsh_cache"
69
export HISTFILE="$HOME/.zsh_history"
710
export HISTSIZE=50000
811
export SAVEHIST=10000
912
export DEFAULT_USER=$(id -un)
13+
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
1014

1115
source $ZPLUG_HOME/init.zsh
1216

1317
zplug "plugins/git", from:oh-my-zsh
1418
zplug "plugins/command-not-found", from:oh-my-zsh
1519
zplug "plugins/bundler", from:oh-my-zsh
20+
zplug "plugins/brew", from:oh-my-zsh
1621
zplug "plugins/git", from:oh-my-zsh
1722
zplug "plugins/osx", from:oh-my-zsh
1823
zplug "plugins/tmux", from:oh-my-zsh
@@ -54,44 +59,52 @@ unsetopt correct
5459
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
5560

5661

57-
if [ -e /usr/local/opt/fzf/shell/completion.zsh ]; then
58-
source /usr/local/opt/fzf/shell/key-bindings.zsh
59-
source /usr/local/opt/fzf/shell/completion.zsh
62+
if [ -e $OPT/fzf/shell/completion.zsh ]; then
63+
source $OPT/fzf/shell/key-bindings.zsh
64+
source $OPT/fzf/shell/completion.zsh
6065
fi
6166

62-
RUBY_HOME=/usr/local/opt/ruby
63-
RUBY_GEMS_HOME=/usr/local/lib/ruby/gems/3.0.0
67+
# RUBY_HOME=$OPT/ruby@3.1
68+
# RUBY_GEMS_HOME=$LIB/ruby/gems/3.1.0
69+
70+
RUBY_HOME=$OPT/ruby@3.2
71+
RUBY_GEMS_HOME=$LIB/ruby/gems/3.2.0
6472

65-
# RUBY_HOME=/usr/local/opt/ruby@2.7
66-
# RUBY_GEMS_HOME=/usr/local/lib/ruby/gems/2.7.0
73+
# RUBY_HOME=$OPT/ruby@3.3
74+
# RUBY_GEMS_HOME=$LIB/ruby/gems/3.3.0
6775

68-
# NODE_HOME=/usr/local/opt/node
69-
# NODE_HOME=/usr/local/opt/node@14
70-
NODE_HOME=/usr/local/opt/node@16
76+
# NODE_HOME=$OPT/node@18
77+
NODE_HOME=$OPT/node@20
7178

72-
PYTHONPATH+=(/usr/local/lib/python3.7/site-packages(N-/))
79+
POSTGRES_HOME=$OPT/postgresql@15
7380

74-
export PATH=/usr/local/opt/curl/bin
81+
ES_HOME=/opt/elasticsearch
82+
83+
export PATH=$OPT/curl/bin
7584
export PATH=$PATH:$NODE_HOME/bin
76-
export PATH=$PATH:/usr/local/opt/openjdk/bin
77-
export PATH=$PATH:$RUBY_HOME/bin:$RUBY_GEMS_HOME/bin
85+
export PATH=$PATH:$OPT/openjdk/bin
86+
export PATH=$PATH:$RUBY_HOME/bin
87+
export PATH=$PATH:$RUBY_GEMS_HOME/bin
88+
export PATH=$PATH:$POSTGRES_HOME/bin
7889
export PATH=$PATH:/usr/bin/vendor_perl:/usr/bin/core_perl
79-
export PATH=$PATH:/usr/local/opt/python/libexec/bin
90+
export PATH=$PATH:$OPT/python/libexec/bin
91+
export PATH=$PATH:/opt/homebrew/bin:$PATH:/opt/homebrew/sbin
8092
export PATH=$PATH:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
81-
export LDFLAGS="-L$RUBY_HOME/lib"
82-
export CPPFLAGS="-I$RUBY_HOME/include -I/usr/local/opt/openjdk/include"
83-
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
84-
export DYLD_INSERT_LIBRARIES="/usr/local/opt/jemalloc/lib/libjemalloc.dylib"
93+
export DYLD_LIBRARY_PATH=$RUBY_HOME/lib:$OPT/jemalloc/lib
94+
export LDFLAGS="-L$RUBY_HOME/lib -L$POSTGRES_HOME/lib"
95+
export CPPFLAGS="-I$RUBY_HOME/include -I$POSTGRES_HOME/include -I$OPT/openjdk/include"
8596
export MALLOC_ARENA_MAX=2
86-
export PKG_CONFIG_PATH=$RUBY_HOME/lib/pkgconfig
97+
export RUBYOPT="-W0 --yjit --yjit-exec-mem-size=32 --yjit-call-threshold=120"
98+
export PKG_CONFIG_PATH=$RUBY_HOME/lib/pkgconfig:$POSTGRES_HOME/lib/pkgconfig:/opt/homebrew/opt/openssl@3/lib/pkgconfig
8799
export PYTHONPATH
88100
export GOPATH=$HOME/go
89101
export LC_ALL="en_US.UTF-8"
90102
export LANG="en_US.UTF-8"
91103
export EDITOR="vim"
92104
export HOMEBREW_NO_ANALYTICS=1
93105
export TERM="screen-256color"
94-
export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*"'
106+
export PGGSSENCMODE=disable
107+
export FZF_DEFAULT_COMMAND='rg --files --no-ignore --hidden --follow --glob "!.git/*" --glob "!node_modules/" --glob "!public/storage"'
95108
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
96109
export FZF_CTRL_R_COMMAND="$FZF_DEFAULT_COMMAND"
97110
export FZF_ALT_C_COMMAND="$FZF_DEFAULT_COMMAND"
@@ -106,6 +119,6 @@ eval "$(zoxide init zsh)"
106119

107120
ulimit -n 10240
108121

109-
source /Users/filippo/.config/broot/launcher/bash/br
110-
111122
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
123+
[ -s "/Users/filippo/.scm_breeze/scm_breeze.sh" ] && source "/Users/filippo/.scm_breeze/scm_breeze.sh"
124+
source /Users/filippo/Library/Application\ Support/org.dystroy.broot/launcher/bash/br

0 commit comments

Comments
 (0)
Please sign in to comment.