diff --git a/dotfiles/lib/shellrc/functions.sh b/dotfiles/lib/shellrc/functions.sh
index b4be4690..f5e0d884 100644
--- a/dotfiles/lib/shellrc/functions.sh
+++ b/dotfiles/lib/shellrc/functions.sh
@@ -168,8 +168,7 @@ function git_reset_author() {
}
function set_osx_hostname() {
- local new_hostname="$1"
- test -z new_hostname && new_hostname="IvansMac"
+ local new_hostname="${1-imalison}"
sudo scutil --set ComputerName $new_hostname
sudo scutil --set HostName $new_hostname
sudo scutil --set LocalHostName $new_hostname
diff --git a/dotfiles/lib/zsh/prompt.sh b/dotfiles/lib/zsh/prompt.sh
index e76608ac..7a242933 100644
--- a/dotfiles/lib/zsh/prompt.sh
+++ b/dotfiles/lib/zsh/prompt.sh
@@ -36,23 +36,23 @@ function git_prompt_info() {
then
echo ""
else
- echo " %{$FG[239]%}on%{$reset_color%} %{$FG[255]%}$(git branch-or-sha)%{$reset_color%}$(git_status_character)"
+ echo " $(separator "on") $(git branch-or-sha)$(git_status_character)"
fi
}
function git_status_character() {
if git dirty;
then
- echo "%{$FG[202]%}✘%{$reset_color%}"
+ print_with_color "✘" "$fg_bold[red]"
else
- echo "%{$FG[040]%}✔%{$reset_color%}"
+ print_with_color "✔" "$fg_bold[green]"
fi
}
function sandbox_prompt() {
if [ ! -z "$(sandbox_prompt_info)" ];
then
- echo " %{$FG[239]%}with $(colored_sandbox_string)%{$reset_color%}"
+ echo " $(separator "with") $(colored_sandbox_string)%{$reset_color%}"
fi
}
@@ -73,17 +73,15 @@ function prompt_custom_colors() {
}
function prompt_basic_colors() {
- export USERNAME_COLOR="$fg[blue]"
- export SEPARATOR_COLOR="$fg[black]"
- export HOSTNAME_COLOR="$fg[green]"
+ export USERNAME_COLOR="$fg_no_bold[green]"
+ export SEPARATOR_COLOR="$fg_no_bold[black]"
+ export HOSTNAME_COLOR="$fg_no_bold[blue]"
export CURRENT_DIRECTORY_COLOR="$fg[yellow]"
}
function prompt_basic_colors_with_grey_separator() {
- export USERNAME_COLOR="$fg[blue]"
+ prompt_basic_colors
export SEPARATOR_COLOR="$FG[239]"
- export HOSTNAME_COLOR="$fg[green]"
- export CURRENT_DIRECTORY_COLOR="$fg[yellow]"
}
function print_with_color() {
diff --git a/resources/com.googlecode.iterm2.plist b/resources/com.googlecode.iterm2.plist
index d1d77603..21997b49 100644
--- a/resources/com.googlecode.iterm2.plist
+++ b/resources/com.googlecode.iterm2.plist
@@ -1080,6 +1080,216 @@
0.71372549019607845
+ HighContrast
+
+ Ansi 0 Color
+
+ Blue Component
+ 0.0
+ Green Component
+ 0.0
+ Red Component
+ 0.0
+
+ Ansi 1 Color
+
+ Blue Component
+ 0.0
+ Green Component
+ 0.14479697905114011
+ Red Component
+ 0.66360294117647056
+
+ Ansi 10 Color
+
+ Blue Component
+ 0.3333333432674408
+ Green Component
+ 1
+ Red Component
+ 0.3333333432674408
+
+ Ansi 11 Color
+
+ Blue Component
+ 0.00090433453030602795
+ Green Component
+ 0.93554482995661459
+ Red Component
+ 1
+
+ Ansi 12 Color
+
+ Blue Component
+ 1
+ Green Component
+ 1
+ Red Component
+ 0.0
+
+ Ansi 13 Color
+
+ Blue Component
+ 1
+ Green Component
+ 0.3333333432674408
+ Red Component
+ 1
+
+ Ansi 14 Color
+
+ Blue Component
+ 1
+ Green Component
+ 1
+ Red Component
+ 0.3333333432674408
+
+ Ansi 15 Color
+
+ Blue Component
+ 1
+ Green Component
+ 1
+ Red Component
+ 1
+
+ Ansi 2 Color
+
+ Blue Component
+ 0.0028098621633742206
+ Green Component
+ 0.87563631221719462
+ Red Component
+ 0.0018110387789222668
+
+ Ansi 3 Color
+
+ Blue Component
+ 0.0014849494388337197
+ Green Component
+ 0.7171533063461043
+ Red Component
+ 0.71797228506787336
+
+ Ansi 4 Color
+
+ Blue Component
+ 1
+ Green Component
+ 0.40000000596046448
+ Red Component
+ 0.40000000596046448
+
+ Ansi 5 Color
+
+ Blue Component
+ 0.73333334922790527
+ Green Component
+ 0.0
+ Red Component
+ 0.73333334922790527
+
+ Ansi 6 Color
+
+ Blue Component
+ 0.73333334922790527
+ Green Component
+ 0.73333334922790527
+ Red Component
+ 0.0
+
+ Ansi 7 Color
+
+ Blue Component
+ 0.73333334922790527
+ Green Component
+ 0.73333334922790527
+ Red Component
+ 0.73333334922790527
+
+ Ansi 8 Color
+
+ Blue Component
+ 0.33333333333333331
+ Green Component
+ 0.33333333333333331
+ Red Component
+ 0.33333333333333331
+
+ Ansi 9 Color
+
+ Blue Component
+ 0.0
+ Green Component
+ 0.086573815128913489
+ Red Component
+ 1
+
+ Background Color
+
+ Blue Component
+ 0.10635251696832582
+ Green Component
+ 0.10635251696832582
+ Red Component
+ 0.10635251696832582
+
+ Bold Color
+
+ Blue Component
+ 1
+ Green Component
+ 1
+ Red Component
+ 1
+
+ Cursor Color
+
+ Blue Component
+ 0.73333334922790527
+ Green Component
+ 0.73333334922790527
+ Red Component
+ 0.73333334922790527
+
+ Cursor Text Color
+
+ Blue Component
+ 1
+ Green Component
+ 1
+ Red Component
+ 1
+
+ Foreground Color
+
+ Blue Component
+ 0.90196079015731812
+ Green Component
+ 0.90196079015731812
+ Red Component
+ 0.90196079015731812
+
+ Selected Text Color
+
+ Blue Component
+ 0.0
+ Green Component
+ 0.0
+ Red Component
+ 0.0
+
+ Selection Color
+
+ Blue Component
+ 1
+ Green Component
+ 1
+ Red Component
+ 0.40000000596046448
+
+
Homebrew
Ansi 0 Color
@@ -4525,7 +4735,7 @@
NSWindow Frame NSColorPanel
427 366 214 309 0 0 1920 1080
NSWindow Frame Preferences
- 86 531 924 485 0 0 1920 1058
+ 432 463 924 485 0 0 1920 1080
NSWindow Frame SUStatusFrame
768 697 384 129 0 0 1920 1058
NSWindow Frame iTerm Window 0
@@ -4544,146 +4754,146 @@
Ansi 0 Color
Blue Component
- 0.45882353186607361
+ 0.0
Green Component
- 0.45882353186607361
+ 0.0
Red Component
- 0.45882353186607361
+ 0.0
Ansi 1 Color
Blue Component
- 0.30196079611778259
+ 0.0
Green Component
- 0.364705890417099
+ 0.14479698240756989
Red Component
- 0.50980395078659058
+ 0.66360294818878174
Ansi 10 Color
Blue Component
- 0.66666668653488159
+ 0.3333333432674408
Green Component
- 0.85098040103912354
+ 1
Red Component
- 0.59607845544815063
+ 0.3333333432674408
Ansi 11 Color
Blue Component
- 0.61568629741668701
+ 0.00090433453442528844
Green Component
- 0.90588235855102539
+ 0.93554484844207764
Red Component
- 0.98039215803146362
+ 1
Ansi 12 Color
Blue Component
- 0.81176471710205078
+ 1
Green Component
- 0.76470589637756348
+ 1
Red Component
- 0.47843137383460999
+ 0.0
Ansi 13 Color
Blue Component
- 0.63137257099151611
+ 1
Green Component
- 0.69803923368453979
+ 0.3333333432674408
Red Component
- 0.83921569585800171
+ 1
Ansi 14 Color
Blue Component
- 0.87843137979507446
+ 1
Green Component
- 0.87843137979507446
+ 1
Red Component
- 0.67843139171600342
+ 0.3333333432674408
Ansi 15 Color
Blue Component
- 0.87843137979507446
+ 1
Green Component
- 0.87843137979507446
+ 1
Red Component
- 0.87843137979507446
+ 1
Ansi 2 Color
Blue Component
- 0.38431373238563538
+ 0.0028098621405661106
Green Component
- 0.54901963472366333
+ 0.87563633918762207
Red Component
- 0.44705882668495178
+ 0.001811038819141686
Ansi 3 Color
Blue Component
- 0.42745098471641541
+ 0.0014849494909867644
Green Component
- 0.63137257099151611
+ 0.71715331077575684
Red Component
- 0.67843139171600342
+ 0.7179722785949707
Ansi 4 Color
Blue Component
- 0.50980395078659058
+ 1
Green Component
- 0.48235294222831726
+ 0.40000000596046448
Red Component
- 0.30196079611778259
+ 0.40000000596046448
Ansi 5 Color
Blue Component
- 0.40392157435417175
+ 0.73333334922790527
Green Component
- 0.44705882668495178
+ 0.0
Red Component
- 0.54117649793624878
+ 0.73333334922790527
Ansi 6 Color
Blue Component
- 0.58039218187332153
+ 0.73333334922790527
Green Component
- 0.58039218187332153
+ 0.73333334922790527
Red Component
- 0.44705882668495178
+ 0.0
Ansi 7 Color
Blue Component
- 0.87843137979507446
+ 0.73333334922790527
Green Component
- 0.87843137979507446
+ 0.73333334922790527
Red Component
- 0.87843137979507446
+ 0.73333334922790527
Ansi 8 Color
Blue Component
- 0.54117649793624878
+ 0.3333333432674408
Green Component
- 0.54117649793624878
+ 0.3333333432674408
Red Component
- 0.54117649793624878
+ 0.3333333432674408
Ansi 9 Color
Blue Component
- 0.47843137383460999
+ 0.0
Green Component
- 0.57647061347961426
+ 0.08657381683588028
Red Component
- 0.81176471710205078
+ 1
Automatically Log
@@ -4692,11 +4902,11 @@
Background Color
Blue Component
- 0.20784313976764679
+ 0.10635251551866531
Green Component
- 0.20392157137393951
+ 0.10635251551866531
Red Component
- 0.14117647707462311
+ 0.10635251551866531
Background Image Is Tiled
@@ -4715,11 +4925,11 @@
Bold Color
Blue Component
- 0.56470590829849243
+ 1
Green Component
- 0.53333336114883423
+ 1
Red Component
- 0.39215686917304993
+ 1
Character Encoding
4
@@ -4732,20 +4942,20 @@
Cursor Color
Blue Component
- 0.47843137383460999
+ 0.73333334922790527
Green Component
- 0.39215686917304993
+ 0.73333334922790527
Red Component
- 0.34117648005485535
+ 0.73333334922790527
Cursor Text Color
Blue Component
- 0.19607843458652496
+ 1
Green Component
- 0.19607843458652496
+ 1
Red Component
- 0.19607843458652496
+ 1
Cursor Type
2
@@ -4766,11 +4976,11 @@
Foreground Color
Blue Component
- 0.83137255907058716
+ 0.90196079015731812
Green Component
- 0.90588235855102539
+ 0.90196079015731812
Red Component
- 0.83137255907058716
+ 0.90196079015731812
Guid
3314520D-1E49-4605-AFCE-EA48A596636F
@@ -5112,11 +5322,11 @@
Selected Text Color
Blue Component
- 0.074509806931018829
+ 0.0
Green Component
- 0.54509806632995605
+ 0.0
Red Component
- 0.61960786581039429
+ 0.0
Selection Color
@@ -5125,7 +5335,7 @@
Green Component
1
Red Component
- 1
+ 0.40000000596046448
Semantic History
@@ -5333,7 +5543,7 @@
SUHasLaunchedBefore
SULastCheckTime
- 2014-04-24T04:59:50Z
+ 2014-04-26T05:29:45Z
SavePasteHistory
Show Toolbelt
diff --git a/resources/osx.sh b/resources/osx.sh
index 2c5d6a8f..41b89bbf 100755
--- a/resources/osx.sh
+++ b/resources/osx.sh
@@ -114,10 +114,6 @@ defaults write NSGlobalDomain NSAutomaticSpellingCorrectionEnabled -bool false
# Screen #
###############################################################################
-# Require password immediately after sleep or screen saver begins
-defaults write com.apple.screensaver askForPassword -int 1
-defaults write com.apple.screensaver askForPasswordDelay -int 0
-
# Save screenshots to the desktop
defaults write com.apple.screencapture location -string "$HOME/Desktop"