Skip to content

Commit c8c853c

Browse files
authored
Latest updates from 2022 (#2)
1 parent 94e79fd commit c8c853c

10 files changed

+47
-117
lines changed

.aliases

100644100755
-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ alias mv='mv -v'
1515
alias rm='rm -i -v'
1616
alias cp='cp -v'
1717

18-
alias hosts='sudo $EDITOR /etc/hosts' # yes I occasionally 127.0.0.1 twitter.com ;)
19-
2018
# Detect which `ls` flavor is in use
2119
if ls --color > /dev/null 2>&1; then # GNU `ls`
2220
colorflag="--color"

.bash_profile

100644100755
+1-3
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,4 @@ fi;
100100
# You could just use `-g` instead, but I like being explicit
101101
complete -W "NSGlobalDomain" defaults;
102102

103-
# export PATH="$HOME/.cargo/bin:$PATH"
104-
105-
[[ -r "/usr/local/etc/profile.d/bash_completion.sh" ]] && . "/usr/local/etc/profile.d/bash_completion.sh"
103+
[[ -r "/usr/local/etc/profile.d/bash_completion.sh" ]] && . "/usr/local/etc/profile.d/bash_completion.sh"

.bash_prompt

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Heavily inspired by @necolas’s prompt: https://github.com/necolas/dotfiles
44
# iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing.
55

6-
default_username='ricardotorres'
6+
default_username='rictorres'
77

88
if [[ -n "$ZSH_VERSION" ]]; then # quit now if in zsh
99
return 1 2> /dev/null || exit 1;

.bashrc

100644100755
+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
[ -n "$PS1" ] && source ~/.bash_profile;
22

3-
export NVM_DIR="$HOME/.nvm"
4-
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
5-
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
6-
73
if [ -r $(brew --prefix)/opt/mcfly/mcfly.bash ]; then
84
. $(brew --prefix)/opt/mcfly/mcfly.bash
9-
fi
5+
fi

.exports

100644100755
+3
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ export LANG='en_US.UTF-8';
1515
export LC_ALL='en_US.UTF-8';
1616

1717
export HOMEBREW_CASK_OPTS="--appdir=/Applications"
18+
19+
export N_PREFIX=$HOME/.n
20+
export PATH=$N_PREFIX/bin:$PATH

.gitconfig

100644100755
+3-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
[core]
8080

8181
# Use custom `.gitignore` and `.gitattributes`
82-
excludesfile = /Users/ricardo.torres/.gitignore
82+
excludesfile = /Users/rictorres/.gitignore
8383
attributesfile = ~/.gitattributes
8484

8585
# Treat spaces before tabs and all kinds of trailing whitespace as an error
@@ -186,3 +186,5 @@
186186
[mergetool "sourcetree"]
187187
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
188188
trustExitCode = true
189+
[init]
190+
defaultBranch = main

.zshrc

100644100755
+3-36
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ source ~/.bashrc
102102

103103

104104
# Path to your oh-my-zsh installation.
105-
export ZSH=/Users/ricardotorres/.oh-my-zsh
105+
export ZSH=/Users/rictorres/.oh-my-zsh
106106

107107
# Set name of the theme to load.
108108
# Look in ~/.oh-my-zsh/themes/
@@ -154,13 +154,12 @@ ZSH_THEME="robbyrussell"
154154
# Add wisely, as too many plugins slow down shell startup.
155155
plugins=(git docker)
156156

157+
source $ZSH/oh-my-zsh.sh
158+
157159
# User configuration
158160

159-
# export PATH="$PATH:/Users/ricardotorres/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/MacGPG2/bin:/Users/ricardotorres/.rvm/bin"
160161
# export MANPATH="/usr/local/man:$MANPATH"
161162

162-
source $ZSH/oh-my-zsh.sh
163-
164163
# You may need to manually set your language environment
165164
# export LANG=en_US.UTF-8
166165

@@ -174,9 +173,6 @@ source $ZSH/oh-my-zsh.sh
174173
# Compilation flags
175174
# export ARCHFLAGS="-arch x86_64"
176175

177-
# ssh
178-
# export SSH_KEY_PATH="~/.ssh/dsa_id"
179-
180176
# Set personal aliases, overriding those provided by oh-my-zsh libs,
181177
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
182178
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
@@ -186,32 +182,3 @@ source $ZSH/oh-my-zsh.sh
186182
# alias zshconfig="mate ~/.zshrc"
187183
# alias ohmyzsh="mate ~/.oh-my-zsh"
188184

189-
190-
# place this after nvm initialization!
191-
autoload -U add-zsh-hook
192-
load-nvmrc() {
193-
# without this next line there's a big performance hit to `cd`
194-
# so we are adding it to make sure the script won't check for `.nvmrc`
195-
# in parent directories and it also won't go back to the default
196-
# node version when you `cd` out of the project dir.
197-
# - https://stackoverflow.com/questions/23556330/run-nvm-use-automatically-every-time-theres-a-nvmrc-file-on-the-directory#comment104625451_39519460
198-
[[ -a .nvmrc ]] || return
199-
200-
local node_version="$(nvm version)"
201-
local nvmrc_path="$(nvm_find_nvmrc)"
202-
203-
if [ -n "$nvmrc_path" ]; then
204-
local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
205-
206-
if [ "$nvmrc_node_version" = "N/A" ]; then
207-
nvm install
208-
elif [ "$nvmrc_node_version" != "$node_version" ]; then
209-
nvm use
210-
fi
211-
elif [ "$node_version" != "$(nvm version default)" ]; then
212-
echo "Reverting to nvm default version"
213-
nvm use default
214-
fi
215-
}
216-
add-zsh-hook chpwd load-nvmrc
217-
load-nvmrc

README.md

100644100755
-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,5 @@ chsh -s $(which zsh)
3333
- please see [Adding your SSH key to the ssh-agent](https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/#adding-your-ssh-key-to-the-ssh-agent)
3434

3535
## Adding Touch ID support for `sudo`ing
36-
3736
- `sudo vi /etc/pam.d/sudo`
3837
- add the following line to the top: `auth sufficient pam_tid.so`

brew-cask.sh

+31-52
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,43 @@
1-
#!/bin/bash
1+
#!/bin/bash
22

33
# to maintain cask ....
44
# brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup`
55

6-
# Install native apps
7-
86
brew install homebrew/cask-cask
97

10-
# daily
11-
brew cask install spectacle
12-
# brew cask install rescuetime
13-
brew cask install spotify
14-
brew cask install slack
15-
brew cask install caffeine
16-
brew cask install simplenote
17-
# brew cask install the-unarchiver
18-
brew cask install whatsapp
19-
brew cask install telegram
20-
brew cask install mailspring
21-
# brew cask install numi
22-
# brew cask install cheatsheet
23-
24-
# dev
25-
brew cask install visual-studio-code
26-
brew cask install iterm2
27-
brew cask install ngrok
28-
brew cask install imagealpha
29-
brew cask install imageoptim
30-
brew cask install virtualbox
31-
brew cask install postman
32-
brew cask install sequel-pro
33-
brew cask install docker
8+
# work related
9+
# brew install --cask slack
10+
# brew install --cask virtualbox
3411

3512
# browsers
36-
brew cask install google-chrome
37-
brew cask install firefox
38-
brew cask install homebrew/cask-versions/google-chrome-canary
39-
40-
# quick look
41-
# brew cask install qlstephen
42-
# brew cask install qlmarkdown
43-
# brew cask install quicklook-json
44-
# brew cask install qlimagesize
45-
# brew cask install qlvideo
13+
brew install --cask google-chrome
14+
brew install --cask google-chrome-canary
15+
brew install --cask brave-browser
16+
brew install --cask firefox
17+
18+
# utils
19+
brew install --cask rectangle
20+
brew install --cask spotify
21+
brew install --cask caffeine
22+
brew install --cask simplenote
23+
brew install --cask whatsapp
24+
brew install --cask telegram
25+
brew install --cask mailspring
26+
brew install --cask setapp
27+
brew install --cask kap
28+
brew install --cask vlc
29+
brew install --cask notion
4630

47-
# less often
48-
brew cask install droplr
49-
brew cask install kap
50-
brew cask install vlc
51-
# brew cask install gpgtools # unavailable
52-
53-
# legacy
54-
55-
# brew cask install postico
56-
# brew cask install psequel
57-
# brew cask install steam
31+
# dev
32+
brew install --cask visual-studio-code
33+
brew install --cask iterm2
34+
brew install --build-from-source fnm
35+
brew install --cask postman
36+
brew install --cask sequel-ace
37+
brew install --cask docker
38+
# brew install --cask ngrok
39+
# brew install --cask imagealpha
40+
# brew install --cask imageoptim
5841

5942
# not on cask but much wanted
60-
# filezilla
6143
# pastebox
62-
# shazam
63-
# wunderlist
64-
# medis

brew.sh

+4-16
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ brew install findutils
2323
# Install GNU `sed`, overwriting the built-in `sed`.
2424
brew install gnu-sed
2525

26-
# Install Bash 4.
26+
# Install latest Bash
2727
# Note: don’t forget to add `/usr/local/bin/bash` to `/etc/shells` before
2828
# running `chsh`.
2929
brew install bash
@@ -55,38 +55,26 @@ brew install diff-so-fancy
5555
# mysql autocomplete (https://github.com/dbcli/mycli)
5656
brew install mycli
5757

58-
# mtr - ping & traceroute. best.
59-
brew install mtr
60-
61-
# allow mtr to run without sudo
62-
mtrlocation=$(brew info mtr | grep Cellar | sed -e 's/ (.*//') # e.g. `/Users/paulirish/.homebrew/Cellar/mtr/0.86`
63-
sudo chmod 4755 $mtrlocation/sbin/mtr
64-
sudo chown root $mtrlocation/sbin/mtr
65-
66-
6758
# Install other useful binaries
6859
brew install fzf
6960
brew install git
7061
brew install imagemagick
71-
brew install pv
72-
brew install rename
7362
brew install speedtest-cli
7463
brew install tree
75-
brew install zopfli
7664
brew install ffmpeg
77-
brew install terminal-notifier
7865
brew install mas
7966
brew install exa # https://bsago.me/exa/
8067
brew install ncdu # find where your diskspace went
8168
brew install awscli
8269
brew install bat
83-
brew install ansible
8470
brew install jq
8571
brew install terraform
8672
brew install lsd # https://github.com/Peltoche/lsd
87-
brew install ncdu # find where your diskspace went
8873

8974
brew install zsh
9075

76+
# install oh-my-zsh
77+
sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
78+
9179
# Remove outdated versions from the cellar
9280
brew cleanup

0 commit comments

Comments
 (0)