From 47617f212dd918fbba986369e8c5cd01c342be46 Mon Sep 17 00:00:00 2001 From: John Shen Date: Fri, 14 Feb 2020 13:29:19 -0800 Subject: [PATCH 1/3] whoops, need to configure gitignore --- .gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitconfig b/.gitconfig index 0911177..bf766a2 100644 --- a/.gitconfig +++ b/.gitconfig @@ -4,7 +4,7 @@ name = John Shen email = johnzhihaoshen@gmail.com [core] - excludesfile = /Users/johnshen/.gitignore_global + excludesfile = /Users/johnshen/.gitignore [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" path = From c3c1c28e6c6fc359c20e81918ff13d2194504db2 Mon Sep 17 00:00:00 2001 From: John Shen Date: Mon, 25 Jan 2021 19:22:49 -0800 Subject: [PATCH 2/3] enable git-lfs for large files. Enable git rerere for merge conflict autoresolution --- .gitconfig | 7 +++++++ 1 file changed, 7 insertions(+) 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 From ee45fee748020b59ba2f9bda5898d8ca3f7c66a8 Mon Sep 17 00:00:00 2001 From: John Shen Date: Mon, 25 Jan 2021 19:23:19 -0800 Subject: [PATCH 3/3] update iterm2 prefs --- com.googlecode.iterm2.plist | 1020 ++++++++--------------------------- 1 file changed, 238 insertions(+), 782 deletions(-) diff --git a/com.googlecode.iterm2.plist b/com.googlecode.iterm2.plist index cc10529..f36c69d 100644 --- a/com.googlecode.iterm2.plist +++ b/com.googlecode.iterm2.plist @@ -3,732 +3,83 @@ AdjustWindowForFontSizeChange - - AllowClipboardAccess - - AnimateDimming - - AppleAntiAliasingThreshold - 1 - AppleScrollAnimationEnabled - 0 - AppleSmoothFixedFontsSizeThreshold - 1 - AppleWindowTabbingMode - manual - AutoHideTmuxClientSession - - CheckTestRelease - - ClosingHotkeySwitchesSpaces - - CommandSelection - - Control - 1 - CopyLastNewline - - CopySelection - - Default Bookmark Guid - B54BD3E6-CAFD-4087-828B-8EAF08C20962 - DimBackgroundWindows - - DimInactiveSplitPanes - - DimOnlyText - - DisableFullscreenTransparency - - EnableRendezvous - - FocusFollowsMouse - - FsTabDelay - 1 - HiddenAFRStrokeThickness - 0.0 - HiddenAdvancedFontRendering - - HideActivityIndicator - - HideMenuBarInFullscreen - - HideScrollbar - - HideTab - - HighlightTabLabels - - HotKeyTogglesWindow - - Hotkey - - HotkeyChar - 0 - HotkeyCode - 0 - HotkeyMigratedFromSingleToMulti - - HotkeyModifiers - 0 - IRMemory - 4 - JobName - - LeftCommand - 7 - LeftOption - 2 - LoadPrefsFromCustomFolder - - MaxVertically - - NSNavLastRootDirectory - ~/Dropbox/env - NSNavPanelExpandedSizeForOpenMode - {712, 448} - NSQuotedKeystrokeBinding - - NSRepeatCountBinding - - NSScrollAnimationEnabled - - NSScrollViewShouldScrollUnderTitlebar - - NSTableView Columns v2 KeyBingingTable - - YnBsaXN0MDDUAQIDBAUGNjdYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3AS - AAGGoK4HCA8aGxwdHh8gJjAxMlUkbnVsbNIJCgsOWk5TLm9iamVjdHNWJGNsYXNzogwN - gAKACoAN0xAJChEVGVdOUy5rZXlzoxITFIADgASABaMWFxiABoAHgAiACVpJZGVudGlm - aWVyVVdpZHRoVkhpZGRlblEwI0BowAAAAAAACNIhIiMkWiRjbGFzc25hbWVYJGNsYXNz - ZXNcTlNEaWN0aW9uYXJ5oiMlWE5TT2JqZWN00xAJCicrGaMSExSAA4AEgAWjLC0YgAuA - DIAIgAlRMSNAc7AAAAAAANIhIjM0Xk5TTXV0YWJsZUFycmF5ozM1JVdOU0FycmF5XxAP - 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 Preferences - 3156 148 606 456 1920 -325 2560 1417 - NSWindow Frame SUAutomaticUpdateAlert - 332 452 616 174 0 0 1280 777 - NSWindow Frame SUStatusFrame - 760 697 400 129 0 0 1920 1057 - NSWindow Frame SUUpdateAlert - 610 327 700 622 0 0 1920 1057 - NSWindow Frame SharedPreferences - -971 347 918 492 -1280 213 1280 777 - NSWindow Frame iTerm Window 0 - -1280 226 1279 764 -1280 213 1280 777 - NSWindow Frame iTerm Window 1 - 643 0 634 777 0 0 1920 1057 - New Bookmarks - - - ASCII Anti Aliased - - Ambiguous Double Width - - 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.0 - Red Component - 0.73333334922790527 - - Ansi 10 Color - - Blue Component - 0.3333333432674408 - Green Component - 1 - Red Component - 0.3333333432674408 - - Ansi 11 Color - - Blue Component - 0.3333333432674408 - Green Component - 1 - Red Component - 1 - - Ansi 12 Color - - Blue Component - 1 - Green Component - 0.3333333432674408 - Red Component - 0.3333333432674408 - - 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.0 - Green Component - 0.73333334922790527 - Red Component - 0.0 - - Ansi 3 Color - - Blue Component - 0.0 - Green Component - 0.73333334922790527 - Red Component - 0.73333334922790527 - - Ansi 4 Color - - Blue Component - 0.73333334922790527 - Green Component - 0.0 - Red Component - 0.0 - - 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.3333333432674408 - Green Component - 0.3333333432674408 - Red Component - 0.3333333432674408 - - Ansi 9 Color - - Blue Component - 0.3333333432674408 - Green Component - 0.3333333432674408 - Red Component - 1 - - BM Growl - - Background Color - - Blue Component - 0.0 - Green Component - 0.0 - Red Component - 0.0 - - Background Image Location - - Blinking Cursor - - Blur - - Bold Color - - Blue Component - 1 - Green Component - 1 - Red Component - 1 - - Character Encoding - 4 - Close Sessions On End - - Columns - 80 - Command - - 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 - - Custom Command - No - Custom Directory - Yes - Default Bookmark - No - Description - Default - Disable Window Resizing - - Flashing Bell - - Foreground Color - - Blue Component - 0.73333334922790527 - Green Component - 0.73333334922790527 - Red Component - 0.73333334922790527 - - Guid - 2122D7C1-53E2-4647-AE83-09DEDEB36778 - Horizontal Spacing - 1 - Idle Code - 0 - Jobs to Ignore - - rlogin - ssh - slogin - telnet - - Keyboard Map - - 0x2d-0x40000 - - Action - 11 - Text - 0x1f - - 0x32-0x40000 - - Action - 11 - Text - 0x00 - - 0x33-0x40000 - - Action - 11 - Text - 0x1b - - 0x34-0x40000 - - Action - 11 - Text - 0x1c - - 0x35-0x40000 - - Action - 11 - Text - 0x1d - - 0x36-0x40000 - - Action - 11 - Text - 0x1e - - 0x37-0x40000 - - Action - 11 - Text - 0x1f - - 0x38-0x40000 - - Action - 11 - Text - 0x7f - - 0xf700-0x220000 - - Action - 10 - Text - [1;2A - - 0xf700-0x240000 - - Action - 10 - Text - [1;5A - - 0xf700-0x260000 - - Action - 10 - Text - [1;6A - - 0xf700-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x41 - - 0xf701-0x220000 - - Action - 10 - Text - [1;2B - - 0xf701-0x240000 - - Action - 10 - Text - [1;5B - - 0xf701-0x260000 - - Action - 10 - Text - [1;6B - - 0xf701-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x42 - - 0xf702-0x220000 - - Action - 10 - Text - [1;2D - - 0xf702-0x240000 - - Action - 10 - Text - [1;5D - - 0xf702-0x260000 - - Action - 10 - Text - [1;6D - - 0xf702-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x44 - - 0xf703-0x220000 - - Action - 10 - Text - [1;2C - - 0xf703-0x240000 - - Action - 10 - Text - [1;5C - - 0xf703-0x260000 - - Action - 10 - Text - [1;6C - - 0xf703-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x43 - - 0xf704-0x20000 - - Action - 10 - Text - [1;2P - - 0xf705-0x20000 - - Action - 10 - Text - [1;2Q - - 0xf706-0x20000 - - Action - 10 - Text - [1;2R - - 0xf707-0x20000 - - Action - 10 - Text - [1;2S - - 0xf708-0x20000 - - Action - 10 - Text - [15;2~ - - 0xf709-0x20000 - - Action - 10 - Text - [17;2~ - - 0xf70a-0x20000 - - Action - 10 - Text - [18;2~ - - 0xf70b-0x20000 - - Action - 10 - Text - [19;2~ - - 0xf70c-0x20000 - - Action - 10 - Text - [20;2~ - - 0xf70d-0x20000 - - Action - 10 - Text - [21;2~ - - 0xf70e-0x20000 - - Action - 10 - Text - [23;2~ - - 0xf70f-0x20000 - - Action - 10 - Text - [24;2~ - - 0xf729-0x20000 - - Action - 10 - Text - [1;2H - - 0xf729-0x40000 - - Action - 10 - Text - [1;5H - - 0xf72b-0x20000 - - Action - 10 - Text - [1;2F - - 0xf72b-0x40000 - - Action - 10 - Text - [1;5F - - - Mouse Reporting - - Name - Default - Non Ascii Font - Monaco 12 - Non-ASCII Anti Aliased - - Normal Font - Monaco 10 - Option Key Sends - 0 - Prompt Before Closing 2 - - Right Option Key Sends - 0 - Rows - 25 - Screen - -1 - Scrollback Lines - 1000 - 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 - + + AllowClipboardAccess + + AlternateMouseScroll + + AnimateDimming + + AutoHideTmuxClientSession + + CheckTestRelease + + ClosingHotkeySwitchesSpaces + + CommandSelection + + Control + 1 + CopyLastNewline + + CopySelection + + Default Bookmark Guid + B54BD3E6-CAFD-4087-828B-8EAF08C20962 + DimBackgroundWindows + + DimInactiveSplitPanes + + DimOnlyText + + DisableFullscreenTransparency + + EnableRendezvous + + FocusFollowsMouse + + FsTabDelay + 1 + HapticFeedbackForEsc + + HiddenAFRStrokeThickness + 0.0 + HiddenAdvancedFontRendering + + HideActivityIndicator + + HideMenuBarInFullscreen + + HideScrollbar + + HideTab + + HighlightTabLabels + + HotKeyTogglesWindow + + Hotkey + + HotkeyChar + 0 + HotkeyCode + 0 + HotkeyMigratedFromSingleToMulti + + HotkeyModifiers + 0 + IRMemory + 4 + JobName + + LeftCommand + 7 + LeftOption + 2 + MaxVertically + + New Bookmarks + ASCII Anti Aliased @@ -968,6 +319,27 @@ Keyboard Map + 0x2a-0x200000 + + Action + 12 + Text + * + + 0x2b-0x200000 + + Action + 12 + Text + + + + 0x2d-0x200000 + + Action + 12 + Text + - + 0x2d-0x40000 Action @@ -975,6 +347,48 @@ Text 0x1f + 0x2e-0x200000 + + Action + 12 + Text + . + + 0x2f-0x200000 + + Action + 12 + Text + / + + 0x3-0x200000 + + Action + 11 + Text + 0xd + + 0x30-0x200000 + + Action + 12 + Text + 0 + + 0x31-0x200000 + + Action + 12 + Text + 1 + + 0x32-0x200000 + + Action + 12 + Text + 2 + 0x32-0x40000 Action @@ -982,6 +396,13 @@ Text 0x00 + 0x33-0x200000 + + Action + 12 + Text + 3 + 0x33-0x40000 Action @@ -989,6 +410,13 @@ Text 0x1b + 0x34-0x200000 + + Action + 12 + Text + 4 + 0x34-0x40000 Action @@ -996,6 +424,13 @@ Text 0x1c + 0x35-0x200000 + + Action + 12 + Text + 5 + 0x35-0x40000 Action @@ -1003,6 +438,13 @@ Text 0x1d + 0x36-0x200000 + + Action + 12 + Text + 6 + 0x36-0x40000 Action @@ -1010,6 +452,13 @@ Text 0x1e + 0x37-0x200000 + + Action + 12 + Text + 7 + 0x37-0x40000 Action @@ -1017,6 +466,13 @@ Text 0x1f + 0x38-0x200000 + + Action + 12 + Text + 8 + 0x38-0x40000 Action @@ -1024,6 +480,27 @@ Text 0x7f + 0x39-0x200000 + + Action + 12 + Text + 9 + + 0x7f-0x100000 + + Action + 11 + Text + 0x15 + + 0x7f-0x80000 + + Action + 11 + Text + 0x1b 0x7f + 0xf700-0x220000 Action @@ -1045,13 +522,6 @@ Text [1;6A - 0xf700-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x41 - 0xf701-0x220000 Action @@ -1073,13 +543,6 @@ Text [1;6B - 0xf701-0x280000 - - Action - 11 - Text - 0x1b 0x1b 0x5b 0x42 - 0xf702-0x220000 Action @@ -1104,9 +567,9 @@ 0xf702-0x280000 Action - 11 + 10 Text - 0x1b 0x1b 0x5b 0x44 + b 0xf703-0x220000 @@ -1132,9 +595,9 @@ 0xf703-0x280000 Action - 11 + 10 Text - 0x1b 0x1b 0x5b 0x43 + f 0xf704-0x20000 @@ -1220,6 +683,20 @@ Text [24;2~ + 0xf728-0x0 + + Action + 11 + Text + 0x4 + + 0xf728-0x80000 + + Action + 10 + Text + d + 0xf729-0x20000 Action @@ -1248,17 +725,24 @@ Text [1;5F + 0xf739-0x0 + + Action + 13 + Text + + Mouse Reporting Name johnshen Non Ascii Font - Monaco 9 + Monaco 10 Non-ASCII Anti Aliased Normal Font - Monaco 10 + Monaco 12 Option Key Sends 2 Prompt Before Closing 2 @@ -1270,7 +754,7 @@ Screen -1 Scrollback Lines - 1000 + 10000 Selected Text Color Blue Component @@ -1321,24 +805,6 @@ /Users/johnshen/src - NoSyncDoNotWarnBeforeMultilinePaste - - NoSyncDoNotWarnBeforeMultilinePaste_selection - 0 - NoSyncInstallationId - 93CD384D-468A-4377-A87D-BB9F0AE2BCCB - NoSyncNeverRemindPrefsChangesLostForFile - - NoSyncNeverRemindPrefsChangesLostForFile_selection - 0 - NoSyncPermissionToShowTip - - NoSyncTimeOfFirstLaunchOfVersionWithTip - 487069479.86444497 - NoSyncTimeOfLastPromo - 485712634.336052 - NoSyncTimeOfLastPromoDownload - 485900397.559048 OnlyWhenMoreTabs OpenArrangementAtStartup @@ -1384,8 +850,6 @@ kNextWindowPointerAction - PrefsCustomFolder - /Users/johnshen/ PromptOnQuit QuitWhenAllWindowsClosed @@ -1394,18 +858,6 @@ 8 RightOption 3 - SUAutomaticallyUpdate - - SUEnableAutomaticChecks - - SUFeedAlternateAppNameKey - iTerm - SUFeedURL - https://iterm2.com/appcasts/testing.xml?shard=36 - SUHasLaunchedBefore - - SULastCheckTime - 2018-06-09T09:56:18Z SavePasteHistory ShowBookmarkName @@ -1416,6 +868,8 @@ SmartPlacement + SoundForEsc + SplitPaneDimmingAmount 0.33066907051282052 SwitchTabModifier @@ -1423,7 +877,9 @@ SwitchWindowModifier 6 TabStyle - 0 + 2 + TabStyleWithAutomaticOption + 4 TabViewType 0 ThreeFingerEmulates @@ -1440,6 +896,8 @@ UseLionStyleFullscreen + VisualIndicatorForEsc + WebKitDefaultFontSize 11 WebKitStandardFont @@ -1456,7 +914,5 @@ 0 findRegex_iTerm - iTerm Version - 3.1.6beta5