diff --git a/.gitconfig b/.gitconfig index bf766a2..27e49ad 100644 --- a/.gitconfig +++ b/.gitconfig @@ -11,3 +11,10 @@ email = johnzhihaoshen@gmail.com [mergetool "sourcetree"] cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" trustExitCode = true +[filter "lfs"] + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f +[rerere] + enabled = true diff --git a/com.googlecode.iterm2.plist b/com.googlecode.iterm2.plist index d5e2463..8dd7621 100644 --- a/com.googlecode.iterm2.plist +++ b/com.googlecode.iterm2.plist @@ -10,14 +10,6 @@ AnimateDimming - AppleAntiAliasingThreshold - 1 - AppleScrollAnimationEnabled - 0 - AppleSmoothFixedFontsSizeThreshold - 1 - AppleWindowTabbingMode - manual AutoHideTmuxClientSession CheckTestRelease @@ -84,65 +76,8 @@ 7 LeftOption 2 - LoadPrefsFromCustomFolder - MaxVertically - NSNavLastRootDirectory - ~ - NSNavPanelExpandedSizeForOpenMode - {712, 448} - NSQuotedKeystrokeBinding - - NSRepeatCountBinding - - NSScrollAnimationEnabled - - NSScrollViewShouldScrollUnderTitlebar - - NSSplitView Subview Frames NSColorPanelSplitView - - 0.000000, 0.000000, 224.000000, 258.000000, NO, NO - 0.000000, 259.000000, 224.000000, 48.000000, NO, NO - - NSTableView Columns v2 KeyBingingTable - - YnBsaXN0MDDUAQIDBAUGNjdYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoK4HCA8aGxwdHh8gJjAxMlUkbnVsbNIJCgsOWk5TLm9iamVjdHNWJGNsYXNzogwN - gAKACoAN0xAJChEVGVdOUy5rZXlzoxITFIADgASABaMWFxiABoAHgAiACVpJZGVudGlm - aWVyVVdpZHRoVkhpZGRlblEwI0BowAAAAAAACNIhIiMkWiRjbGFzc25hbWVYJGNsYXNz - ZXNcTlNEaWN0aW9uYXJ5oiMlWE5TT2JqZWN00xAJCicrGaMSExSAA4AEgAWjLC0YgAuA - DIAIgAlRMSNAc7Gdsi0OVtIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP - TlNLZXllZEFyY2hpdmVy0Tg5VUFycmF5gAEACAARABoAIwAtADIANwBGAEwAUQBcAGMA - ZgBoAGoAbABzAHsAfwCBAIMAhQCJAIsAjQCPAJEAnACiAKkAqwC0ALUAugDFAM4A2wDe - AOcA7gDyAPQA9gD4APwA/gEAAQIBBAEGAQ8BFAEjAScBLwFBAUQBSgAAAAAAAAIBAAAA - AAAAADoAAAAAAAAAAAAAAAAAAAFM - - NSTableView Sort Ordering v2 KeyBingingTable - - YnBsaXN0MDDUAQIDBAUGFBVYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoKMHCA1VJG51bGzSCQoLDFpOUy5vYmplY3RzViRjbGFzc6CAAtIODxARWiRjbGFz - c25hbWVYJGNsYXNzZXNeTlNNdXRhYmxlQXJyYXmjEBITV05TQXJyYXlYTlNPYmplY3Rf - EA9OU0tleWVkQXJjaGl2ZXLRFhdVQXJyYXmAAQgRGiMtMjc7QUZRWFlbYGt0g4ePmKqt - swAAAAAAAAEBAAAAAAAAABgAAAAAAAAAAAAAAAAAAAC1 - - NSTableView Supports v2 KeyBingingTable - - NSToolbar Configuration com.apple.NSColorPanel - - TB Is Shown - 1 - - NSWindow Frame NSFontPanel - 1168 33 445 77 0 0 1680 1027 - NSWindow Frame SUAutomaticUpdateAlert - 972 932 616 174 0 0 2560 1417 - NSWindow Frame SUUpdateAlert - 530 476 620 392 0 0 1680 1027 - NSWindow Frame SharedPreferences - 288 264 918 514 0 0 1680 1027 - NSWindow Frame iTerm Window 0 - 0 0 1680 1027 0 0 1680 1027 New Bookmarks @@ -152,147 +87,135 @@ Ansi 0 Color - Blue Component - 0.0 - Green Component - 0.0 - Red Component - 0.0 + isTerminal + + name + id + nonterminalContext + 0 - Ansi 1 Color - Blue Component - 0.0 - Green Component - 0.0 - Red Component - 0.73333334922790527 + isTerminal + + name + + nonterminalContext + 0 - Ansi 10 Color + + 1 + - Blue Component - 0.3333333432674408 - Green Component - 1 - Red Component - 0.3333333432674408 + isTerminal + + name + presentationName + nonterminalContext + 0 - Ansi 11 Color - Blue Component - 0.3333333432674408 - Green Component - 1 - Red Component - 1 + isTerminal + + name + tmuxRole + nonterminalContext + 0 - Ansi 12 Color - Blue Component - 1 - Green Component - 0.3333333432674408 - Red Component - 0.3333333432674408 + isTerminal + + name + lastCommand + nonterminalContext + 0 - Ansi 13 Color - Blue Component - 1 - Green Component - 0.3333333432674408 - Red Component - 1 + isTerminal + + name + profileName + nonterminalContext + 0 - Ansi 14 Color - Blue Component - 1 - Green Component - 1 - Red Component - 0.3333333432674408 + isTerminal + + name + termid + nonterminalContext + 0 - Ansi 15 Color - Blue Component - 1 - Green Component - 1 - Red Component - 1 + isTerminal + + name + tmuxWindowTitle + nonterminalContext + 0 - Ansi 2 Color - Blue Component - 0.0 - Green Component - 0.73333334922790527 - Red Component - 0.0 + isTerminal + + name + id + nonterminalContext + 0 - Ansi 3 Color - Blue Component - 0.0 - Green Component - 0.73333334922790527 - Red Component - 0.73333334922790527 + isTerminal + + name + jobName + nonterminalContext + 0 - Ansi 4 Color - Blue Component - 0.73333334922790527 - Green Component - 0.0 - Red Component - 0.0 + isTerminal + + name + columns + nonterminalContext + 0 - Ansi 5 Color - Blue Component - 0.73333334922790527 - Green Component - 0.0 - Red Component - 0.73333334922790527 + isTerminal + + name + tab.tmuxWindowTitle + nonterminalContext + 0 - Ansi 6 Color - Blue Component - 0.73333334922790527 - Green Component - 0.73333334922790527 - Red Component - 0.0 + isTerminal + + name + hostname + nonterminalContext + 0 - Ansi 7 Color - Blue Component - 0.73333334922790527 - Green Component - 0.73333334922790527 - Red Component - 0.73333334922790527 + isTerminal + + name + tmuxClientName + nonterminalContext + 0 - Ansi 8 Color - Blue Component - 0.3333333432674408 - Green Component - 0.3333333432674408 - Red Component - 0.3333333432674408 + isTerminal + + name + path + nonterminalContext + 0 - Ansi 9 Color - Blue Component - 0.3333333432674408 - Green Component - 0.3333333432674408 - Red Component - 1 + isTerminal + + name + tmuxWindowTitleEval + nonterminalContext + 0 BM Growl @@ -821,242 +744,6 @@ Scrollback Lines 10000 Selected Text Color - - Blue Component - 0.0 - Green Component - 0.0 - Red Component - 0.0 - - Selection Color - - Blue Component - 1 - Green Component - 0.8353000283241272 - Red Component - 0.70980000495910645 - - Send Code When Idle - - Shortcut - - Silence Bell - - Sync Title - - Tags - - Terminal Type - xterm-256color - Transparency - 0.0 - Unlimited Scrollback - - Use Bold Font - - Use Bright Bold - - Use Italic Font - - Vertical Spacing - 1 - Visual Bell - - Window Type - 0 - Working Directory - /Users/johnshen/src - - - NoSyncAllAppVersions - - 3.3.3beta1 - 3.3.7beta3 - 3.3.7beta2 - 3.3.0beta13 - 3.3.2beta2 - 3.3.0beta10 - 3.3.0beta15 - 3.3.5beta1 - 3.3.3beta2 - 3.3.7beta1 - - NoSyncCommandHistoryHasEverBeenUsed - - NoSyncDoNotWarnBeforePastingOneLineEndingInNewlineAtShellPrompt - - NoSyncDoNotWarnBeforePastingOneLineEndingInNewlineAtShellPrompt_selection - 1 - NoSyncFrame_SharedPreferences - - screenFrame - {{0, 0}, {1680, 1050}} - topLeft - {518, 823} - - NoSyncHaveRequestedFullDiskAccess - - NoSyncHaveUsedCopyMode - - NoSyncHaveWarnedAboutPasteConfirmationChange - - NoSyncInstallationId - 51F653EE-B26E-47D5-ADE7-75D1B96F7EC4 - NoSyncLastTipTime - 563229213.39518905 - NoSyncLaunchExperienceControllerRunCount - 50 - NoSyncNextAnnoyanceTime - 576522244.46139598 - NoSyncOnboardingWindowHasBeenShown - - NoSyncPermissionToShowTip - - NoSyncRecordedVariables - - 0 - - - isTerminal - - name - id - nonterminalContext - 0 - - - isTerminal - - name - - nonterminalContext - 0 - - - 1 - - - isTerminal - - name - presentationName - nonterminalContext - 0 - - - isTerminal - - name - tmuxRole - nonterminalContext - 0 - - - isTerminal - - name - lastCommand - nonterminalContext - 0 - - - isTerminal - - name - profileName - nonterminalContext - 0 - - - isTerminal - - name - termid - nonterminalContext - 0 - - - isTerminal - - name - tmuxWindowTitle - nonterminalContext - 0 - - - isTerminal - - name - id - nonterminalContext - 0 - - - isTerminal - - name - jobName - nonterminalContext - 0 - - - isTerminal - - name - columns - nonterminalContext - 0 - - - isTerminal - - name - tab.tmuxWindowTitle - nonterminalContext - 0 - - - isTerminal - - name - hostname - nonterminalContext - 0 - - - isTerminal - - name - tmuxClientName - nonterminalContext - 0 - - - isTerminal - - name - path - nonterminalContext - 0 - - - isTerminal - - name - tmuxWindowTitleEval - nonterminalContext - 0 - - - isTerminal - - name - triggerName - nonterminalContext - 0 - isTerminal @@ -1638,62 +1325,6 @@ PaypalForm 5000ms timeout - NoSyncTimeOfFirstLaunchOfVersionWithTip - 555713230.55413604 - NoSyncTipsDisabled - - NoSyncTipsToNotShow - - 000 - 0000 - 0001 - 0002 - 0003 - 0004 - 0005 - 0006 - 0007 - 0008 - 0009 - 0010 - 0011 - 0012 - 0013 - 0014 - 0015 - 0016 - 0017 - 0018 - 0019 - 0020 - 0021 - 0022 - 0023 - 0024 - 0025 - 0026 - 0027 - 0028 - 0029 - 0030 - 0031 - 0032 - 0033 - 0034 - 0035 - 0036 - 0037 - 0038 - 0039 - 0040 - 0041 - 0042 - 0043 - 0044 - 0045 - - NoSyncTurnOffBracketedPasteOnHostChange - OnlyWhenMoreTabs OpenArrangementAtStartup @@ -1739,8 +1370,6 @@ kNextWindowPointerAction - PrefsCustomFolder - /Users/johnshen PromptOnQuit QuitWhenAllWindowsClosed @@ -1749,22 +1378,6 @@ 8 RightOption 3 - SUAutomaticallyUpdate - - SUEnableAutomaticChecks - - SUFeedAlternateAppNameKey - iTerm - SUFeedURL - https://iterm2.com/appcasts/testing_new.xml?shard=64 - SUHasLaunchedBefore - - SULastCheckTime - 2020-01-28T21:42:47Z - SUSendProfileInfo - - SUUpdateRelaunchingMarker - SavePasteHistory ShowBookmarkName @@ -1821,7 +1434,5 @@ 0 findRegex_iTerm - iTerm Version - 3.3.7beta3