1
- # Copyright 2006-2020 Joseph Block <[email protected] >
1
+ # Copyright 2006-2021 Joseph Block <[email protected] >
2
2
#
3
3
# BSD licensed, see LICENSE.txt
4
4
#
11
11
# Uncomment following line if you want to disable autosetting terminal title.
12
12
# DISABLE_AUTO_TITLE="true"
13
13
#
14
- # Version 0.7
14
+ # Version 1.0.0
15
15
16
16
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
17
17
# Initialization code that may require console input (password prompts, [y/n]
@@ -71,7 +71,9 @@ load-our-ssh-keys() {
71
71
#
72
72
# You can use ssh-add -K /path/to/key to store pass phrases into
73
73
# the macOS keychain
74
- ssh-add -A # load all ssh keys that have pass phrases stored in macOS keychain
74
+
75
+ # Load all ssh keys that have pass phrases stored in macOS keychain
76
+ ssh-add -A
75
77
fi
76
78
77
79
for key in $( find ~ /.ssh -type f -a \( -name ' *id_rsa' -o -name ' *id_dsa' -o -name ' *id_ecdsa' \) )
@@ -88,15 +90,14 @@ if [[ -z "$SSH_CLIENT" ]]; then
88
90
load-our-ssh-keys
89
91
fi
90
92
91
- # Now that we have $PATH set up and ssh keys loaded, configure zgen .
93
+ # Now that we have $PATH set up and ssh keys loaded, configure zgenom .
92
94
93
- # start zgen
95
+ # Start zgenom
94
96
if [ -f ~ /.zgen-setup ]; then
95
97
source ~ /.zgen-setup
96
98
fi
97
- # end zgen
98
99
99
- # set some history options
100
+ # Set some history options
100
101
setopt append_history
101
102
setopt extended_history
102
103
setopt hist_expire_dups_first
@@ -114,13 +115,13 @@ setopt share_history
114
115
# setopt noclobber
115
116
116
117
# Keep a ton of history. You can reset these without editing .zshrc by
117
- # adding a file to ~/.zshrc.d.
118
+ # adding a file to ~/.zshrc.d that changes these variables .
118
119
HISTSIZE=100000
119
120
SAVEHIST=100000
120
121
HISTFILE=~ /.zsh_history
121
122
export HISTIGNORE=" ls:cd:cd -:pwd:exit:date:* --help"
122
123
123
- # set some options about directories
124
+ # Set some options about directories
124
125
setopt pushd_ignore_dups
125
126
# setopt pushd_silent
126
127
setopt AUTO_CD # If a command is issued that can’t be executed as a normal command,
@@ -169,7 +170,9 @@ bindkey " " globalias
169
170
bindkey " ^ " magic-space # control-space to bypass completion
170
171
bindkey -M isearch " " magic-space # normal space during searches
171
172
172
- # Customize to your needs...
173
+ # Make it easier to customize the quickstart to your needs without
174
+ # having to maintain your own fork.
175
+
173
176
# Stuff that works on bash or zsh
174
177
if [ -r ~ /.sh_aliases ]; then
175
178
source ~ /.sh_aliases
186
189
187
190
export LOCATE_PATH=/var/db/locate.database
188
191
189
- # Load AWS credentials
192
+ # Load AWS credentials when present
190
193
if [ -f ~ /.aws/aws_variables ]; then
191
194
source ~ /.aws/aws_variables
192
195
fi
@@ -197,7 +200,7 @@ if [ -d /Library/Java/Home ];then
197
200
fi
198
201
199
202
if [[ " $( uname -s) " == " Darwin" ]]; then
200
- # Load macOS-specific aliases
203
+ # Load macOS-specific aliases - keep supporting the old name
201
204
[ -f ~ /.osx_aliases ] && source ~ /.osx_aliases
202
205
if [ -d ~ /.osx_aliases.d ]; then
203
206
for alias_file in ~ /.osx_aliases.d/*
@@ -228,6 +231,8 @@ if [ "$TERM" = "screen" -a ! "$SHOWED_SCREEN_MESSAGE" = "true" ]; then
228
231
fi
229
232
fi
230
233
234
+ # grc colorizes the output of a lot of commands. If the user installed it,
235
+ # use it.
231
236
if [ -f /usr/local/etc/grc.bashrc ]; then
232
237
source " $( brew --prefix) /etc/grc.bashrc"
233
238
0 commit comments