From e977349bd99186b6c0fc04541b3f6777c13331bd Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Thu, 13 Nov 2014 20:40:06 -0800 Subject: [PATCH] Fix prompt recursive search, ignore some pyrc things --- dotfiles/lib/zsh/prompt.sh | 3 +- dotfiles/pylintrc | 2 +- resources/com.googlecode.iterm2.plist | 176 ++++++++++---------------- tasks/osx.py | 12 ++ 4 files changed, 84 insertions(+), 109 deletions(-) diff --git a/dotfiles/lib/zsh/prompt.sh b/dotfiles/lib/zsh/prompt.sh index 27bf1bb1..76296614 100644 --- a/dotfiles/lib/zsh/prompt.sh +++ b/dotfiles/lib/zsh/prompt.sh @@ -116,7 +116,8 @@ function separator { } prompt_basic_colors_with_grey_separator +# For reasons which are currently beyond me, 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) -$(command_line_character) %(?.$PROMPT_CHAR_SUCCESS.$PROMPT_CHAR_ERROR)❯%f ' +%(?.$(print_with_color "$(command_line_character) ❯" $PROMPT_CHAR_SUCCESS).$(print_with_color "$(command_line_character) ❯" $PROMPT_CHAR_ERROR)) ' PS2='(%_) ' diff --git a/dotfiles/pylintrc b/dotfiles/pylintrc index 2b627e86..31ab9f5c 100644 --- a/dotfiles/pylintrc +++ b/dotfiles/pylintrc @@ -44,7 +44,7 @@ symbols=no # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=C0111,C0103,R0903,R0904 +disable=C0111,C0103,R0902,R0903,R0904,W0142,W0613,W0123 [REPORTS] diff --git a/resources/com.googlecode.iterm2.plist b/resources/com.googlecode.iterm2.plist index 17cf9b7d..bbe9257b 100644 --- a/resources/com.googlecode.iterm2.plist +++ b/resources/com.googlecode.iterm2.plist @@ -5217,50 +5217,16 @@ MaxVertically - NSColorPanelMode - 7 - NSFontPanelAttributes - 1, 0 - NSNavLastRootDirectory - ~ NSQuotedKeystrokeBinding NSRepeatCountBinding NSScrollAnimationEnabled - NSTableView Columns KeyBingingTable - - - BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF - hAErATCG - - 198 - - BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF - hAErATGG - - 302 - - NSTableView Hidden Columns KeyBingingTable - - NSTableView Sort Ordering KeyBingingTable - - NSToolbar Configuration com.apple.NSColorPanel - - TB Is Shown - 1 - - NSWindow Frame NSColorPanel - 427 356 222 309 0 0 1920 1057 NSWindow Frame Preferences - 807 244 924 485 0 0 2560 1440 - NSWindow Frame SUStatusFrame - 768 697 384 129 0 0 1920 1058 + 269 110 924 485 0 0 2560 1417 NSWindow Frame iTerm Window 0 - 4 0 1278 1417 0 0 2560 1417 - NSWindow Frame iTerm Window 1 - 936 786 585 451 0 0 2560 1440 + 430 809 505 376 0 0 2560 1417 New Bookmarks @@ -5273,146 +5239,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.0 + 0.14145714044570923 Green Component - 0.0 + 0.10840655118227005 Red Component - 0.80000001192092896 + 0.81926977634429932 Ansi 10 Color Blue Component - 0.2039216011762619 + 0.38298487663269043 Green Component - 0.88627451658248901 + 0.35665956139564514 Red Component - 0.54117649793624878 + 0.27671992778778076 Ansi 11 Color Blue Component - 0.30980390310287476 + 0.43850564956665039 Green Component - 0.91372549533843994 + 0.40717673301696777 Red Component - 0.98823529481887817 + 0.32436618208885193 Ansi 12 Color Blue Component - 0.81176471710205078 + 0.51685798168182373 Green Component - 0.62352937459945679 + 0.50962930917739868 Red Component - 0.44705879688262939 + 0.44058024883270264 Ansi 13 Color Blue Component - 0.65882349014282227 + 0.72908437252044678 Green Component - 0.49803918600082397 + 0.33896297216415405 Red Component - 0.67843139171600342 + 0.34798634052276611 Ansi 14 Color Blue Component - 0.88627451658248901 + 0.56363654136657715 Green Component - 0.88627451658248901 + 0.56485837697982788 Red Component - 0.2039216011762619 + 0.50599193572998047 Ansi 15 Color Blue Component - 0.92549020051956177 + 0.86405980587005615 Green Component - 0.93333327770233154 + 0.95794391632080078 Red Component - 0.93333327770233154 + 0.98943418264389038 Ansi 2 Color Blue Component - 0.023529410362243652 + 0.020208755508065224 Green Component - 0.60392159223556519 + 0.54115492105484009 Red Component - 0.30588239431381226 + 0.44977453351020813 Ansi 3 Color Blue Component - 0.0 + 0.023484811186790466 Green Component - 0.62745100259780884 + 0.46751424670219421 Red Component - 0.76862752437591553 + 0.64746475219726562 Ansi 4 Color Blue Component - 0.64313727617263794 + 0.78231418132781982 Green Component - 0.39607840776443481 + 0.46265947818756104 Red Component - 0.2039216011762619 + 0.12754884362220764 Ansi 5 Color Blue Component - 0.48235291242599487 + 0.43516635894775391 Green Component - 0.31372550129890442 + 0.10802463442087173 Red Component - 0.45882350206375122 + 0.77738940715789795 Ansi 6 Color Blue Component - 0.60392159223556519 + 0.52502274513244629 Green Component - 0.59607851505279541 + 0.57082360982894897 Red Component - 0.023529410362243652 + 0.14679534733295441 Ansi 7 Color Blue Component - 0.81176471710205078 + 0.79781103134155273 Green Component - 0.84313732385635376 + 0.89001238346099854 Red Component - 0.82745099067687988 + 0.91611063480377197 Ansi 8 Color Blue Component - 0.32549020648002625 + 0.15170273184776306 Green Component - 0.34117650985717773 + 0.11783610284328461 Red Component - 0.33333331346511841 + 0.0 Ansi 9 Color Blue Component - 0.16078430414199829 + 0.073530435562133789 Green Component - 0.16078430414199829 + 0.21325300633907318 Red Component - 0.93725490570068359 + 0.74176257848739624 Automatically Log @@ -5421,9 +5387,9 @@ Background Color Blue Component - 0.0 + 0.15170273184776306 Green Component - 0.0 + 0.11783610284328461 Red Component 0.0 @@ -5444,11 +5410,11 @@ Bold Color Blue Component - 1 + 0.56363654136657715 Green Component - 1 + 0.56485837697982788 Red Component - 1 + 0.50599193572998047 Character Encoding 4 @@ -5461,18 +5427,18 @@ Cursor Color Blue Component - 1 + 0.51685798168182373 Green Component - 1 + 0.50962930917739868 Red Component - 1 + 0.44058024883270264 Cursor Text Color Blue Component - 0.0 + 0.19370138645172119 Green Component - 0.0 + 0.15575926005840302 Red Component 0.0 @@ -5495,11 +5461,11 @@ Foreground Color Blue Component - 1 + 0.51685798168182373 Green Component - 1 + 0.50962930917739868 Red Component - 1 + 0.44058024883270264 Guid 3314520D-1E49-4605-AFCE-EA48A596636F @@ -5841,20 +5807,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.8353000283241272 + 0.15575926005840302 Red Component - 0.70980000495910645 + 0.0 Semantic History @@ -6728,8 +6694,6 @@ /Users/imalison - NoSyncNeverRemindPrefsChangesLost - OnlyWhenMoreTabs OpenArrangementAtStartup @@ -6791,10 +6755,8 @@ SUFeedURL http://iterm2.com/appcasts/testing.xml - SUHasLaunchedBefore - SULastCheckTime - 2014-11-12T00:16:53Z + 2014-11-13T02:29:58Z SavePasteHistory Show Toolbelt diff --git a/tasks/osx.py b/tasks/osx.py index 763af1b5..f29cc7cb 100644 --- a/tasks/osx.py +++ b/tasks/osx.py @@ -121,3 +121,15 @@ def install_powerline_monaco(ctx): def cl_tools(ctx): if not util.command_exists('gcc'): ctx.run('xcode-select --install') + + +@ctask +def iTerm(ctx): + library_plist = os.path.join(os.path.expanduser("~"), "Library", + "Preferences", "com.googlecode.iterm2.plist") + ctx.run("defaults write {0} LoadPrefsFromCustomFolder -bool true".format( + library_plist + )) + ctx.run("defaults write {0} PrefsCustomFolder -string {1}".format( + library_plist, util.RESOURCES_DIRECTORY + ))