diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d index 281d63b5..2af616fb 160000 --- a/dotfiles/emacs.d +++ b/dotfiles/emacs.d @@ -1 +1 @@ -Subproject commit 281d63b51cfb26dbd816318b01f10bb81ed87cf1 +Subproject commit 2af616fbaa5d6239da10684ad76b8867164edfe5 diff --git a/dotfiles/lib/zsh/prompt.sh b/dotfiles/lib/zsh/prompt.sh index 01107a95..65efb263 100644 --- a/dotfiles/lib/zsh/prompt.sh +++ b/dotfiles/lib/zsh/prompt.sh @@ -93,7 +93,7 @@ function separator() { } prompt_basic_colors_with_grey_separator -PROMPT='╭─% $(print_with_color "%n" "$USERNAME_COLOR") $(separator "at") $(print_with_color "`hostname -s`" "$HOSTNAME_COLOR") $(separator "in") $(print_with_color "`current_directory`" "$terminfo[bold]$CURRENT_DIRECTORY_COLOR")$(git_prompt_info)$(sandbox_prompt) +PROMPT='╭─% $(print_with_color "%n" "$USERNAME_COLOR") $(separator "at") $(print_with_color "`hostname -s`" "$HOSTNAME_COLOR") $(separator "in") $(print_with_color "`current_directory`" "$CURRENT_DIRECTORY_COLOR")$(git_prompt_info)$(sandbox_prompt) ╰─$(command_line_character) ' PS2='(%_) ' diff --git a/resources/com.googlecode.iterm2.plist b/resources/com.googlecode.iterm2.plist index 8b1b9e88..970ce9d3 100644 --- a/resources/com.googlecode.iterm2.plist +++ b/resources/com.googlecode.iterm2.plist @@ -2130,6 +2130,216 @@ 0.70980000495910645 + Monokai (2) + + Ansi 0 Color + + Blue Component + 0.11764705926179886 + Green Component + 0.11372549086809158 + Red Component + 0.10588235408067703 + + Ansi 1 Color + + Blue Component + 0.44705882668495178 + Green Component + 0.14901961386203766 + Red Component + 0.97647058963775635 + + Ansi 10 Color + + Blue Component + 0.18039216101169586 + Green Component + 0.88627451658248901 + Red Component + 0.65098041296005249 + + Ansi 11 Color + + Blue Component + 0.45490196347236633 + Green Component + 0.85882353782653809 + Red Component + 0.90196079015731812 + + Ansi 12 Color + + Blue Component + 0.78039216995239258 + Green Component + 0.46274510025978088 + Red Component + 0.12941177189350128 + + Ansi 13 Color + + Blue Component + 1 + Green Component + 0.5058823823928833 + Red Component + 0.68235296010971069 + + Ansi 14 Color + + Blue Component + 0.93725490570068359 + Green Component + 0.85098040103912354 + Red Component + 0.40000000596046448 + + Ansi 15 Color + + Blue Component + 1 + Green Component + 1 + Red Component + 1 + + Ansi 2 Color + + Blue Component + 0.18039216101169586 + Green Component + 0.88627451658248901 + Red Component + 0.65098041296005249 + + Ansi 3 Color + + Blue Component + 0.45490196347236633 + Green Component + 0.85882353782653809 + Red Component + 0.90196079015731812 + + Ansi 4 Color + + Blue Component + 0.78231418132781982 + Green Component + 0.46265947818756104 + Red Component + 0.12754884362220764 + + Ansi 5 Color + + Blue Component + 1 + Green Component + 0.5058823823928833 + Red Component + 0.68235296010971069 + + Ansi 6 Color + + Blue Component + 0.93725490570068359 + Green Component + 0.85098040103912354 + Red Component + 0.40000000596046448 + + Ansi 7 Color + + Blue Component + 0.94901961088180542 + Green Component + 0.97254902124404907 + Red Component + 0.97254902124404907 + + Ansi 8 Color + + Blue Component + 0.11764705926179886 + Green Component + 0.11372549086809158 + Red Component + 0.10588235408067703 + + Ansi 9 Color + + Blue Component + 0.44705882668495178 + Green Component + 0.14901961386203766 + Red Component + 0.97647058963775635 + + Background Color + + Blue Component + 0.070588238537311554 + Green Component + 0.070588238537311554 + Red Component + 0.070588238537311554 + + Bold Color + + Blue Component + 0.93319034576416016 + Green Component + 0.96691048145294189 + Red Component + 0.96580147743225098 + + Cursor Color + + Blue Component + 0.94117647409439087 + Green Component + 0.97254902124404907 + Red Component + 0.97254902124404907 + + Cursor Text Color + + Blue Component + 0.13333334028720856 + Green Component + 0.13333334028720856 + Red Component + 0.13333334028720856 + + Foreground Color + + Blue Component + 0.94901961088180542 + Green Component + 0.97254902124404907 + Red Component + 0.97254902124404907 + + Selected Text Color + + Blue Component + 0.93319034576416016 + Green Component + 0.96691048145294189 + Red Component + 0.96580147743225098 + + Selection Color + + Blue Component + 0.26666668057441711 + Green Component + 0.26666668057441711 + Red Component + 0.26666668057441711 + + Novel Ansi 0 Color @@ -4706,13 +4916,30 @@ MaxVertically NSNavLastRootDirectory - ~/dotfiles/resources + ~/Desktop NSQuotedKeystrokeBinding NSRepeatCountBinding NSScrollAnimationEnabled + NSTableView Columns KeyBingingTable + + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF + hAErATCG + + 198 + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF + hAErATGG + + 302 + + NSTableView Hidden Columns KeyBingingTable + + NSTableView Sort Ordering KeyBingingTable + NSToolbar Configuration Terminal Toolbar TB Display Mode @@ -4726,8 +4953,12 @@ NSWindow Frame Preferences 231 291 924 485 0 0 1440 900 + NSWindow Frame SUStatusFrame + 528 562 384 129 0 0 1440 878 + NSWindow Frame UKCrashReporter + 99 294 592 584 0 0 1440 878 NSWindow Frame iTerm Window 0 - 162 131 570 401 0 0 1440 878 + 205 436 570 401 0 0 1440 877 New Bookmarks @@ -4740,146 +4971,146 @@ Ansi 0 Color Blue Component - 0.0 + 0.19370138645172119 Green Component - 0.0 + 0.15575926005840302 Red Component 0.0 Ansi 1 Color Blue Component - 0.3333333432674408 + 0.14145714044570923 Green Component - 0.3333333432674408 + 0.10840655118227005 Red Component - 1 + 0.81926977634429932 Ansi 10 Color Blue Component - 0.3333333432674408 + 0.38298487663269043 Green Component - 1 + 0.35665956139564514 Red Component - 0.3333333432674408 + 0.27671992778778076 Ansi 11 Color Blue Component - 0.3333333432674408 + 0.43850564956665039 Green Component - 1 + 0.40717673301696777 Red Component - 1 + 0.32436618208885193 Ansi 12 Color Blue Component - 1 + 0.51685798168182373 Green Component - 0.3333333432674408 + 0.50962930917739868 Red Component - 0.3333333432674408 + 0.44058024883270264 Ansi 13 Color Blue Component - 1 + 0.72908437252044678 Green Component - 0.3333333432674408 + 0.33896297216415405 Red Component - 1 + 0.34798634052276611 Ansi 14 Color Blue Component - 1 + 0.56363654136657715 Green Component - 1 + 0.56485837697982788 Red Component - 0.3333333432674408 + 0.50599193572998047 Ansi 15 Color Blue Component - 1 + 0.86405980587005615 Green Component - 1 + 0.95794391632080078 Red Component - 1 + 0.98943418264389038 Ansi 2 Color Blue Component - 0.3333333432674408 + 0.020208755508065224 Green Component - 1 + 0.54115492105484009 Red Component - 0.3333333432674408 + 0.44977453351020813 Ansi 3 Color Blue Component - 0.3333333432674408 + 0.023484811186790466 Green Component - 1 + 0.46751424670219421 Red Component - 1 + 0.64746475219726562 Ansi 4 Color Blue Component - 1 + 0.78231418132781982 Green Component - 0.3333333432674408 + 0.46265947818756104 Red Component - 0.3333333432674408 + 0.12754884362220764 Ansi 5 Color Blue Component - 1 + 0.43516635894775391 Green Component - 0.3333333432674408 + 0.10802463442087173 Red Component - 1 + 0.77738940715789795 Ansi 6 Color Blue Component - 1 + 0.52502274513244629 Green Component - 1 + 0.57082360982894897 Red Component - 0.3333333432674408 + 0.14679534733295441 Ansi 7 Color Blue Component - 0.73333334922790527 + 0.79781103134155273 Green Component - 0.73333334922790527 + 0.89001238346099854 Red Component - 0.73333334922790527 + 0.91611063480377197 Ansi 8 Color Blue Component - 0.3333333432674408 + 0.15170273184776306 Green Component - 0.3333333432674408 + 0.11783610284328461 Red Component - 0.3333333432674408 + 0.0 Ansi 9 Color Blue Component - 0.3333333432674408 + 0.073530435562133789 Green Component - 0.3333333432674408 + 0.21325300633907318 Red Component - 1 + 0.74176257848739624 Automatically Log @@ -4888,9 +5119,9 @@ Background Color Blue Component - 0.0 + 0.15170273184776306 Green Component - 0.0 + 0.11783610284328461 Red Component 0.0 @@ -4911,11 +5142,11 @@ Bold Color Blue Component - 0.49019607901573181 + 0.56363654136657715 Green Component - 0.36862745881080627 + 0.56485837697982788 Red Component - 1 + 0.50599193572998047 Character Encoding 4 @@ -4928,20 +5159,20 @@ Cursor Color Blue Component - 0.73333334922790527 + 0.51685798168182373 Green Component - 0.73333334922790527 + 0.50962930917739868 Red Component - 0.73333334922790527 + 0.44058024883270264 Cursor Text Color Blue Component - 1 + 0.19370138645172119 Green Component - 1 + 0.15575926005840302 Red Component - 1 + 0.0 Cursor Type 2 @@ -4962,11 +5193,11 @@ Foreground Color Blue Component - 1 + 0.51685798168182373 Green Component - 1 + 0.50962930917739868 Red Component - 1 + 0.44058024883270264 Guid 3314520D-1E49-4605-AFCE-EA48A596636F @@ -5308,20 +5539,20 @@ Selected Text Color Blue Component - 0.0 + 0.56363654136657715 Green Component - 0.0 + 0.56485837697982788 Red Component - 0.0 + 0.50599193572998047 Selection Color Blue Component - 1 + 0.19370138645172119 Green Component - 0.83529412746429443 + 0.15575926005840302 Red Component - 0.70980393886566162 + 0.0 Semantic History @@ -5527,7 +5758,7 @@ SUHasLaunchedBefore SULastCheckTime - 2014-05-02T01:14:24Z + 2014-10-23T02:09:31Z SavePasteHistory Show Toolbelt @@ -5556,6 +5787,8 @@ TripleClickSelectsFullWrappedLines + UKCrashReporterLastCrashReportDate + 1404793472 URLHandlersByGuid UseBorder @@ -5579,6 +5812,6 @@ findRegex_iTerm iTerm Version - 1.0.0.20130622 + 1.0.0.20140629