# HG changeset patch # User Steve Losh # Date 1316723520 14400 # Node ID 5f8b2ac61bf6e750d0330889611326a3eb36f0c2 # Parent 409b410aa85fe85eb4e1652f978c63fdeed2e477 Tons. diff -r 409b410aa85f -r 5f8b2ac61bf6 .gitconfig --- a/.gitconfig Mon Sep 19 08:43:40 2011 -0400 +++ b/.gitconfig Thu Sep 22 16:32:00 2011 -0400 @@ -5,14 +5,16 @@ [core] pager = cat editor = vim + excludesfile = /Users/sjl/.gitignore [alias] gl = log -10 --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n' gll = log --color=always --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n' pull = pull --ff-only +merge = merge --no-ff -com = commit +ci = commit cm = commit -m co = checkout diff -r 409b410aa85f -r 5f8b2ac61bf6 .hgsub --- a/.hgsub Mon Sep 19 08:43:40 2011 -0400 +++ b/.hgsub Thu Sep 22 16:32:00 2011 -0400 @@ -24,6 +24,8 @@ vim/bundle/supertab = [git]git://github.com/ervandew/supertab.git vim/bundle/linediff = [git]git://github.com/AndrewRadev/linediff.vim.git vim/bundle/indent-object = [git]git://github.com/michaeljsmith/vim-indent-object.git +vim/bundle/hammer = [git]git://github.com/robgleeson/hammer.vim.git +vim/bundle/fugitive = [git]git://github.com/tpope/vim-fugitive.git keymando/Plugins/vim = [hg]http://bitbucket.org/sjl/keymando-vim/ keymando/Plugins/abbrev = [git]git://github.com/keymando/abbrev.git diff -r 409b410aa85f -r 5f8b2ac61bf6 .hgsubstate --- a/.hgsubstate Mon Sep 19 08:43:40 2011 -0400 +++ b/.hgsubstate Thu Sep 22 16:32:00 2011 -0400 @@ -4,7 +4,9 @@ a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack bfdf714f8ea10a6bcba7a1375a5700b11077dcd9 vim/bundle/command-t cdecdc56f938840cad250aecd58c1901f04c4d1b vim/bundle/easymotion +201bdd0eff4cd79847cf006f143deb62f8f97342 vim/bundle/fugitive 91190e67720f852c17602504d5225d4e675b6499 vim/bundle/gundo +ffc45dd5a59b7b62edb02641c69a163f19fd02c0 vim/bundle/hammer 4ef2d418f48d30fed2f7ce00f598d6871a0010fe vim/bundle/html5 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object 75ab8c11b56aae8e35f211d96fb008efb1ab946a vim/bundle/linediff diff -r 409b410aa85f -r 5f8b2ac61bf6 iterm2/com.googlecode.iterm2.plist --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/iterm2/com.googlecode.iterm2.plist Thu Sep 22 16:32:00 2011 -0400 @@ -0,0 +1,2439 @@ + + + + + AFRStrokeThickness + 0.0 + AdvancedFontRendering + + AnimateDimming + + AppleAntiAliasingThreshold + 1 + AppleScrollAnimationEnabled + 0 + AppleSmoothFixedFontsSizeThreshold + 1 + CheckTestRelease + + ClosingHotkeySwitchesSpaces + + ColorInvertedCursor + + CommandSelection + + Control + 1 + CopyLastNewline + + CopySelection + + CursorType + 2 + Default Bookmark Guid + B7E426E1-0404-40D1-B4EF-4D94D82E6442 + DeleteSendsCtrlH + + DimBackgroundWindows + + DimInactiveSplitPanes + + DimOnlyText + + DisableFullscreenTransparency + + Displays + + Candy + + Ansi 0 Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Ansi 1 Color + + Blue Component + 0.13333334028720856 + Green Component + 0.13333334028720856 + Red Component + 0.89803922176361084 + + 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.17647059261798859 + Green Component + 0.89019608497619629 + Red Component + 0.65098041296005249 + + Ansi 3 Color + + Blue Component + 0.11764705926179886 + Green Component + 0.58431375026702881 + Red Component + 0.98823529481887817 + + Ansi 4 Color + + Blue Component + 1 + Green Component + 0.55294120311737061 + Red Component + 0.76862746477127075 + + Ansi 5 Color + + Blue Component + 0.45098039507865906 + Green Component + 0.14509804546833038 + Red Component + 0.98039215803146362 + + Ansi 6 Color + + Blue Component + 0.94117647409439087 + Green Component + 0.85098040103912354 + Red Component + 0.40392157435417175 + + Ansi 7 Color + + Blue Component + 0.94901961088180542 + Green Component + 0.94901961088180542 + Red Component + 0.94901961088180542 + + 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 + + Anti Alias + 1 + Background Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Blur + 1 + Bold Color + + Blue Component + 0.49019607843137253 + Green Component + 0.49019607843137253 + Red Component + 1 + + Columns + 95 + 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 + + Disable Bold + 1 + Font + Monaco 12 + Foreground Color + + Blue Component + 0.94901961088180542 + Green Component + 0.94901961088180542 + Red Component + 0.94901961088180542 + + Horizontal Character Spacing + 1 + NAFont + Monaco 12 + Rows + 40 + Selected Text Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Selection Color + + Blue Component + 0.97126728296279907 + Green Component + 0.97259479761123657 + Red Component + 0.97248798608779907 + + Transparency + 0.039999999105930328 + Vertical Character Spacing + 1 + + Dark Background + + 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 + + Anti Alias + 1 + Background Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Bold Color + + Blue Component + 0.49019607843137253 + Green Component + 0.49019607843137253 + Red Component + 1 + + Columns + 80 + 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 + + Disable Bold + 0 + Font + Monaco 12 + Foreground Color + + Blue Component + 0.73333334922790527 + Green Component + 0.73333334922790527 + Red Component + 0.73333334922790527 + + Horizontal Character Spacing + 1 + NAFont + Monaco 12 + Rows + 24 + 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 + + Transparency + 0.0 + Vertical Character Spacing + 1 + + Light Background + + 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 + + Anti Alias + 1 + Background Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Blur + 1 + Bold Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 1 + + Columns + 95 + Cursor Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Cursor Text Color + + Blue Component + 0.89742887020111084 + Green Component + 0.90200656652450562 + Red Component + 0.90164035558700562 + + Default Profile + Yes + Disable Bold + 0 + Font + Monaco 12 + Foreground Color + + Blue Component + 0.94911116361618042 + Green Component + 0.9514305591583252 + Red Component + 0.9512474536895752 + + Horizontal Character Spacing + 1 + NAFont + Monaco 12 + Rows + 40 + Selected Text Color + + Blue Component + 1 + Green Component + 1 + Red Component + 1 + + Selection Color + + Blue Component + 0.0 + Green Component + 0.59964907169342041 + Red Component + 0.9540092945098877 + + Transparency + 0.05000000074505806 + Vertical Character Spacing + 1 + + + EnableGrowl + + EnableRendezvous + + FocusFollowsMouse + + FsTabDelay + 1 + HiddenAFRStrokeThickness + 0.0 + HiddenAdvancedFontRendering + + HideActivityIndicator + + HideScrollbar + + HideTab + + HighlightTabLabels + + HotKeyBookmark + B7E426E1-0404-40D1-B4EF-4D94D82E6442 + HotKeyTogglesWindow + + Hotkey + + HotkeyChar + 0 + HotkeyCode + 0 + HotkeyModifiers + 0 + IRMemory + 4 + InstantReplay + + JobName + + KeyBindings + + Global + + Global Profile + Yes + Key Mappings + + 0xf700-0x220000 + + Action + 7 + + 0xf701-0x220000 + + Action + 6 + + 0xf702-0x320000 + + Action + 2 + + 0xf702-0x380000 + + Action + 2 + + 0xf703-0x320000 + + Action + 0 + + 0xf703-0x380000 + + Action + 0 + + 0xf729-0x20000 + + Action + 5 + + 0xf72b-0x20000 + + Action + 4 + + 0xf72c-0x20000 + + Action + 9 + + 0xf72d-0x20000 + + Action + 8 + + + + xterm + + Key Mappings + + 0x7f-0x0 + + Action + 11 + Text + 7f + + 0xf700-0x220000 + + Action + 10 + Text + O2A + + 0xf701-0x220000 + + Action + 10 + Text + O2B + + 0xf702-0x220000 + + Action + 10 + Text + O2D + + 0xf702-0x240000 + + Action + 10 + Priority + 1 + Text + O5D + + 0xf703-0x220000 + + Action + 10 + Text + O2C + + 0xf703-0x240000 + + Action + 10 + Priority + 1 + Text + O5C + + 0xf704-0x20000 + + Action + 10 + Text + [11;2~ + + 0xf705-0x20000 + + Action + 10 + Text + [12;2~ + + 0xf706-0x20000 + + Action + 10 + Text + [13;2~ + + 0xf707-0x20000 + + Action + 10 + Text + [14;2~ + + 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 + O2H + + 0xf729-0x40000 + + Action + 10 + Text + O5H + + 0xf72b-0x20000 + + Action + 10 + Text + O2F + + 0xf72b-0x40000 + + Action + 10 + Text + O5F + + + + + Last Updated Version + 0.10 + LeftCommand + 7 + LeftOption + 2 + LoadPrefsFromCustomFolder + + MaxVertically + + MinimumContrast + 0.0 + NSColorPanelMode + 3 + NSColorPanelVisibleSwatchRows + 1 + NSColorPickerPageableNameListDefaults + 1Apple + NSColorPickerSlidersDefaults + 3 + NSFontPanelAttributes + 1, 1 + NSNavBrowserPreferedColumnContentWidth + 186 + NSNavLastCurrentDirectory + ~/lib/dotfiles/iterm2 + NSNavLastRootDirectory + ~ + NSQuotedKeystrokeBinding + + NSRepeatCountBinding + + NSTableView Columns BookmarksView5 + + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF + hAErBE5hbWWG + + 250 + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF + hAErB0NvbW1hbmSG + + 245 + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF + hAErEFRlcm1pbmFsIFByb2ZpbGWG + + 149 + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF + hAErEEtleWJvYXJkIFByb2ZpbGWG + + 149 + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF + hAErD0Rpc3BsYXkgUHJvZmlsZYY= + + 149 + + BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU1N0cmluZwGEhAhOU09iamVjdACF + hAErCFNob3J0Y3V0hg== + + 29 + + NSTableView Hidden Columns BookmarksView5 + + NSTableView Sort Ordering BookmarksView5 + + NSToolbar Configuration Terminal Toolbar + + TB Display Mode + 3 + TB Icon Size Mode + 1 + TB Is Shown + 0 + TB Item Identifiers + + New + Info + NSToolbarSeparatorItem + NSToolbarCustomizeToolbarItem + Close + + TB Size Mode + 1 + TB Visibility Priority Values + + + NSUserKeyEquivalents + + Select Next Tab + @$] + Select Previous Tab + @$[ + + NSWindow Frame Bookmarks + 333 746 1033 372 0 0 1920 1178 + NSWindow Frame Config Panel + 1228 224 254 559 0 0 1920 1178 + NSWindow Frame NSColorPanel + 825 253 201 309 0 0 1920 1058 + NSWindow Frame NSFontPanel + 1409 77 445 270 0 0 1920 1178 + NSWindow Frame Preferences + 595 427 851 483 0 0 1920 1058 + NSWindow Frame SUStatusFrame + -1160 508 384 129 -1920 0 1920 1080 + NSWindow Frame SUUpdateAlertFrame + -1243 633 566 395 -1920 120 1920 1080 + NSWindow Frame iTerm Window 0 + 857 411 691 587 0 0 1920 1058 + 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.13333334028720856 + Green Component + 0.13333334028720856 + Red Component + 0.89803922176361084 + + Ansi 10 Color + + Blue Component + 0.0580296590924263 + Green Component + 1 + Red Component + 0.50222182273864746 + + 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 + 0.99869042634963989 + Green Component + 0.26287254691123962 + Red Component + 0.98610281944274902 + + 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.090079709887504578 + Green Component + 0.81738173961639404 + Red Component + 0.48627889156341553 + + Ansi 3 Color + + Blue Component + 0.034733623266220093 + Green Component + 0.44930213689804077 + Red Component + 0.97316551208496094 + + Ansi 4 Color + + Blue Component + 0.99832206964492798 + Green Component + 0.47701108455657959 + Red Component + 0.62673598527908325 + + Ansi 5 Color + + Blue Component + 0.30541998147964478 + Green Component + 0.0 + Red Component + 0.95955288410186768 + + Ansi 6 Color + + Blue Component + 0.92508995532989502 + Green Component + 0.80586308240890503 + Red Component + 0.29345861077308655 + + Ansi 7 Color + + Blue Component + 0.94901961088180542 + Green Component + 0.94901961088180542 + Red Component + 0.94901961088180542 + + 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 + + Automatically Log + + BM Growl + + Background Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Background Image Location + + Blink Allowed + + Blinking Cursor + + Blur + + Blur Radius + 2 + Bold Color + + Blue Component + 0.99984186887741089 + Green Component + 1 + Red Component + 0.99989891052246094 + + Character Encoding + 4 + Close Sessions On End + + Columns + 95 + Command + login -fp sjl + 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 + + Cursor Type + 2 + Custom Command + Yes + Custom Directory + Yes + Default Bookmark + Yes + Disable Printing + + Disable Smcup Rmcup + + Disable Window Resizing + + Flashing Bell + + Foreground Color + + Blue Component + 0.94901961088180542 + Green Component + 0.94901961088180542 + Red Component + 0.94901961088180542 + + Guid + B7E426E1-0404-40D1-B4EF-4D94D82E6442 + Horizontal Spacing + 1 + Idle Code + 0 + Initial Text + + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0xf700-0x220000 + + Action + 7 + + 0xf701-0x220000 + + Action + 6 + + 0xf702-0x280000 + + Action + 10 + Text + b + + 0xf702-0x320000 + + Action + 2 + + 0xf702-0x380000 + + Action + 2 + + 0xf703-0x280000 + + Action + 10 + Text + f + + 0xf703-0x320000 + + Action + 0 + + 0xf703-0x380000 + + Action + 0 + + 0xf729-0x20000 + + Action + 5 + + 0xf72b-0x20000 + + Action + 4 + + 0xf72c-0x20000 + + Action + 9 + + 0xf72d-0x20000 + + Action + 8 + + + Log Directory + + Minimum Contrast + 0.0 + Mouse Reporting + + Name + Default + Non Ascii Font + Menlo-Regular 12 + Non-ASCII Anti Aliased + + Normal Font + Menlo-Regular 12 + Option Key Sends + 0 + Prompt Before Closing 2 + 0 + Right Option Key Sends + 0 + Rows + 40 + Screen + -1 + Scrollback Lines + 1000 + Scrollback With Status Bar + + Scrollback in Alternate Screen + + Selected Text Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Selection Color + + Blue Component + 0.97126728296279907 + Green Component + 0.97259479761123657 + Red Component + 0.97248798608779907 + + Send Code When Idle + + Shortcut + + Silence Bell + + Smart Cursor Color + + Sync Title + + Tags + + Terminal Type + xterm-256color + Transparency + 0.021844660863280296 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Vertical Spacing + 1 + Visual Bell + + Window Type + 0 + Working Directory + /Users/sjl + + + 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.13333334028720856 + Green Component + 0.13333334028720856 + Red Component + 0.89803922176361084 + + Ansi 10 Color + + Blue Component + 0.0580296590924263 + Green Component + 1 + Red Component + 0.50222182273864746 + + 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 + 0.99869042634963989 + Green Component + 0.26287254691123962 + Red Component + 0.98610281944274902 + + 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.090079709887504578 + Green Component + 0.81738173961639404 + Red Component + 0.48627889156341553 + + Ansi 3 Color + + Blue Component + 0.034733623266220093 + Green Component + 0.44930213689804077 + Red Component + 0.97316551208496094 + + Ansi 4 Color + + Blue Component + 0.99832206964492798 + Green Component + 0.47701108455657959 + Red Component + 0.62673598527908325 + + Ansi 5 Color + + Blue Component + 0.30541998147964478 + Green Component + 0.0 + Red Component + 0.95955288410186768 + + Ansi 6 Color + + Blue Component + 0.92508995532989502 + Green Component + 0.80586308240890503 + Red Component + 0.29345861077308655 + + Ansi 7 Color + + Blue Component + 0.94901961088180542 + Green Component + 0.94901961088180542 + Red Component + 0.94901961088180542 + + 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 + + Automatically Log + + BM Growl + + Background Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Background Image Location + + Blink Allowed + + Blinking Cursor + + Blur + + Blur Radius + 2 + Bold Color + + Blue Component + 0.99984186887741089 + Green Component + 1 + Red Component + 0.99989891052246094 + + Character Encoding + 4 + Close Sessions On End + + Columns + 95 + Command + login -fp sjl + 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 + + Cursor Type + 2 + Custom Command + Yes + Custom Directory + Yes + Default Bookmark + No + Disable Printing + + Disable Smcup Rmcup + + Disable Window Resizing + + Flashing Bell + + Foreground Color + + Blue Component + 0.94901961088180542 + Green Component + 0.94901961088180542 + Red Component + 0.94901961088180542 + + Guid + 8F603C77-2845-44E4-9149-5DBE4F738050 + Horizontal Spacing + 1 + Idle Code + 0 + Initial Text + + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0xf700-0x220000 + + Action + 7 + + 0xf701-0x220000 + + Action + 6 + + 0xf702-0x280000 + + Action + 10 + Text + b + + 0xf702-0x320000 + + Action + 2 + + 0xf702-0x380000 + + Action + 2 + + 0xf703-0x280000 + + Action + 10 + Text + f + + 0xf703-0x320000 + + Action + 0 + + 0xf703-0x380000 + + Action + 0 + + 0xf729-0x20000 + + Action + 5 + + 0xf72b-0x20000 + + Action + 4 + + 0xf72c-0x20000 + + Action + 9 + + 0xf72d-0x20000 + + Action + 8 + + + Log Directory + + Minimum Contrast + 0.0 + Mouse Reporting + + Name + DVTM + Non Ascii Font + Menlo-Regular 12 + Non-ASCII Anti Aliased + + Normal Font + Menlo-Regular 12 + Option Key Sends + 0 + Prompt Before Closing 2 + 0 + Right Option Key Sends + 0 + Rows + 40 + Screen + -1 + Scrollback Lines + 0 + Scrollback With Status Bar + + Scrollback in Alternate Screen + + Selected Text Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Selection Color + + Blue Component + 0.97126728296279907 + Green Component + 0.97259479761123657 + Red Component + 0.97248798608779907 + + Send Code When Idle + + Shortcut + D + Silence Bell + + Smart Cursor Color + + Sync Title + + Tags + + Terminal Type + xterm-256color + Transparency + 0.082524269819259644 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Vertical Spacing + 1 + Visual Bell + + Window Type + 0 + Working Directory + /Users/sjl + + + 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.13333334028720856 + Green Component + 0.13333334028720856 + Red Component + 0.89803922176361084 + + Ansi 10 Color + + Blue Component + 0.0580296590924263 + Green Component + 1 + Red Component + 0.50222182273864746 + + 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 + 0.99869042634963989 + Green Component + 0.26287254691123962 + Red Component + 0.98610281944274902 + + 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.090079709887504578 + Green Component + 0.81738173961639404 + Red Component + 0.48627889156341553 + + Ansi 3 Color + + Blue Component + 0.034733623266220093 + Green Component + 0.44930213689804077 + Red Component + 0.97316551208496094 + + Ansi 4 Color + + Blue Component + 0.99832206964492798 + Green Component + 0.47701108455657959 + Red Component + 0.62673598527908325 + + Ansi 5 Color + + Blue Component + 0.30541998147964478 + Green Component + 0.0 + Red Component + 0.95955288410186768 + + Ansi 6 Color + + Blue Component + 0.92508995532989502 + Green Component + 0.80586308240890503 + Red Component + 0.29345861077308655 + + Ansi 7 Color + + Blue Component + 0.94901961088180542 + Green Component + 0.94901961088180542 + Red Component + 0.94901961088180542 + + 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 + + Automatically Log + + BM Growl + + Background Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Background Image Location + + Blink Allowed + + Blinking Cursor + + Blur + + Blur Radius + 2 + Bold Color + + Blue Component + 0.99984186887741089 + Green Component + 1 + Red Component + 0.99989891052246094 + + Character Encoding + 4 + Close Sessions On End + + Columns + 95 + Command + ssh 0:0:fe80::3615:9eff + 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 + + Cursor Type + 2 + Custom Command + Yes + Custom Directory + No + Default Bookmark + No + Disable Printing + + Disable Smcup Rmcup + + Disable Window Resizing + + Flashing Bell + + Foreground Color + + Blue Component + 0.94901961088180542 + Green Component + 0.94901961088180542 + Red Component + 0.94901961088180542 + + Guid + 9EE8DA3A-9334-466B-9F4F-2DC6E33BB9F4 + Horizontal Spacing + 1 + Idle Code + 0 + Initial Text + + Jobs to Ignore + + rlogin + ssh + slogin + telnet + + Keyboard Map + + 0xf700-0x220000 + + Action + 7 + + 0xf701-0x220000 + + Action + 6 + + 0xf702-0x280000 + + Action + 10 + Text + b + + 0xf702-0x320000 + + Action + 2 + + 0xf702-0x380000 + + Action + 2 + + 0xf703-0x280000 + + Action + 10 + Text + f + + 0xf703-0x320000 + + Action + 0 + + 0xf703-0x380000 + + Action + 0 + + 0xf729-0x20000 + + Action + 5 + + 0xf72b-0x20000 + + Action + 4 + + 0xf72c-0x20000 + + Action + 9 + + 0xf72d-0x20000 + + Action + 8 + + + Log Directory + + Minimum Contrast + 0.0 + Mouse Reporting + + Name + ecgtheow + Non Ascii Font + Menlo-Regular 12 + Non-ASCII Anti Aliased + + Normal Font + Menlo-Regular 12 + Option Key Sends + 0 + Prompt Before Closing 2 + 0 + Right Option Key Sends + 0 + Rows + 40 + Screen + -1 + Scrollback Lines + 1000 + Scrollback With Status Bar + + Scrollback in Alternate Screen + + Selected Text Color + + Blue Component + 0.0 + Green Component + 0.0 + Red Component + 0.0 + + Selection Color + + Blue Component + 0.97126728296279907 + Green Component + 0.97259479761123657 + Red Component + 0.97248798608779907 + + Send Code When Idle + + Shortcut + + Silence Bell + + Smart Cursor Color + + Sync Title + + Tags + + bonjour + + Terminal Type + xterm-256color + Transparency + 0.021844660863280296 + Unlimited Scrollback + + Use Bold Font + + Use Bright Bold + + Vertical Spacing + 1 + Visual Bell + + Window Type + 0 + Working Directory + + + + OnlyWhenMoreTabs + + OpenArrangementAtStartup + + OpenBookmark + + PMPrintingExpandedStateForPrint + + PassOnControlClick + + PasteFromClipboard + + PrefsCustomFolder + /Users/sjl/lib/dotfiles/iterm2 + PromptOnClose + + PromptOnQuit + + QuitWhenAllWindowsClosed + + RefreshRate + 14 + RightCommand + 8 + RightOption + 3 + SUCheckAtStartup + + SUEnableAutomaticChecks + + SUFeedURL + http://iterm2.googlecode.com/svn/trunk/appcasts/testing.xml + SULastCheckTime + 2011-09-22T01:47:57Z + SavePasteHistory + + ShowBookmarkName + + ShowFullScreenTabBar + + SmartPlacement + + SplitPaneDimmingAmount + 0.40000000596046448 + SwitchTabModifier + 4 + SwitchWindowModifier + 6 + TabViewType + 0 + Terminals + + Default + + Auto Close + + Blink + + Default Profile + Yes + Double Width + + Encoding + 4 + Idle Char + 0 + No Resizing + + Scrollback + 1000 + Send Idle Char + + Silence Bell + + Term Type + xterm + + nethack + + Auto Close + + Blink + + Double Width + + Encoding + 4 + Growl + + Idle Char + 0 + Scrollback + 1000 + Send Idle Char + + Silence Bell + + Term Type + xterm-color + + + ThreeFingerEmulates + + URLHandlers + + http + 0 + + URLHandlersByGuid + + http + B7E426E1-0404-40D1-B4EF-4D94D82E6442 + + UseBorder + + UseCompactLabel + + UseLionStyleFullscreen + + WebKitDefaultFontSize + 11 + WebKitStandardFont + Lucida Grande + WindowNumber + + WindowStyle + 0 + WordCharacters + _- + findIgnoreCase_iTerm + + iTerm Version + 1.0.0.20110909 + + diff -r 409b410aa85f -r 5f8b2ac61bf6 vim/.vimrc --- a/vim/.vimrc Mon Sep 19 08:43:40 2011 -0400 +++ b/vim/.vimrc Thu Sep 22 16:32:00 2011 -0400 @@ -253,7 +253,7 @@ noremap

j noremap

k noremap

l -noremap g v +noremap v v " }}} @@ -661,7 +661,10 @@ nnoremap Q gqip " Easier linewise reselection -nnoremap v V`] +nnoremap V V`] + +" Preview Files +nnoremap p :w:Hammer " HTML tag closing inoremap :call InsertCloseTag()a @@ -818,9 +821,23 @@ onoremap T :call EasyMotionT(0, 1) " }}} -" Golden Ratio {{{ +" Fugitive {{{ -nnoremap G (golden_ratio_resize) +nnoremap gd :Gdiff +nnoremap gs :Gstatus +nnoremap gw :Gwrite +nnoremap ga :Gadd +nnoremap gb :Gblame +nnoremap gco :Gcheckout +nnoremap gci :Gcommit +nnoremap gm :Gmove +nnoremap gr :Gremove + +augroup ft_fugitive + au! + + au BufNewFile,BufRead .git/index setlocal nolist +augroup END " }}} " Gundo {{{ @@ -1065,6 +1082,24 @@ nnoremap ß :call SynStack() " }}} +" Toggle whitespace in diffs {{{ + +set diffopt-=iwhite +let g:diffwhitespaceon = 1 +function! ToggleDiffWhitespace() "{{{ + if g:diffwhitespaceon + set diffopt-=iwhite + let g:diffwhitespaceon = 0 + else + set diffopt+=iwhite + let g:diffwhitespaceon = 1 + endif + diffupdate +endfunc "}}} + +nnoremap dw :call ToggleDiffWhitespace() + +" }}} " }}} " Hg -------------------------------------------------------------------------- {{{ @@ -1156,6 +1191,9 @@ inoremap my0c`y else map :CommandT + + " Dammit, PeepOpen + map gxxxxx PeepOpen end highlight SpellBad term=underline gui=undercurl guisp=Orange @@ -1170,6 +1208,9 @@ else " Command-T if we don't have a GUI. map :CommandT + + " Dammit, PeepOpen + map gxxxxx PeepOpen endif " }}} diff -r 409b410aa85f -r 5f8b2ac61bf6 vim/snippets/python.snippets --- a/vim/snippets/python.snippets Mon Sep 19 08:43:40 2011 -0400 +++ b/vim/snippets/python.snippets Thu Sep 22 16:32:00 2011 -0400 @@ -65,3 +65,5 @@ __${1:init}__${2} snippet *** *args, **kwargs +snippet af + assert False, repr(${1})$2 diff -r 409b410aa85f -r 5f8b2ac61bf6 zsh/misc.zsh --- a/zsh/misc.zsh Mon Sep 19 08:43:40 2011 -0400 +++ b/zsh/misc.zsh Thu Sep 22 16:32:00 2011 -0400 @@ -75,7 +75,8 @@ alias dv='dvtm -m "^f"' alias dvt='dtach -A /tmp/dvtm-session.sock -r winch dvtm -m "^f"' -alias swank='dtach -A /tmp/dvtm-swank.sock -r winch lein swank' +alias swank='dtach -A /tmp/dtach-swank.sock -r winch lein swank' +alias us-solr='wo unisubs && dtach -A /tmp/dtach-unisubs-solr.sock -r winch python manage.py run_solr --settings=dev_settings' alias goawayswapfilesyouareswapfilesidontevenneedyou='rm ~/.vim/tmp/swap/*'