Moar.

.hgsubstate

@@ -3,7 +3,7 @@ b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-383c5a5e05232def8540aab9342527adc01fcfb8 vim/bundle/badwolf
+cb09bd4000f0d0a971d15f93bc5f8b98a587915a vim/bundle/badwolf
 ed67c4908fa033eef6cdfacc8141750e99f1345b vim/bundle/clam
 0cb36de11bb12b5c8d92abb6d400dbb581b8f093 vim/bundle/commaobject
 50b055633580c65c381ebb310bc1786ff14e3340 vim/bundle/commentary
@@ -30,7 +30,7 @@ c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
 ee35ab6954a11337a2b52003d07fabe442843b68 vim/bundle/supertab
 1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround
-1e94b987052e91d925ce93b331507cda5225e4b8 vim/bundle/syntastic
+e5dfcc3488e407c8e28b308cb6e631336e77d060 vim/bundle/syntastic
 2dee007ddae8156735cbae7f0cd4e0a24ba7287b vim/bundle/tslime
-6f31bf82bbcc528eb47c8c1a851a43c36233f6c1 vim/bundle/vitality
+1dae3b9a0e6fd9d05698bd45d501e232787f317a vim/bundle/vitality
 8ebc225b364887c0557ab47ab2ca752a70123bee vim/bundle/yankring

dotcss/github.com.css

@@ -1,22 +1,15 @@
 .native-clones { display: none; }
 .tree-browser td.content { font-family: Menlo; font-size: 12px; line-height: 18px; }
 span.mini-icon.directory { margin-top: 2px; }
-div.news span.mini-icon { display: none; }
-div.news div.alert { padding-left: 0; }
-ul.repo_list li .mini-icon { display: none; }
-#dashboard ul.repo_list li a { padding-left: 10px; }
+/* div.news span.mini-icon { display: none; } */
+/* div.news div.alert { padding-left: 0; } */
+/* ul.repo_list li .mini-icon { display: none; } */
+/* #dashboard ul.repo_list li a { padding-left: 10px; } */
 a.feed.tooltipped.leftwards { display: none; }
-.pagehead.tip { display: none; }
-#dashboard div.news { display: none; }
+.pagehead .tip { display: none; }
+/* #dashboard div.news { display: none; } */
 div.filter-bar { overflow-x: hidden; }
-#dashboard #watched_repos {
-    float: left;
-    clear: none;
-    margin-right: 100px;
-}
-p.url-description {
-    display: none;
-}
+p.url-description { display: none; }
 span.js-clippy { display: none !important; }
 div.repository-lang-stats-graph { display: none; }
 div.recently-touched-branches-wrapper { display: none; }

dotcss/youtube.com.css

@@ -0,0 +1,3 @@
+#video-sidebar {
+    display: none;
+}

fish/config.fish

@@ -8,6 +8,7 @@ alias c 'clear'
 alias hl 'less -R'
 alias paththis 'set PATH (pwd) $PATH'
 alias clc './get-last-commit-url.py | pbcopy'
+alias t '~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt'
 
 alias swank 'dtach -A /tmp/dtach-swank.sock -r winch lein swank'
 
@@ -21,6 +22,8 @@ alias em 'vim ~/.mutt/muttrc'
 alias ez 'vim ~/lib/dotfiles/zsh'
 alias ek 'vim ~/lib/dotfiles/keymando/keymandorc.rb'
 alias et 'vim ~/.tmux.conf'
+alias eg 'vim ~/.gitconfig'
+
 
 alias spotlight-off 'sudo mdutil -a -i off ; and sudo mv /System/Library/CoreServices/Search.bundle/ /System/Library/CoreServices/SearchOff.bundle/ ; and killall SystemUIServer'
 alias spotlight-on 'sudo mdutil -a -i on ; and sudo mv /System/Library/CoreServices/SearchOff.bundle/ /System/Library/CoreServices/Search.bundle/ ; and killall SystemUIServer'
@@ -68,6 +71,11 @@ end
 
 function fish_user_keybindings
     bind \cn accept-autosuggestion
+
+    # Ignore iterm2 escape sequences.  Vim will handle them if needed.
+    bind \e\[I true
+    bind \e\[O true
+    # ]]
 end
 
 # }}}

vim/custom-dictionary.utf-8.add

@@ -82,3 +82,8 @@ Backblaze
 README
 Coursera
 OAuth
+admin
+signoffs
+SubtitleLanguage
+SubtitleLanguages
+signoff

vim/haskellmode.config

@@ -1,14 +1,19 @@
--- 7.0.4
+-- 7.4.1
 AlternativeLayoutRule
 AlternativeLayoutRuleTransitional
 Arrows
 BangPatterns
+CApiFFI
 CPP
 ConstrainedClassMethods
+ConstraintKinds
+DataKinds
 DatatypeContexts
+DefaultSignatures
 DeriveDataTypeable
 DeriveFoldable
 DeriveFunctor
+DeriveGeneric
 DeriveTraversable
 DisambiguateRecordFields
 DoAndIfThenElse
@@ -21,36 +26,42 @@ FlexibleContexts
 FlexibleInstances
 ForeignFunctionInterface
 FunctionalDependencies
+GADTSyntax
 GADTs
 GHCForeignImportPrim
 GeneralizedNewtypeDeriving
-Generics
 Haskell2010
 Haskell98
 ImplicitParams
 ImplicitPrelude
 ImpredicativeTypes
 IncoherentInstances
+InterruptibleFFI
 KindSignatures
 LiberalTypeSynonyms
 MagicHash
+MonadComprehensions
 MonoLocalBinds
 MonoPatBinds
 MonomorphismRestriction
 MultiParamTypeClasses
 NPlusKPatterns
 NamedFieldPuns
-NewQualifiedOperators
 NoAlternativeLayoutRule
 NoAlternativeLayoutRuleTransitional
 NoArrows
 NoBangPatterns
+NoCApiFFI
 NoCPP
 NoConstrainedClassMethods
+NoConstraintKinds
+NoDataKinds
 NoDatatypeContexts
+NoDefaultSignatures
 NoDeriveDataTypeable
 NoDeriveFoldable
 NoDeriveFunctor
+NoDeriveGeneric
 NoDeriveTraversable
 NoDisambiguateRecordFields
 NoDoAndIfThenElse
@@ -63,31 +74,34 @@ NoFlexibleContexts
 NoFlexibleInstances
 NoForeignFunctionInterface
 NoFunctionalDependencies
+NoGADTSyntax
 NoGADTs
 NoGHCForeignImportPrim
 NoGeneralizedNewtypeDeriving
-NoGenerics
 NoImplicitParams
 NoImplicitPrelude
 NoImpredicativeTypes
 NoIncoherentInstances
+NoInterruptibleFFI
 NoKindSignatures
 NoLiberalTypeSynonyms
 NoMagicHash
+NoMonadComprehensions
 NoMonoLocalBinds
 NoMonoPatBinds
 NoMonomorphismRestriction
 NoMultiParamTypeClasses
 NoNPlusKPatterns
 NoNamedFieldPuns
-NoNewQualifiedOperators
+NoNondecreasingIndentation
 NoOverlappingInstances
 NoOverloadedStrings
-NoPArr
 NoPackageImports
+NoParallelArrays
 NoParallelListComp
 NoPatternGuards
 NoPatternSignatures
+NoPolyKinds
 NoPolymorphicComponents
 NoPostfixOperators
 NoQuasiQuotes
@@ -97,10 +111,12 @@ NoRebindableSyntax
 NoRecordPuns
 NoRecordWildCards
 NoRecursiveDo
+NoRelaxedLayout
 NoRelaxedPolyRec
 NoScopedTypeVariables
 NoStandaloneDeriving
 NoTemplateHaskell
+NoTraditionalRecordSyntax
 NoTransformListComp
 NoTupleSections
 NoTypeFamilies
@@ -111,13 +127,15 @@ NoUndecidableInstances
 NoUnicodeSyntax
 NoUnliftedFFITypes
 NoViewPatterns
+NondecreasingIndentation
 OverlappingInstances
 OverloadedStrings
-PArr
 PackageImports
+ParallelArrays
 ParallelListComp
 PatternGuards
 PatternSignatures
+PolyKinds
 PolymorphicComponents
 PostfixOperators
 QuasiQuotes
@@ -127,11 +145,15 @@ RebindableSyntax
 RecordPuns
 RecordWildCards
 RecursiveDo
+RelaxedLayout
 RelaxedPolyRec
+Safe
 ScopedTypeVariables
 StandaloneDeriving
 TemplateHaskell
+TraditionalRecordSyntax
 TransformListComp
+Trustworthy
 TupleSections
 TypeFamilies
 TypeOperators
@@ -140,21 +162,21 @@ UnboxedTuples
 UndecidableInstances
 UnicodeSyntax
 UnliftedFFITypes
+Unsafe
 ViewPatterns
 --
--fasm-mangling
 -fdo-lambda-eta-expansion
 -fembed-manifest
 -fgen-manifest
+-fghci-history
 -fghci-sandbox
+-fhelpful-errors
 -fignore-interface-pragmas
 -fimplicit-import-qualified
--fmethod-sharing
 -fno-break-on-error
 -fno-break-on-exception
 -fno-building-cabal-package
 -fno-case-merge
--fno-convert-to-zipper-and-back
 -fno-cse
 -fno-dicts-cheap
 -fno-do-eta-reduction
@@ -170,9 +192,11 @@ ViewPatterns
 -fno-ignore-asserts
 -fno-liberate-case
 -fno-new-codegen
+-fno-pedantic-bottoms
 -fno-print-bind-result
 -fno-print-evld-with-show
 -fno-print-explicit-foralls
+-fno-prof-cafs
 -fno-regs-graph
 -fno-regs-iterative
 -fno-rewrite-rules
@@ -188,23 +212,28 @@ ViewPatterns
 -fno-warn-dodgy-exports
 -fno-warn-dodgy-imports
 -fno-warn-hi-shadowing
+-fno-warn-identities
 -fno-warn-implicit-prelude
 -fno-warn-incomplete-patterns
 -fno-warn-incomplete-record-updates
+-fno-warn-incomplete-uni-patterns
 -fno-warn-missing-import-lists
 -fno-warn-missing-local-sigs
 -fno-warn-missing-signatures
 -fno-warn-monomorphism-restriction
 -fno-warn-name-shadowing
 -fno-warn-orphans
+-fno-warn-safe
 -fno-warn-tabs
 -fno-warn-type-defaults
+-fno-warn-unsafe
 -fno-warn-unused-binds
 -fno-warn-unused-do-bind
 -fno-warn-unused-imports
 -fno-warn-unused-matches
 -fomit-interface-pragmas
 -fprint-bind-contents
+-fprof-count-entries
 -fshared-implib
 -fwarn-alternative-layout-rule-transitional
 -fwarn-deprecated-flags

vim/vimrc

@@ -244,6 +244,9 @@ vnoremap <c-z> <esc>zv`<ztgv
 " Unfuck my screen
 nnoremap <leader>u :syntax sync fromstart<cr>:redraw!<cr>
 
+" Don't clobber the yank register when pasting over text in visual mode.
+vnoremap p pgvy
+
 " Tabs
 nnoremap <leader>( :tabprev<cr>
 nnoremap <leader>) :tabnext<cr>