Steve Losh avatar Steve Losh committed ad46491

Updates

Comments (0)

Files changed (9)

 vim/bundle/markdown              = [git]git://github.com/tpope/vim-markdown.git
 vim/bundle/maven                 = [git]git://github.com/sjl/vim-maven-plugin.git
 vim/bundle/nerdtree              = [git]git://github.com/scrooloose/nerdtree.git
+vim/bundle/orgmode               = [git]git://github.com/jceb/vim-orgmode.git
 vim/bundle/paredit               = [hg]https://bitbucket.org/kovisoft/paredit/
 vim/bundle/pgsql                 = [git]git://github.com/exu/pgsql.vim.git
 vim/bundle/powerline             = [git]git://github.com/Lokaltog/vim-powerline.git
 vim/bundle/python-mode           = [git]git://github.com/klen/python-mode.git
 vim/bundle/rainbow-parentheses   = [git]git://github.com/kien/rainbow_parentheses.vim.git
 vim/bundle/repeat                = [git]git://github.com/tpope/vim-repeat.git
-vim/bundle/scala                 = [git]git://github.com/derekwyatt/vim-scala.git
+vim/bundle/scala                 = [git]git://github.com/sjl/vim-scala.git
 vim/bundle/scaladoc              = [git]git://github.com/sjl/vim-scaladoc.git
 vim/bundle/smartinput            = [git]git://github.com/kana/vim-smartinput.git
 vim/bundle/sparkup               = [git]git://github.com/sjl/vim-sparkup.git
 dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown
 5258393bb12428c59bce8b28c9726d0326805dcf vim/bundle/maven
 a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree
+871bc88a5bbcb6e8844a64450b8e7f8ac13aac24 vim/bundle/orgmode
 b6b7d8b1982b67a0bba936c198041f6f3a2286a4 vim/bundle/paredit
 f84e170fce4f6cb60b6d1b4baa30076f2b372f1e vim/bundle/pgsql
 2af074850fde676743f655775e3e151925751adf vim/bundle/powerline
 1b4b8f1a8f1c88d8caae6c1b12c22c52ef418f32 vim/bundle/python-mode
 eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
-c81f87ca6786142b531e66a948effacc03a02184 vim/bundle/scala
+cfc1a90540f648492086a20e39fde7514c469fa7 vim/bundle/scala
 1f797fda2c457202cf62d9a082a3fccd4278e3bf vim/bundle/scaladoc
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 #!/usr/bin/env bash
 
-PATH=~/.vim/bullshit:$PATH $VIM_BINARY "$@"
+PATH=~/.vim/bullshit:$PATH exec $VIM_BINARY "$@"

dotcss/jenkins.banksimple.com.css

+#main-panel pre {
+    font: normal 14px Menlo !important;
+}

dotjs/github.com.js

 $(function() {
-    if ($('li.commit').length) {
+    $('#top_search_form').attr('action', 'https://google.com/search').submit(function(e) {
+       var q = $('#js-command-bar-field').val();
+       $('#js-command-bar-field').val(q + " site:github.com");
+       e.stopPropagation();
+       return false;
+    });
 
-        $('ul.pagehead-actions').prepend('<li><a class="minibutton btn-watch" href="#reviewing" id="toggle-merges-button"><span><span class="icon"></span><span class="text">Review</span></span></a></li>');
-
-        $('#toggle-merges-button').toggle(function() {
-            $('li.commit').each(function() {
-                var t = $(this).find('a.message').text().substring(0, 5);
-                if (t === 'Merge' || t === 'merge') {
-                    $(this).hide();
-                    return;
-                }
-                t = $(this).find('a.message').text().substring(0, 24);
-                if (t === 'Updated integration repo' || t === 'updated integration repo') {
-                    $(this).hide();
-                    return;
-                }
-                t = $(this).find('a.message').text().substring(0, 23);
-                if (t === 'Update integration repo' || t === 'update integration repo') {
-                    $(this).hide();
-                    return;
-                }
-                t = $(this).find('a.message').text().substring(0, 26);
-                if (t === 'Update unisubs-integration' || t === 'update unisubs-integration') {
-                    $(this).hide();
-                    return;
-                }
-                t = $(this).find('a.message').text().substring(0, 65);
-                if (t === 'Updated transifex translations -- through update_translations.sh') {
-                    $(this).hide();
-                    return;
-                }
-                if ($(this).find('span.author-name').text() === 'sjl') {
-                    $(this).hide();
-                    return;
-                }
-            });
-            $('span.text', this).text('Stop reviewing');
-            $('a#toggle-merges-button').attr('href', '#');
-
-            window.location.hash = '#reviewing';
-
-            return false;
-        }, function() {
-            $('li.commit').show();
-            $('span.text', this).text('Review');
-
-            window.location.hash = '';
-
-            return false;
-        });
-    }
-
-    if (window.location.hash === '#reviewing') {
-        $('a#toggle-merges-button').click();
-    }
-
-    if ($('.view-pull-request').length) {
-        var url = $('table.commits tr.commit .commit-meta a').attr('href');
-        var parts = url.split('/');
-        var repo = 'git://github.com/' + parts[1] + '/' + parts[2] + '.git';
-        $('#pull-head').append('<textarea id="goddamned-repo-url">' + repo + '</textarea>');
-        $('#goddamned-repo-url').css('width', '897px')
-                                .css('height', '20px')
-                                .css('border', '1px solid #ccc')
-                                .css('padding', '5px 0px 3px 4px')
-                                .css('margin', '3px 0px 5px 8px')
-                                .css('font-size', '18px')
-                                .css('color', '#555')
-                                .css('border-radius', '3px');
-    }
 });
 function urlencode
     python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1]);" $argv
 end
+function urldecode
+    python -c "import sys, urllib as ul; print ul.unquote_plus(sys.argv[1])" $argv
+end
 
 function fix_open_with -d "Fix the shitty OS X Open With menu duplicates"
     /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -kill -r -domain local -domain user
     branches = branch -a
     remotes = remote -v
 
-    point-the-fucking-branch-at = "!sh -c 'git checkout $1 && git reset --hard $2' -"
+    make-the-fucking-branch-point-at-the-fucking-commit = "!sh -c 'git checkout $1 && git reset --hard $2' -"
     root = rev-parse --show-toplevel
 
     graft = cherry-pick -x
 
 " Preamble ---------------------------------------------------------------- {{{
 
-
 " Dear /bin/bash: fuck you and your bullshit, arcane command-line behaviour.
 "
 " Basically, I want to set this to a non-login, non-interactive bash shell.
 set dictionary=/usr/share/dict/words
 set spellfile=~/.vim/custom-dictionary.utf-8.add
 set colorcolumn=+1
-
-" iTerm2 is currently slow as ball at rendering the nice unicode lines, so for
-" now I'll just use ascii pipes.  They're ugly but at least I won't want to kill
-" myself when trying to move around a file.
-" set fillchars=diff:⣿,vert:│
-set fillchars=diff:⣿,vert:\|
+set fillchars=diff:⣿,vert:│
 
 " Don't try to highlight lines longer than 800 characters.
 set synmaxcol=800
 
 runtime macros/matchit.vim
 map <tab> %
-unmap [%
-unmap ]%
+silent! unmap [%
+silent! unmap ]%
 
 " Made D behave
 nnoremap D d$
 augroup END
 
 " }}}
-" Ruby {{{
+" Rubby {{{
 
 augroup ft_ruby
     au!
     au Filetype ruby setlocal foldmethod=syntax
+    au BufRead,BufNewFile Capfile setlocal filetype=ruby
 augroup END
 
 " }}}
 
 augroup ft_scala
     au!
-    " au Filetype scala setlocal foldmethod=indent
     au Filetype scala setlocal foldmethod=marker foldmarker={,}
     au Filetype scala compiler maven
     au Filetype scala let b:dispatch = 'mvn -B package install'
 augroup END
 
 " }}}
+" YAML {{{
+
+augroup ft_yaml
+    au!
+
+    au FileType yaml set shiftwidth=2
+augroup END
+
+" }}}
+" XML {{{
+
+augroup ft_xml
+    au!
+
+    au FileType xml setlocal foldmethod=manual
+
+    " Use <localleader>f to fold the current tag.
+    au FileType xml nnoremap <buffer> <localleader>f Vatzf
+
+    " Indent tag
+    au FileType xml nnoremap <buffer> <localleader>= Vat=
+augroup END
+
+" }}}
 
 " }}}
 " Plugin settings --------------------------------------------------------- {{{
 " }}}
 " OrgMode {{{
 
-let g:org_plugins = ['ShowHide', '|', 'Navigator', 'EditStructure', '|', 'Todo', 'Date', 'Misc']
+let g:org_heading_shade_leading_stars = 0
+" let g:org_plugins = ['ShowHide', '|', 'Navigator', 'EditStructure', '|', 'Todo', 'Date', 'Misc']
 
-let g:org_todo_keywords = ['TODO', '|', 'DONE']
+" let g:org_todo_keywords = ['TODO', '|', 'DONE']
 
-let g:org_debug = 1
+" let g:org_debug = 1
 
 " }}}
 " Paredit {{{

weechat/weechat.conf

 day_change_time_format = "%a, %d %b %Y"
 eat_newline_glitch = off
 highlight = "sjl"
-highlight_regex = "(sjl|^all[,:]|backend(ia?)|slj|clojerks)"
+highlight_regex = "(sjl|^all[,:]|backend(ia?)|slosh|slj|clojerks)"
 highlight_tags = ""
 hotlist_add_buffer_if_away = on
 hotlist_buffer_separator = ", "
 chat_inactive_buffer = darkgray
 chat_inactive_window = darkgray
 chat_nick = lightcyan
-chat_nick_colors = "226,208,136,206,081,082,099,068,048,112"
+chat_nick_colors = "027,048,068,070,081,082,099,112,129,136,169,178,208,226"
 chat_nick_offline = darkgray
 chat_nick_offline_highlight = default
 chat_nick_offline_highlight_bg = darkgray
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.