Some files from the laptop.

14 files changed, 2319 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fca2273
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*hist
+*/*hist
diff --git a/poc-template.c b/poc-template.c
new file mode 100644
index 0000000..713fc95
--- /dev/null
+++ b/poc-template.c
@@ -0,0 +1,13 @@
+/*
+ * vim:ts=4:sw=4:expandtab
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+int main(int argc, char **argv) {
+    return EXIT_SUCCESS;
+}
diff --git a/screenrc b/screenrc
new file mode 100644
index 0000000..de2dfde
--- /dev/null
+++ b/screenrc
@@ -0,0 +1,97 @@
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
+
+### Created by Brad Sims <tanfj@yahoo.com> 25/06/2004
+
+### I got tired of .screenrc's on the internet being so
+### poorly commented... So being a good GNUbie I took matters
+### into my own hands; and wrote this dotfile.
+
+# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
+
+##    Explanation of hardstatus line    ##
+
+# Ignore the ' marks if you use these examples for yourself
+
+# Note that if you want to use the color brown under konsole
+# You actually use bright yellow (%{Y}).
+
+# Note the embeded space after the colon, I feel
+#  it just looks nicer with a blank between the
+#  text and console edge:
+#   '%{=b}%{G} Screens: '
+#term screen-256color
+
+# terminfo and termcap for nice 256 color terminal
+# allow bold colors - necessary for some reason
+attrcolor b ".I"
+# tell screen how to set colors. AB = background, AF=foreground
+termcapinfo xterm 'Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm'
+#termcapinfo xterm|xterms|xs|rxvt ti@:te@
+# erase background with current bg color
+defbce "on" 
+
+defutf8 on
+vbell off
+#vbell_msg '[[[ plonk! ]]]'
+#bell_msg '[[[ plonk! ]]]'
+
+# This prints the window listing in blue:
+#   '%{b}%w'
+
+# This right-aligns what follows:
+#   '%='
+
+# This displays the time (hours and minutes) in 12hr format
+# and adds an AM/PM flag, in bold green:
+#   '%{G}%C%A'
+
+# This displays the day of the week:
+#   '%D'
+
+#This displays the date in Mon/day/year format:
+# and again I embeded a space to give me one space
+# between the text and console edge:
+#  '%M/%d/%Y '
+
+# The resultsing command give you a status line that
+#  looks like this:
+#   | Screens: 0* bash  <blanks zapped>         5:30PM  Fri, Jun/25/2004 |
+#  (The pipes indicate the edges of the xterm/console).
+
+# Green text, time, and date; windows in blue:
+#hardstatus alwayslastline "%{=b}%{kG} Screen(s): %{r}%w %=%{kG}%c  %D, %d.%m.%Y "
+
+# Green text(host), time, and date; windows in blue:
+hardstatus alwayslastline "%{=b}%{kG} [%{G}%H] Screen(s): %{r}%w %=%{kG}%c  %D, %d.%m.%Y "
+
+
+# Green text(host), time, and date; windows in blue:
+#hardstatus alwayslastline "%{=b}%{kG} [%{G}%H] Screen(s): %{r}%w ?%f%t%?(%u)%? %=%{kG}%c  %D, %d.%m.%Y "
+
+# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= #
+
+##    Some general options    ##
+
+# Turn off start message:
+startup_message off
+
+# Set messages timeout to one second:
+msgwait 1
+
+#bind t screen -t top 0 htop
+#bind v screen -t vim 1 vim
+bind r screen -t rtorrent 2 rtorrent 
+
+#screen -t zsh 0 zsh
+#screen -t zsh 1 zsh 
+#use F7 and F8 to cycle trough the windows
+bindkey -k k7 prev
+bindkey -k k8 next
+# Alt-left/right
+bindkey ^[[1;3D prev
+bindkey ^[[1;3C next
+
+bindkey ^[ö prev
+bindkey ^[ä next
+
+# vim:filetype=screen
diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim
new file mode 100644
index 0000000..8f27fb9
--- /dev/null
+++ b/vim/plugin/notmuch.vim
@@ -0,0 +1,1432 @@
+" notmuch.vim plugin --- run notmuch within vim
+"
+" Copyright © Carl Worth
+"
+" This file is part of Notmuch.
+"
+" Notmuch is free software: you can redistribute it and/or modify it
+" under the terms of the GNU General Public License as published by
+" the Free Software Foundation, either version 3 of the License, or
+" (at your option) any later version.
+"
+" Notmuch is distributed in the hope that it will be useful, but
+" WITHOUT ANY WARRANTY; without even the implied warranty of
+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+" General Public License for more details.
+"
+" You should have received a copy of the GNU General Public License
+" along with Notmuch.  If not, see <http://www.gnu.org/licenses/>.
+"
+" Authors: Bart Trojanowski <bart@jukie.net>
+" Contributors: Felipe Contreras <felipe.contreras@gmail.com>,
+"   Peter Hartman <peterjohnhartman@gmail.com>
+"
+" --- configuration defaults {{{1
+
+let s:notmuch_defaults = {
+        \ 'g:notmuch_cmd':                           'notmuch'                    ,
+        \ 'g:notmuch_sendmail':                      '/usr/sbin/sendmail'         ,
+        \ 'g:notmuch_debug':                         0                            ,
+        \
+        \ 'g:notmuch_search_newest_first':           1                            ,
+        \ 'g:notmuch_search_from_column_width':      20                           ,
+        \
+        \ 'g:notmuch_show_fold_signatures':          1                            ,
+        \ 'g:notmuch_show_fold_citations':           1                            ,
+        \ 'g:notmuch_show_fold_bodies':              0                            ,
+        \ 'g:notmuch_show_fold_headers':             1                            ,
+        \
+        \ 'g:notmuch_show_message_begin_regexp':     'message{'                ,
+        \ 'g:notmuch_show_message_end_regexp':       'message}'                ,
+        \ 'g:notmuch_show_header_begin_regexp':      'header{'                 ,
+        \ 'g:notmuch_show_header_end_regexp':        'header}'                 ,
+        \ 'g:notmuch_show_body_begin_regexp':        'body{'                   ,
+        \ 'g:notmuch_show_body_end_regexp':          'body}'                   ,
+        \ 'g:notmuch_show_attachment_begin_regexp':  'attachment{'             ,
+        \ 'g:notmuch_show_attachment_end_regexp':    'attachment}'             ,
+        \ 'g:notmuch_show_part_begin_regexp':        'part{'                   ,
+        \ 'g:notmuch_show_part_end_regexp':          'part}'                   ,
+        \ 'g:notmuch_show_marker_regexp':            '\\(message\\|header\\|body\\|attachment\\|part\\)[{}].*$',
+        \
+        \ 'g:notmuch_show_message_parse_regexp':     '\(id:[^ ]*\) depth:\([0-9]*\) match:\([0-9]*\) excluded:\([0-9]*\) filename:\(.*\)$',
+        \ 'g:notmuch_show_tags_regexp':              '(\([^)]*\))$'               ,
+        \
+        \ 'g:notmuch_show_signature_regexp':         '^\(-- \?\|_\+\)$'           ,
+        \ 'g:notmuch_show_signature_lines_max':      12                           ,
+        \
+        \ 'g:notmuch_show_citation_regexp':          '^\s*>'                      ,
+        \
+        \ 'g:notmuch_compose_insert_mode_start':     1                            ,
+        \ 'g:notmuch_compose_header_help':           1                            ,
+        \ 'g:notmuch_compose_temp_file_dir':         '~/.notmuch/compose'         ,
+        \ }
+
+" defaults for g:notmuch_initial_search_words
+" override with: let g:notmuch_initial_search_words = [ ... ]
+let s:notmuch_initial_search_words_defaults = [
+        \ 'tag:inbox and tag:unread',
+        \ ]
+
+" defaults for g:notmuch_show_headers
+" override with: let g:notmuch_show_headers = [ ... ]
+let s:notmuch_show_headers_defaults = [
+        \ 'Subject',
+        \ 'To',
+        \ 'Cc',
+        \ 'Bcc',
+        \ 'Date',
+        \ ]
+
+" defaults for g:notmuch_folders
+" override with: let g:notmuch_folders = [ ... ]
+let s:notmuch_folders_defaults = [
+        \ [ 'new',    'tag:inbox and tag:unread' ],
+        \ [ 'inbox',  'tag:inbox'                ],
+        \ [ 'unread', 'tag:unread'               ],
+        \ ]
+
+" defaults for g:notmuch_signature
+" override with: let g:notmuch_signature = [ ... ]
+let s:notmuch_signature_defaults = [
+        \ '',
+        \ '-- ',
+        \ 'email sent from notmuch.vim plugin'
+        \ ]
+
+" defaults for g:notmuch_compose_headers
+" override with: let g:notmuch_compose_headers = [ ... ]
+let s:notmuch_compose_headers_defaults = [
+        \ 'From',
+        \ 'To',
+        \ 'Cc',
+        \ 'Bcc',
+        \ 'Subject'
+        \ ]
+
+" --- keyboard mapping definitions {{{1
+
+" --- --- bindings for folders mode {{{2
+
+let g:notmuch_folders_maps = {
+        \ 'm':          ':call <SID>NM_new_mail()<CR>',
+        \ 's':          ':call <SID>NM_search_prompt()<CR>',
+        \ 'q':          ':call <SID>NM_kill_this_buffer()<CR>',
+        \ '=':          ':call <SID>NM_folders_refresh_view()<CR>',
+        \ '<Enter>':    ':call <SID>NM_folders_show_search()<CR>',
+        \ }
+
+" --- --- bindings for search screen {{{2
+let g:notmuch_search_maps = {
+        \ '<Space>':    ':call <SID>NM_search_show_thread(0)<CR>',
+        \ '<Enter>':    ':call <SID>NM_search_show_thread(1)<CR>',
+        \ '<C-]>':      ':call <SID>NM_search_expand(''<cword>'')<CR>',
+        \ 'I':          ':call <SID>NM_search_mark_read_thread()<CR>',
+        \ 'a':          ':call <SID>NM_search_archive_thread()<CR>',
+        \ 'A':          ':call <SID>NM_search_mark_read_then_archive_thread()<CR>',
+        \ 'D':          ':call <SID>NM_search_delete_thread()<CR>',
+        \ 'f':          ':call <SID>NM_search_filter()<CR>',
+        \ 'm':          ':call <SID>NM_new_mail()<CR>',
+        \ 'o':          ':call <SID>NM_search_toggle_order()<CR>',
+        \ 'r':          ':call <SID>NM_search_reply_to_thread()<CR>',
+        \ 's':          ':call <SID>NM_search_prompt()<CR>',
+        \ ',s':         ':call <SID>NM_search_edit()<CR>',
+        \ 't':          ':call <SID>NM_search_filter_by_tag()<CR>',
+        \ 'q':          ':call <SID>NM_kill_this_buffer()<CR>',
+        \ '+':          ':call <SID>NM_search_add_tags([])<CR>',
+        \ '-':          ':call <SID>NM_search_remove_tags([])<CR>',
+        \ '=':          ':call <SID>NM_search_refresh_view()<CR>',
+        \ '?':          ':echo <SID>NM_search_thread_id() . ''  @ '' . join(<SID>NM_get_search_words())<CR>',
+        \ }
+
+" --- --- bindings for show screen {{{2
+let g:notmuch_show_maps = {
+        \ '<C-P>':      ':call <SID>NM_show_previous(1, 0)<CR>',
+        \ '<C-N>':      ':call <SID>NM_show_next(1, 0)<CR>',
+        \ '<C-]>':      ':call <SID>NM_search_expand(''<cword>'')<CR>',
+        \ 'q':          ':call <SID>NM_kill_this_buffer()<CR>',
+        \ 's':          ':call <SID>NM_search_prompt()<CR>',
+        \
+        \ 'b':          ':call <SID>NM_show_fold_toggle(''b'', ''bdy'', !g:notmuch_show_fold_bodies)<CR>',
+        \ 'c':          ':call <SID>NM_show_fold_toggle(''c'', ''cit'', !g:notmuch_show_fold_citations)<CR>',
+        \ 'h':          ':call <SID>NM_show_fold_toggle(''h'', ''hdr'', !g:notmuch_show_fold_headers)<CR>',
+        \ 'i':          ':call <SID>NM_show_fold_toggle(''i'', ''sig'', !g:notmuch_show_fold_signatures)<CR>',
+        \
+        \ 'I':          ':call <SID>NM_show_mark_read_thread()<CR>',
+        \ 'a':          ':call <SID>NM_show_archive_thread()<CR>',
+        \ 'A':          ':call <SID>NM_show_mark_read_then_archive_thread()<CR>',
+        \ 'D':          ':call <SID>NM_show_delete_thread()<CR>',
+        \ 'd':          ':call <SID>NM_show_delete_message()<CR>',
+        \ 'N':          ':call <SID>NM_show_mark_read_then_next_open_message()<CR>',
+        \ 'v':          ':call <SID>NM_show_view_all_mime_parts()<CR>',
+        \ '+':          ':call <SID>NM_show_add_tag()<CR>',
+        \ '-':          ':call <SID>NM_show_remove_tag()<CR>',
+        \ '<Space>':    ':call <SID>NM_show_advance_marking_read_and_archiving()<CR>',
+        \ '\|':         ':call <SID>NM_show_pipe_message()<CR>',
+        \
+        \ '<S-Tab>':    ':call <SID>NM_show_previous_fold()<CR>',
+        \ '<Tab>':      ':call <SID>NM_show_next_fold()<CR>',
+        \ '<Enter>':    ':call <SID>NM_show_toggle_fold()<CR>',
+        \
+        \ 'r':          ':call <SID>NM_show_reply()<CR>',
+        \ 'm':          ':call <SID>NM_new_mail()<CR>',
+        \ '?':          ':echo <SID>NM_show_message_id() . ''  @ '' . join(<SID>NM_get_search_words())<CR>',
+        \ }
+
+" --- --- bindings for compose screen {{{2
+let g:notmuch_compose_nmaps = {
+        \ ',s':         ':call <SID>NM_compose_send()<CR>',
+        \ ',a':         ':call <SID>NM_compose_attach()<CR>',
+        \ ',q':         ':call <SID>NM_kill_this_buffer()<CR>',
+        \ '<Tab>':      ':call <SID>NM_compose_next_entry_area()<CR>',
+        \ }
+let g:notmuch_compose_imaps = {
+        \ '<Tab>':      '<C-r>=<SID>NM_compose_next_entry_area()<CR>',
+        \ }
+
+" --- implement folders screen {{{1
+
+function! s:NM_cmd_folders(words)
+        if len(a:words)
+                throw 'Not expecting any arguments for folders command.'
+        endif
+        let cmd = ['count']
+        let disp = []
+        let searches = []
+        for entry in g:notmuch_folders
+                let [ name, search ] = entry
+                let data = s:NM_run(cmd + [search])
+                let cnt = matchlist(data, '\(\d\+\)')[1]
+                call add(disp, printf('%9d %-20s (%s)', cnt, name, search))
+                call add(searches, search)
+        endfor
+
+        call <SID>NM_newBuffer('', 'folders', join(disp, "\n"))
+        let b:nm_searches = searches
+        let b:nm_timestamp = reltime()
+
+        call <SID>NM_cmd_folders_mksyntax()
+        call <SID>NM_set_map('n', g:notmuch_folders_maps)
+        setlocal cursorline
+        setlocal nowrap
+endfunction
+
+function! s:NM_cmd_folders_mksyntax()
+endfunction
+
+" --- --- folders screen action functions {{{2
+
+function! s:NM_folders_refresh_view()
+        let lno = line('.')
+        setlocal bufhidden=delete
+        call s:NM_cmd_folders([])
+        exec printf('norm %dG', lno)
+endfunction
+
+function! s:NM_folders_show_search()
+        let line = line('.')
+        let search = b:nm_searches[line-1]
+
+        let prev_bufnr = bufnr('%')
+        setlocal bufhidden=hide
+        call <SID>NM_cmd_search([search])
+        setlocal bufhidden=delete
+        let b:nm_prev_bufnr = prev_bufnr
+endfunction
+
+
+" --- implement search screen {{{1
+
+function! s:NM_cmd_search(words)
+        let cmd = ['search']
+        if g:notmuch_search_newest_first
+                let cmd = cmd + ['--sort=newest-first']
+        else
+                let cmd = cmd + ['--sort=oldest-first']
+        endif
+        let data = s:NM_run(cmd + a:words)
+        let lines = split(data, "\n")
+        let disp = copy(lines)
+        call map(disp, 's:NM_cmd_search_fmtline(v:val)')
+
+        call <SID>NM_newBuffer('', 'search', join(disp, "\n"))
+        let b:nm_raw_lines = lines
+        let b:nm_search_words = a:words
+
+        call <SID>NM_set_map('n', g:notmuch_search_maps)
+        setlocal cursorline
+        setlocal nowrap
+endfunction
+function! s:NM_cmd_search_fmtline(line)
+        let m = matchlist(a:line, '^\(thread:\S\+\)\s\(.\{12\}\) \[\(\d\+\)/\d\+\] \([^;]\+\); \%(\[[^\[]\+\] \)*\(.*\) (\([^(]*\))$')
+        if !len(m)
+                return 'ERROR PARSING: ' . a:line
+        endif
+        let max = g:notmuch_search_from_column_width
+        let flist = {}
+        for at in split(m[4], '[|,] ')
+                let p = split(at, '[@.]')
+                let flist[p[0]] = 1
+        endfor
+        let from = join(keys(flist), ", ")
+        return printf("%-12s %3s %-20.20s | %s (%s)", m[2], m[3], from, m[5], m[6])
+endfunction
+
+" --- --- search screen action functions {{{2
+
+function! s:NM_search_show_thread(everything)
+        let words = [ <SID>NM_search_thread_id() ]
+        if !a:everything && exists('b:nm_search_words')
+                call extend(words, ['AND', '('])
+                call extend(words, b:nm_search_words)
+                call add(words, ')')
+        endif
+        call <SID>NM_cmd_show(words)
+        let b:nm_show_everything = a:everything
+endfunction
+
+function! s:NM_search_prompt()
+        " TODO: input() can support completion
+        let text = input('NotMuch Search: ')
+        if strlen(text)
+                let tags = split(text)
+        else
+                let tags = s:notmuch_initial_search_words_defaults
+        endif
+        let prev_bufnr = bufnr('%')
+        if b:nm_type == 'search' && exists('b:nm_prev_bufnr')
+                " TODO: we intend to replace the current buffer,
+                "       ... maybe we could just clear it
+                let prev_bufnr = b:nm_prev_bufnr
+                setlocal bufhidden=delete
+        else
+                setlocal bufhidden=hide
+        endif
+        call <SID>NM_cmd_search(tags)
+        setlocal bufhidden=delete
+        let b:nm_prev_bufnr = prev_bufnr
+endfunction
+
+function! s:NM_search_edit()
+        " TODO: input() can support completion
+        let text = input('NotMuch Search: ', join(b:nm_search_words, ' '))
+        if strlen(text)
+                call <SID>NM_cmd_search(split(text))
+        endif
+endfunction
+
+function! s:NM_search_mark_read_thread()
+        call <SID>NM_tag([], ['-unread'])
+        norm j
+endfunction
+
+function! s:NM_search_archive_thread()
+        call <SID>NM_tag([], ['-inbox'])
+        norm j
+endfunction
+
+function! s:NM_search_mark_read_then_archive_thread()
+        call <SID>NM_tag([], ['-unread', '-inbox'])
+        norm j
+endfunction
+
+function! s:NM_search_delete_thread()
+        call <SID>NM_tag([], ['+delete','-inbox','-unread'])
+        norm j
+endfunction
+
+function! s:NM_search_filter()
+        call <SID>NM_search_filter_helper('Filter: ', '', '')
+endfunction
+
+function! s:NM_search_filter_by_tag()
+        call <SID>NM_search_filter_helper('Filter Tag(s): ', 'tag:', 'and')
+endfunction
+
+function! s:NM_search_filter_helper(prompt, prefix, joiner)
+        " TODO: input() can support completion
+        let text = substitute(input(a:prompt), '\v(^\s*|\s*$|\n)', '', 'g')
+        if !strlen(text)
+                return
+        endif
+
+        let tags = b:nm_search_words + ['AND']
+                 \ + <SID>NM_combine_tags(a:prefix, split(text), a:joiner, '()')
+
+        let prev_bufnr = bufnr('%')
+        setlocal bufhidden=hide
+        call <SID>NM_cmd_search(tags)
+        setlocal bufhidden=delete
+        let b:nm_prev_bufnr = prev_bufnr
+endfunction
+
+function! s:NM_search_toggle_order()
+        let g:notmuch_search_newest_first = !g:notmuch_search_newest_first
+        " FIXME: maybe this would be better done w/o reading re-reading the lines
+        "         reversing the b:nm_raw_lines and the buffer lines would be better
+        call <SID>NM_search_refresh_view()
+endfunction
+
+function! s:NM_search_reply_to_thread()
+        let cmd = ['reply']
+        call add(cmd, <SID>NM_search_thread_id())
+        call add(cmd, 'AND')
+        call extend(cmd, <SID>NM_get_search_words())
+
+        let data = <SID>NM_run(cmd)
+        let lines = split(data, "\n")
+        call <SID>NM_newComposeBuffer(lines, 0)
+endfunction
+
+function! s:NM_search_add_tags(tags)
+        call <SID>NM_search_add_remove_tags('Add Tag(s): ', '+', a:tags)
+endfunction
+
+function! s:NM_search_remove_tags(tags)
+        call <SID>NM_search_add_remove_tags('Remove Tag(s): ', '-', a:tags)
+endfunction
+
+function! s:NM_search_refresh_view()
+        let lno = line('.')
+        let prev_bufnr = b:nm_prev_bufnr
+        setlocal bufhidden=delete
+        call <SID>NM_cmd_search(b:nm_search_words)
+        let b:nm_prev_bufnr = prev_bufnr
+        " FIXME: should find the line of the thread we were on if possible
+        exec printf('norm %dG', lno)
+endfunction
+
+" --- --- search screen helper functions {{{2
+
+function! s:NM_search_thread_id()
+        if !exists('b:nm_raw_lines')
+                throw 'Eeek! no b:nm_raw_lines'
+        endif
+        let mnum = line('.') - 1
+        if len(b:nm_raw_lines) <= mnum
+                return ''
+        endif
+        let info = b:nm_raw_lines[mnum]
+        let what = split(info, '\s\+')[0]
+        return what
+endfunction
+
+function! s:NM_search_add_remove_tags(prompt, prefix, intags)
+        if type(a:intags) != type([]) || len(a:intags) == 0
+                " TODO: input() can support completion
+                let text = input(a:prompt)
+                if !strlen(text)
+                        return
+                endif
+                let tags = split(text, ' ')
+        else
+                let tags = a:intags
+        endif
+        call map(tags, 'a:prefix . v:val')
+        call <SID>NM_tag([], tags)
+endfunction
+
+" --- implement show screen {{{1
+
+function! s:NM_cmd_show(words)
+        let prev_bufnr = bufnr('%')
+        let data = s:NM_run(['show', '--entire-thread'] + a:words)
+        let lines = split(data, "\n")
+
+        let info = s:NM_cmd_show_parse(lines)
+
+        setlocal bufhidden=hide
+        call <SID>NM_newBuffer('', 'show', join(info['disp'], "\n"))
+        setlocal bufhidden=delete
+        let b:nm_search_words = a:words
+        let b:nm_raw_info = info
+        let b:nm_prev_bufnr = prev_bufnr
+
+        call <SID>NM_cmd_show_mkfolds()
+        call <SID>NM_cmd_show_mksyntax()
+        call <SID>NM_set_map('n', g:notmuch_show_maps)
+        setlocal foldtext=NM_cmd_show_foldtext()
+        setlocal fillchars=
+        setlocal foldcolumn=6
+
+endfunction
+
+function! s:NM_show_previous(can_change_thread, find_matching)
+        let everything = exists('b:nm_show_everything') ? b:nm_show_everything : 0
+        let info = b:nm_raw_info
+        let lnum = line('.')
+        for msg in reverse(copy(info['msgs']))
+                if a:find_matching && msg['match'] == '0'
+                        continue
+                endif
+                if lnum <= msg['start']
+                        continue
+                endif
+
+                exec printf('norm %dGzt', msg['start'])
+                " TODO: try to fit the message on screen
+                return
+        endfor
+        if !a:can_change_thread
+                return
+        endif
+        call <SID>NM_kill_this_buffer()
+        if line('.') > 1
+                norm k
+                call <SID>NM_search_show_thread(everything)
+                norm G
+                call <SID>NM_show_previous(0, a:find_matching)
+        else
+                echo 'No more messages.'
+        endif
+endfunction
+
+function! s:NM_show_next(can_change_thread, find_matching)
+        let info = b:nm_raw_info
+        let lnum = line('.')
+        for msg in info['msgs']
+                if a:find_matching && msg['match'] == '0'
+                        continue
+                endif
+                if lnum >= msg['start']
+                        continue
+                endif
+
+                exec printf('norm %dGzt', msg['start'])
+                " TODO: try to fit the message on screen
+                return
+        endfor
+        if a:can_change_thread
+                call <SID>NM_show_next_thread()
+        endif
+endfunction
+
+function! s:NM_show_next_thread()
+        let everything = exists('b:nm_show_everything') ? b:nm_show_everything : 0
+        call <SID>NM_kill_this_buffer()
+        if line('.') != line('$')
+                norm j
+                call <SID>NM_search_show_thread(everything)
+        else
+                echo 'No more messages.'
+        endif
+endfunction
+
+function! s:NM_show_mark_read_thread()
+        call <SID>NM_tag(b:nm_search_words, ['-unread'])
+        call <SID>NM_show_next_thread()
+endfunction
+
+function! s:NM_show_archive_thread()
+        call <SID>NM_tag(b:nm_search_words, ['-inbox'])
+        call <SID>NM_show_next_thread()
+endfunction
+
+function! s:NM_show_mark_read_then_archive_thread()
+        call <SID>NM_tag(b:nm_search_words, ['-unread', '-inbox'])
+        call <SID>NM_show_next_thread()
+endfunction
+
+function! s:NM_show_delete_thread()
+        call <SID>NM_tag(b:nm_search_words, ['+delete', '-inbox', '-unread'])
+        call <SID>NM_show_next_thread()
+endfunction
+
+function! s:NM_show_delete_message()
+        let msg = <SID>NM_show_get_message_for_line(line('.'))
+        call <SID>NM_tag([msg['id']], ['+delete', '-inbox', '-unread'])
+endfunction
+
+function! s:NM_show_mark_read_then_next_open_message()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_previous_message()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_reply()
+        let cmd = ['reply']
+        call add(cmd, <SID>NM_show_message_id())
+        call add(cmd, 'AND')
+        call extend(cmd, <SID>NM_get_search_words())
+
+        let data = <SID>NM_run(cmd)
+        let lines = split(data, "\n")
+        call <SID>NM_newComposeBuffer(lines, 0)
+endfunction
+
+function! s:NM_show_view_all_mime_parts()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_view_raw_message()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_add_tag()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_remove_tag()
+        echo 'not implemented'
+endfunction
+
+" if entire message is not visible scroll down 1/2 page or less to get to the bottom of message
+" otherwise go to next message
+" any message that is viewed entirely has inbox and unread tags removed
+function! s:NM_show_advance_marking_read_and_archiving()
+        let advance_tags = ['unread', 'inbox']
+
+        let vis_top = line('w0')
+        let vis_bot = line('w$')
+
+        let msg_top = <SID>NM_show_get_message_for_line(vis_top)
+        if !has_key(msg_top,'id')
+                throw "No top visible message."
+        endif
+
+        " if the top message is the last message, just expunge the entire thread and move on
+        if msg_top['end'] == line('$')
+                let ids = []
+                for msg in b:nm_raw_info['msgs']
+                        if has_key(msg,'match') && msg['match'] != '0'
+                                call add(ids, msg['id'])
+                        endif
+                endfor
+                let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')
+                         \ + ['AND']
+                         \ + <SID>NM_combine_tags('', ids, 'OR', '()')
+                call map(advance_tags, '"-" . v:val')
+                call <SID>NM_tag(filter, advance_tags)
+                call <SID>NM_show_next(1, 1)
+                return
+        endif
+
+        let msg_bot = <SID>NM_show_get_message_for_line(vis_bot)
+        if !has_key(msg_bot,'id')
+                throw "No bottom visible message."
+        endif
+
+        " if entire message fits on the screen, read/archive it, move to the next one
+        if msg_top['id'] != msg_bot['id'] || msg_top['end'] <= vis_bot
+                exec printf('norm %dG', vis_top)
+                call <SID>NM_show_next(0, 1)
+                if has_key(msg_top,'match') && msg_top['match'] != '0'
+                        redraw
+                        " do this last to hide the latency
+                        let filter = <SID>NM_combine_tags('tag:', advance_tags, 'OR', '()')
+                                 \ + ['AND', msg_top['id']]
+                        call map(advance_tags, '"-" . v:val')
+                        call <SID>NM_tag(filter, advance_tags)
+                endif
+                return
+        endif
+
+        " entire message does not fit on the screen, scroll down to bottom, max 1/2 screen
+        let jmp = winheight(winnr()) / 2
+        let max = msg_bot['end'] - vis_bot
+        if jmp > max
+                let jmp = max
+        endif
+        exec printf('norm %dGzt', vis_top + jmp)
+        return
+endfunction
+
+function! s:NM_show_pipe_message()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_previous_fold()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_next_fold()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_show_toggle_fold()
+        echo 'not implemented'
+endfunction
+
+
+" --- --- show screen helper functions {{{2
+
+function! s:NM_show_get_message_for_line(line)
+        for msg in b:nm_raw_info['msgs']
+                if a:line > msg['end']
+                        continue
+                endif
+                return msg
+        endfor
+        return {}
+endfunction
+
+function! s:NM_show_message_id()
+        if !exists('b:nm_raw_info')
+                throw 'Eeek! no b:nm_raw_info'
+        endif
+        let msg = <SID>NM_show_get_message_for_line(line('.'))
+        if has_key(msg,'id')
+                return msg['id']
+        endif
+        return ''
+endfunction
+
+function! s:NM_show_fold_toggle(key, type, fold)
+        let info = b:nm_raw_info
+        let act = 'open'
+        if a:fold
+                let act = 'close'
+        endif
+        for fld in info['folds']
+                if fld[0] != a:type
+                        continue
+                endif
+                "let idx = fld[3]
+                "let msg = info['msgs'][idx]
+                "if has_key(msg,'match') && msg['match'] == '0'
+                "        continue
+                "endif
+                let cls = foldclosed(fld[1])
+                if cls != -1 && cls != fld[1]
+                        continue
+                endif
+                exec printf('%dfold%s', fld[1], act)
+        endfor
+        exec printf('nnoremap <buffer> %s :call <SID>NM_show_fold_toggle(''%s'', ''%s'', %d)<CR>', a:key, a:key, a:type, !a:fold)
+endfunction
+
+
+" s:NM_cmd_show_parse returns the following dictionary:
+"    'disp':     lines to display
+"    'msgs':     message info dicts { start, end, id, depth, filename, descr, header }
+"    'folds':    fold info arrays [ type, start, end ]
+"    'foldtext': fold text indexed by start line
+function! s:NM_cmd_show_parse(inlines)
+        let info = { 'disp': [],       
+                   \ 'msgs': [],       
+                   \ 'folds': [],      
+                   \ 'foldtext': {} }  
+        let msg = {}
+        let hdr = {}
+
+        let in_message = 0
+        let in_header = 0
+        let in_body = 0
+        let in_part = ''
+
+        let body_start = -1
+        let part_start = -1
+
+        let mode_type = ''
+        let mode_start = -1
+
+        let inlnum = 0
+        for line in a:inlines
+                let inlnum = inlnum + 1
+                let foldinfo = []
+
+                if strlen(in_part)
+                        let part_end = 0
+
+                        if match(line, g:notmuch_show_part_end_regexp) != -1
+                                let part_end = len(info['disp'])
+                        else
+                                call add(info['disp'], line)
+                        endif
+
+                        if in_part == 'text/plain'
+                                if !part_end && mode_type == ''
+                                        if match(line, g:notmuch_show_signature_regexp) != -1
+                                                let mode_type = 'sig'
+                                                let mode_start = len(info['disp'])
+                                        elseif match(line, g:notmuch_show_citation_regexp) != -1
+                                                let mode_type = 'cit'
+                                                let mode_start = len(info['disp'])
+                                        endif
+                                elseif mode_type == 'cit'
+                                        if part_end || match(line, g:notmuch_show_citation_regexp) == -1
+                                                let outlnum = len(info['disp'])
+                                                if !part_end
+                                                        let outlnum = outlnum - 1
+                                                endif
+                                                let foldinfo = [ mode_type, mode_start, outlnum, len(info['msgs']),
+                                                               \ printf('[ %d-line citation.  Press "c" to show. ]', 1 + outlnum - mode_start) ]
+                                                let mode_type = ''
+                                        endif
+                                elseif mode_type == 'sig'
+                                        let outlnum = len(info['disp'])
+                                        if (outlnum - mode_start) > g:notmuch_show_signature_lines_max
+                                                let mode_type = ''
+                                        elseif part_end
+                                                let foldinfo = [ mode_type, mode_start, outlnum, len(info['msgs']),
+                                                               \ printf('[ %d-line signature.  Press "i" to show. ]', 1 + outlnum - mode_start) ]
+                                                let mode_type = ''
+                                        endif
+                                endif
+                        endif
+
+                        if part_end
+                                " FIXME: this is a hack for handling two folds being added for one line
+                                "         we should handle adding a fold in a function
+                                if len(foldinfo) && foldinfo[1] < foldinfo[2]
+                                        call add(info['folds'], foldinfo[0:3])
+                                        let info['foldtext'][foldinfo[1]] = foldinfo[4]
+                                endif
+
+                                let foldinfo = [ 'text', part_start, part_end, len(info['msgs']),
+                                               \ printf('[ %d-line %s.  Press "p" to show. ]', part_end - part_start, in_part) ]
+                                let in_part = ''
+                                call add(info['disp'], '')
+                        endif
+
+                elseif in_body
+                        if !has_key(msg,'body_start')
+                                let msg['body_start'] = len(info['disp']) + 1
+                        endif
+                        if match(line, g:notmuch_show_body_end_regexp) != -1
+                                let body_end = len(info['disp'])
+                                let foldinfo = [ 'bdy', body_start, body_end, len(info['msgs']),
+                                               \ printf('[ BODY %d - %d lines ]', len(info['msgs']), body_end - body_start) ]
+
+                                let in_body = 0
+
+                        elseif match(line, g:notmuch_show_part_begin_regexp) != -1
+                                let m = matchlist(line, 'ID: \(\d\+\), Content-type: \(\S\+\)')
+                                let in_part = 'unknown'
+                                if len(m)
+                                        let in_part = m[2]
+                                endif
+                                call add(info['disp'],
+                                         \ printf('--- %s ---', in_part))
+                                " We don't yet handle nested parts, so pop
+                                " multipart/* immediately so text/plain
+                                " sub-parts are parsed properly
+                                if match(in_part, '^multipart/') != -1
+                                        let in_part = ''
+                                else
+                                        let part_start = len(info['disp']) + 1
+                                endif
+                        endif
+
+                elseif in_header
+                        if in_header == 1
+                                let msg['descr'] = line
+                                call add(info['disp'], line)
+                                let in_header = 2
+                                let msg['hdr_start'] = len(info['disp']) + 1
+
+                        else
+                                if match(line, g:notmuch_show_header_end_regexp) != -1
+                                        let hdr_start = msg['hdr_start']+1
+                                        let hdr_end = len(info['disp'])
+                                        let foldinfo = [ 'hdr', hdr_start, hdr_end, len(info['msgs']),
+                                               \ printf('[ %d-line headers.  Press "h" to show. ]', hdr_end + 1 - hdr_start) ]
+                                        let msg['header'] = hdr
+                                        let in_header = 0
+                                        let hdr = {}
+                                else
+                                        let m = matchlist(line, '^\(\w\+\):\s*\(.*\)$')
+                                        if len(m)
+                                                let hdr[m[1]] = m[2]
+                                                if match(g:notmuch_show_headers, m[1]) != -1
+                                                        call add(info['disp'], line)
+                                                endif
+                                        endif
+                                endif
+                        endif
+
+                elseif in_message
+                        if match(line, g:notmuch_show_message_end_regexp) != -1
+                                let msg['end'] = len(info['disp'])
+                                call add(info['disp'], '')
+
+                                let foldinfo = [ 'msg', msg['start'], msg['end'], len(info['msgs']),
+                                               \ printf('[ MSG %d - %s ]', len(info['msgs']), msg['descr']) ]
+
+                                call add(info['msgs'], msg)
+                                let msg = {}
+                                let in_message = 0
+                                let in_header = 0
+                                let in_body = 0
+                                let in_part = ''
+
+                        elseif match(line, g:notmuch_show_header_begin_regexp) != -1
+                                let in_header = 1
+                                continue
+
+                        elseif match(line, g:notmuch_show_body_begin_regexp) != -1
+                                let body_start = len(info['disp']) + 1
+                                let in_body = 1
+                                continue
+                        endif
+
+                else
+                        if match(line, g:notmuch_show_message_begin_regexp) != -1
+                                let msg['start'] = len(info['disp']) + 1
+
+                                let m = matchlist(line, g:notmuch_show_message_parse_regexp)
+                                if len(m)
+                                        let msg['id'] = m[1]
+                                        let msg['depth'] = m[2]
+                                        let msg['match'] = m[3]
+                                        let msg['excluded'] = m[4]
+                                        let msg['filename'] = m[5]
+                                endif
+
+                                let in_message = 1
+                        endif
+                endif
+
+                if len(foldinfo) && foldinfo[1] < foldinfo[2]
+                        call add(info['folds'], foldinfo[0:3])
+                        let info['foldtext'][foldinfo[1]] = foldinfo[4]
+                endif
+        endfor
+        return info
+endfunction
+
+function! s:NM_cmd_show_mkfolds()
+        let info = b:nm_raw_info
+
+        for afold in info['folds']
+                exec printf('%d,%dfold', afold[1], afold[2])
+                let state = 'open'
+                if (afold[0] == 'sig' && g:notmuch_show_fold_signatures)
+                 \ || (afold[0] == 'cit' && g:notmuch_show_fold_citations)
+                 \ || (afold[0] == 'bdy' && g:notmuch_show_fold_bodies)
+                 \ || (afold[0] == 'hdr' && g:notmuch_show_fold_headers)
+                        let state = 'close'
+                elseif afold[0] == 'msg'
+                        let idx = afold[3]
+                        let msg = info['msgs'][idx]
+                        if has_key(msg,'match') && msg['match'] == '0'
+                                let state = 'close'
+                        endif
+                endif
+                exec printf('%dfold%s', afold[1], state)
+        endfor
+endfunction
+
+function! s:NM_cmd_show_mksyntax()
+        let info = b:nm_raw_info
+        let cnt = 0
+        for msg in info['msgs']
+                let cnt = cnt + 1
+                let start = msg['start']
+                let hdr_start = msg['hdr_start']
+                let body_start = msg['body_start']
+                let end = msg['end']
+                exec printf('syntax region nmShowMsg%dDesc start=''\%%%dl'' end=''\%%%dl'' contains=@nmShowMsgDesc', cnt, start, start+1)
+                exec printf('syntax region nmShowMsg%dHead start=''\%%%dl'' end=''\%%%dl'' contains=@nmShowMsgHead', cnt, hdr_start, body_start)
+                exec printf('syntax region nmShowMsg%dBody start=''\%%%dl'' end=''\%%%dl'' contains=@nmShowMsgBody', cnt, body_start, end)
+        endfor
+endfunction
+
+function! NM_cmd_show_foldtext()
+        let foldtext = b:nm_raw_info['foldtext']
+        return foldtext[v:foldstart]
+endfunction
+
+
+" --- implement compose screen {{{1
+
+function! s:NM_cmd_compose(words, body_lines)
+        let lines = []
+        let start_on_line = 0
+
+        let hdrs = { }
+        for word in a:words
+                let m = matchlist(word, '^\(\w[^:]*\):\s*\(.*\)\s*$')
+                if !len(m)
+                        throw 'Eeek! bad parameter ''' . string(word) . ''''
+                endif
+                let key = substitute(m[1], '\<\w', '\U&', 'g')
+                if !has_key(hdrs, key)
+                        let hdrs[key] = []
+                endif
+                if strlen(m[2])
+                        call add(hdrs[key], m[2])
+                endif
+        endfor
+
+        if !has_key(hdrs, 'From') || !len(hdrs['From'])
+                let me = <SID>NM_compose_get_user_email()
+                let hdrs['From'] = [ me ]
+        endif
+
+        for key in g:notmuch_compose_headers
+                let text = has_key(hdrs, key) ? join(hdrs[key], ', ') : ''
+                call add(lines, key . ': ' . text)
+                if !start_on_line && !strlen(text)
+                        let start_on_line = len(lines)
+                endif
+        endfor
+
+        for [key,val] in items(hdrs)
+                if match(g:notmuch_compose_headers, key) == -1
+                        let line = key . ': ' . join(val, ', ')
+                        call add(lines, line)
+                endif
+        endfor
+
+        call add(lines, '')
+        if !start_on_line
+                let start_on_line = len(lines) + 1
+        endif
+
+        if len(a:body_lines)
+                call extend(lines, a:body_lines)
+        else
+                call extend(lines, [ '', '' ])
+        endif
+
+        call <SID>NM_newComposeBuffer(lines, start_on_line)
+endfunction
+
+function! s:NM_compose_send()
+        call <SID>NM_assert_buffer_type('compose')
+        let fname = expand('%')
+        let lnum = 1
+        let line = getline(lnum)
+        let lst_hdr = ''
+        while match(line, '^$') == -1
+                if !exists("hdr_starts") && match(line, '^Notmuch-Help:') == -1
+                        let hdr_starts = lnum - 1
+                endif
+                let lnum = lnum + 1
+                let line = getline(lnum)
+        endwhile
+        let body_starts = lnum - 1
+
+        call append(body_starts, 'Date: ' . strftime('%a, %d %b %Y %H:%M:%S %z'))
+        exec printf(':0,%dd', hdr_starts)
+        write
+
+        let line = getline(1)
+        let m = matchlist(line, '^From:\s*\(.*\)\s*<\(.*\)>$')
+        if (len(m) >= 2)
+                let from = m[2]
+        else
+                let m = matchlist(line, '^From:\s*\(.*\)$')
+                let from = m[1]
+        endif
+
+        let cmdtxt = g:notmuch_sendmail . ' -t -f ' . from . ' < ' . fname
+        let out = system(cmdtxt)
+        let err = v:shell_error
+        if err
+                undo
+                write
+                call <SID>NM_newBuffer('new', 'error',
+                            \ "While running...\n" .
+                            \ '  ' . cmdtxt . "\n" .
+                            \ "\n" .
+                            \ "Failed with...\n" .
+                            \ substitute(out, '^', '  ', 'g'))
+                echohl Error
+                echo 'Eeek! unable to send mail'
+                echohl None
+                return
+        endif
+
+        if !exists('b:nm_prev_bufnr')
+                bdelete
+        else
+                let prev_bufnr = b:nm_prev_bufnr
+                bdelete
+                if prev_bufnr == bufnr('%')
+                        exec printf("buffer %d", prev_bufnr)
+                endif
+        endif
+        call delete(fname)
+        echo 'Mail sent successfully.'
+endfunction
+
+function! s:NM_compose_attach()
+        echo 'not implemented'
+endfunction
+
+function! s:NM_compose_next_entry_area()
+        let lnum = line('.')
+        let hdr_end = <SID>NM_compose_find_line_match(1,'^$',1)
+        if lnum < hdr_end
+                let lnum = lnum + 1
+                let line = getline(lnum)
+                if match(line, '^\([^:]\+\):\s*$') == -1
+                        call cursor(lnum, strlen(line) + 1)
+                        return ''
+                endif
+                while match(getline(lnum+1), '^\s') != -1
+                        let lnum = lnum + 1
+                endwhile
+                call cursor(lnum, strlen(getline(lnum)) + 1)
+                return ''
+
+        elseif lnum == hdr_end
+                call cursor(lnum+1, strlen(getline(lnum+1)) + 1)
+                return ''
+        endif
+        if mode() == 'i'
+                if !getbufvar(bufnr('.'), '&et')
+                        return "\t"
+                endif
+		let space = ''
+		let shiftwidth = a:shiftwidth
+		let shiftwidth = shiftwidth - ((virtcol('.')-1) % shiftwidth)
+                " we assume no one has shiftwidth set to more than 40 :)
+                return '                                        '[0:shiftwidth]
+        endif
+endfunction
+
+" --- --- compose screen helper functions {{{2
+
+function! s:NM_compose_get_user_email()
+        " TODO: do this properly (still), i.e., allow for multiple email accounts
+        let email = substitute(system('notmuch config get user.primary_email'), '\v(^\s*|\s*$|\n)', '', 'g')
+	return email
+endfunction
+
+function! s:NM_compose_find_line_match(start, pattern, failure)
+        let lnum = a:start
+        let lend = line('$')
+        while lnum < lend
+                if match(getline(lnum), a:pattern) != -1
+                        return lnum
+                endif
+                let lnum = lnum + 1
+        endwhile
+        return a:failure
+endfunction
+
+
+" --- notmuch helper functions {{{1
+
+function! s:NM_newBuffer(how, type, content)
+        if strlen(a:how)
+                exec a:how
+        else
+                enew
+        endif
+        setlocal buftype=nofile readonly modifiable scrolloff=0 sidescrolloff=0
+        silent put=a:content
+        keepjumps 0d
+        setlocal nomodifiable
+        execute printf('set filetype=notmuch-%s', a:type)
+        execute printf('set syntax=notmuch-%s', a:type)
+        let b:nm_type = a:type
+endfunction
+
+function! s:NM_newFileBuffer(fdir, fname, type, lines)
+        let fdir = expand(a:fdir)
+        if !isdirectory(fdir)
+                call mkdir(fdir, 'p')
+        endif
+        let file_name = <SID>NM_mktemp(fdir, a:fname)
+        if writefile(a:lines, file_name)
+                throw 'Eeek! couldn''t write to temporary file ' . file_name
+        endif
+        exec printf('edit %s', file_name)
+        setlocal buftype= noreadonly modifiable scrolloff=0 sidescrolloff=0
+        execute printf('set filetype=notmuch-%s', a:type)
+        execute printf('set syntax=notmuch-%s', a:type)
+        let b:nm_type = a:type
+endfunction
+
+function! s:NM_newComposeBuffer(lines, start_on_line)
+        let lines = a:lines
+        let start_on_line = a:start_on_line
+        let real_hdr_start = 1
+        if g:notmuch_compose_header_help
+                let help_lines = [
+                  \ 'Notmuch-Help: Type in your message here; to help you use these bindings:',
+                  \ 'Notmuch-Help:   ,a    - attach a file',
+                  \ 'Notmuch-Help:   ,s    - send the message (Notmuch-Help lines will be removed)',
+                  \ 'Notmuch-Help:   ,q    - abort the message',
+                  \ 'Notmuch-Help:   <Tab> - skip through header lines',
+                  \ ]
+                call extend(lines, help_lines, 0)
+                let real_hdr_start = len(help_lines)
+                if start_on_line > 0
+                        let start_on_line = start_on_line + len(help_lines)
+                endif
+        endif
+        call extend(lines, g:notmuch_signature)
+
+
+        let prev_bufnr = bufnr('%')
+        setlocal bufhidden=hide
+        call <SID>NM_newFileBuffer(g:notmuch_compose_temp_file_dir, '%s.mail',
+                                  \ 'compose', lines)
+        setlocal bufhidden=hide
+        let b:nm_prev_bufnr = prev_bufnr
+
+        call <SID>NM_set_map('n', g:notmuch_compose_nmaps)
+        call <SID>NM_set_map('i', g:notmuch_compose_imaps)
+
+        if start_on_line > 0 && start_on_line <= len(lines)
+                call cursor(start_on_line, strlen(getline(start_on_line)) + 1)
+        else
+                call cursor(real_hdr_start, strlen(getline(real_hdr_start)) + 1)
+                call <SID>NM_compose_next_entry_area()
+        endif
+
+        if g:notmuch_compose_insert_mode_start
+                startinsert!
+        endif
+        echo 'Type your message, use <TAB> to jump to next header and then body.'
+endfunction
+
+function! s:NM_assert_buffer_type(type)
+        if !exists('b:nm_type') || b:nm_type != a:type
+                throw printf('Eeek! expected type %s, but got %s.', a:type,
+                            \ exists(b:nm_type) ? b:nm_type : 'something else')
+        endif
+endfunction
+
+function! s:NM_mktemp(dir, name)
+        let time_stamp = strftime('%Y%m%d-%H%M%S')
+        let file_name = substitute(a:dir,'/*$','/','') . printf(a:name, time_stamp)
+        " TODO: check if it exists, try again
+        return file_name
+endfunction
+
+function! s:NM_shell_escape(word)
+        " TODO: use shellescape()
+        let word = substitute(a:word, '''', '\\''', 'g')
+        return '''' . word . ''''
+endfunction
+
+" this function was taken from git.vim, then fixed up
+" http://github.com/motemen/git-vim
+function! s:NM_shell_split(cmd)
+        let l:split_cmd = []
+        let cmd = a:cmd
+        let iStart = 0
+        while 1
+                let t = match(cmd, '\S', iStart)
+                if t < iStart
+                        break
+                endif
+                let iStart = t
+
+                let iSpace = match(cmd, '\v(\s|$)', iStart)
+                if iSpace < iStart
+                        break
+                endif
+
+                let iQuote1 = match(cmd, '\(^["'']\|[^\\]\@<=["'']\)', iStart)
+                if iQuote1 > iSpace || iQuote1 < iStart
+                        let iEnd = iSpace - 1
+                        let l:split_cmd += [ cmd[iStart : iEnd] ]
+                else
+                        let q = cmd[iQuote1]
+                        let iQuote2 = match(cmd, '[^\\]\@<=[' . q . ']', iQuote1 + 1)
+                        if iQuote2 < iQuote1
+                                throw 'No matching ' . q . ' quote'
+                        endif
+                        let iEnd = iQuote2
+                        let l:split_cmd += [ cmd[iStart+1 : iEnd-1 ] ]
+                endif
+
+
+                let iStart = iEnd + 1
+        endwhile
+
+        return l:split_cmd
+endfunction
+
+
+function! s:NM_run(args)
+        let words = a:args
+        call map(words, 's:NM_shell_escape(v:val)')
+        let cmd = g:notmuch_cmd . ' ' . join(words) . '< /dev/null'
+
+        if exists('g:notmuch_debug') && g:notmuch_debug
+                let start = reltime()
+                let out = system(cmd)
+                let err = v:shell_error
+                let delta = reltime(start)
+
+                echo printf('[%s] {%s} %s', reltimestr(delta), string(err), string(cmd))
+        else
+                let out = system(cmd)
+                let err = v:shell_error
+        endif
+
+        if err
+                echohl Error
+                echo substitute(out, '\n*$', '', '')
+                echohl None
+                return ''
+        else
+                return out
+        endif
+endfunction
+
+" --- external mail handling helpers {{{1
+
+function! s:NM_new_mail()
+        call <SID>NM_cmd_compose([], [])
+endfunction
+
+" --- tag manipulation helpers {{{1
+
+" used to combine an array of words with prefixes and separators
+" example:
+"     NM_combine_tags('tag:', ['one', 'two', 'three'], 'OR', '()')
+"  -> ['(', 'tag:one', 'OR', 'tag:two', 'OR', 'tag:three', ')']
+function! s:NM_combine_tags(word_prefix, words, separator, brackets)
+        let res = []
+        for word in a:words
+                if len(res) && strlen(a:separator)
+                        call add(res, a:separator)
+                endif
+                call add(res, a:word_prefix . word)
+        endfor
+        if len(res) > 1 && strlen(a:brackets)
+                if strlen(a:brackets) != 2
+                        throw 'Eeek! brackets arg to NM_combine_tags must be 2 chars'
+                endif
+                call insert(res, a:brackets[0])
+                call add(res, a:brackets[1])
+        endif
+        return res
+endfunction
+
+" --- other helpers {{{1
+
+function! s:NM_get_search_words()
+        if !exists('b:nm_search_words')
+                throw 'Eeek! no b:nm_search_words'
+        endif
+        return b:nm_search_words
+endfunction
+
+function! s:NM_kill_this_buffer()
+        if exists('b:nm_prev_bufnr')
+                let prev_bufnr = b:nm_prev_bufnr
+                bdelete!
+                exec printf("buffer %d", prev_bufnr)
+        else
+                echo "This is the last buffer; use :q<CR> to quit."
+        endif
+endfunction
+
+function! s:NM_search_expand(arg)
+        let word = expand(a:arg)
+        let prev_bufnr = bufnr('%')
+        setlocal bufhidden=hide
+        call <SID>NM_cmd_search([word])
+        setlocal bufhidden=delete
+        let b:nm_prev_bufnr = prev_bufnr
+endfunction
+
+function! s:NM_tag(filter, tags)
+        let filter = len(a:filter) ? a:filter : [<SID>NM_search_thread_id()]
+        if !len(filter)
+                throw 'Eeek! I couldn''t find the thread id!'
+        endif
+        let args = ['tag']
+        call extend(args, a:tags)
+        call add(args, '--')
+        call extend(args, filter)
+        " TODO: handle errors
+        call <SID>NM_run(args)
+endfunction
+
+" --- process and set the defaults {{{1
+
+function! NM_set_defaults(force)
+        for [key, dflt] in items(s:notmuch_defaults)
+                let cmd = ''
+                if !a:force && exists(key) && type(dflt) == type(eval(key))
+                        continue
+                elseif type(dflt) == type(0)
+                        let cmd = printf('let %s = %d', key, dflt)
+                elseif type(dflt) == type('')
+                        let cmd = printf('let %s = ''%s''', key, dflt)
+                " FIXME: not sure why this didn't work when dflt is an array
+                "elseif type(dflt) == type([])
+                "        let cmd = printf('let %s = %s', key, string(dflt))
+                else
+                        echoe printf('E: Unknown type in NM_set_defaults(%d) using [%s,%s]',
+                                                \ a:force, key, string(dflt))
+                        continue
+                endif
+                exec cmd
+        endfor
+endfunction
+call NM_set_defaults(0)
+
+" for some reason NM_set_defaults() didn't work for arrays...
+if !exists('g:notmuch_show_headers')
+        let g:notmuch_show_headers = s:notmuch_show_headers_defaults
+endif
+if !exists('g:notmuch_initial_search_words')
+        let g:notmuch_initial_search_words = s:notmuch_initial_search_words_defaults
+endif
+if !exists('g:notmuch_folders')
+        let g:notmuch_folders = s:notmuch_folders_defaults
+endif
+
+if !exists('g:notmuch_signature')
+        let g:notmuch_signature = s:notmuch_signature_defaults
+endif
+if !exists('g:notmuch_compose_headers')
+        let g:notmuch_compose_headers = s:notmuch_compose_headers_defaults
+endif
+
+" --- assign keymaps {{{1
+
+function! s:NM_set_map(type, maps)
+        nmapclear
+        for [key, code] in items(a:maps)
+                exec printf('%snoremap <buffer> %s %s', a:type, key, code)
+        endfor
+        " --- this is a hack for development :)
+        nnoremap ,nmr :runtime! plugin/notmuch.vim<CR>
+endfunction
+
+" --- command handler {{{1
+
+function! NotMuch(args)
+        let args = a:args
+        if !strlen(args)
+                let args = 'folders'
+        endif
+
+        let words = <SID>NM_shell_split(args)
+        if words[0] == 'folders' || words[0] == 'f'
+                let words = words[1:]
+                call <SID>NM_cmd_folders(words)
+
+        elseif words[0] == 'search' || words[0] == 's'
+                if len(words) > 1
+                        let words = words[1:]
+                elseif exists('b:nm_search_words')
+                        let words = b:nm_search_words
+                else
+                        let words = g:notmuch_initial_search_words
+                endif
+                call <SID>NM_cmd_search(words)
+
+        elseif words[0] == 'show'
+                echoe 'show is not yet implemented.'
+
+        elseif words[0] == 'new' || words[0] == 'compose'
+                let words = words[1:]
+                call <SID>NM_cmd_compose(words, [])
+        endif
+endfunction
+function! CompleteNotMuch(arg_lead, cmd_line, cursor_pos)
+        return []
+endfunction
+
+
+" --- glue {{{1
+
+command! -nargs=* -complete=customlist,CompleteNotMuch NotMuch call NotMuch(<q-args>)
+cabbrev  notmuch <c-r>=(getcmdtype()==':' && getcmdpos()==1 ? 'NotMuch' : 'notmuch')<CR>
+
+" vim: set ft=vim ts=8 sw=8 et foldmethod=marker :
diff --git a/vim/syntax/i3.vim b/vim/syntax/i3.vim
new file mode 100644
index 0000000..e5c4544
--- /dev/null
+++ b/vim/syntax/i3.vim
@@ -0,0 +1,93 @@
+" Vim syntax file
+" Language: i3-wm config file
+" Maintainer: David Pugnasse
+" Latest Revision: 24 August 2011
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" Symbols
+syn match   i3Operators "+\|→"
+syn match   i3ChainDelimiter ";"
+
+syn match   i3Var "\$\w\+"
+
+" Strings
+syn region  i3SimpleString keepend start='[^ \t]' end='$\|;' contained contains=i3ChainDelimiter,i3Var
+syn match   i3QuotedString '"[^"]\+"' contained
+syn cluster i3String contains=i3SimpleString,i3QuotedString
+
+" Config keywords
+syn keyword i3ConfigCommand bind bindcode bindsym assign new_window popup_during_fullscreen font floating_modifier default_orientation workspace_layout for_window focus_folows_mouse
+syn match   i3IpcSocket "ipc-socket" nextgroup=@i3String skipwhite
+
+" Key modifiers
+syn keyword i3KeyModifier Shift Control Mod1 Mod2 Mod3 Mod4 Mod5
+
+" Command keywords
+syn keyword i3Command exit reload restart kill window fullscreen global layout border focus move open split append_layout mark resize grow shrink restore
+syn keyword i3Param 1pixel default stacked tabbed normal none tiling stacking floating enable disable up down horizontal vertical up down left right parent child px or ppt leave_fullscreen toggle mode_toggle
+syn keyword i3WsSpecialParam next prev
+
+" Commands
+syn region  i3ExecCommand keepend start='[^ \t]' end='$\|;' contained contains=i3ChainDelimiter,i3Var
+syn match   i3QuotedExecCommand '"[^"]\+"' contained
+syn keyword i3ExecKeyword exec exec_always nextgroup=i3QuotedExecCommand,i3ExecCommand skipwhite
+
+" Font statement
+syn keyword i3FontStatement font nextgroup=@i3String skipwhite
+
+" Set statement
+syn match   i3SetVar "\$\w\+" contained nextgroup=@i3String skipwhite
+syn keyword i3SetKeyword set nextgroup=i3SetVar skipwhite
+
+" Workspaces
+syn keyword i3WsKeyword workspace nextgroup=i3WsSpecialParam,@i3String skipwhite
+
+" Mode
+syn keyword i3ModeKeyword mode nextgroup=@i3String skipwhite
+
+" Comments
+syn keyword i3Todo contained TODO FIXME XXX NOTE
+syn match   i3Comment "#.*$" contains=i3Todo
+
+" Hex color code
+syn match i3Color "#[0-9a-fA-F]\{6\}" contained nextgroup=i3Color skipwhite
+syn match i3ColorDef "client\.\(focused_inactive\|focused\|unfocused\|urgent\|background\)" nextgroup=i3Color skipwhite
+
+highlight link i3ChainDelimiter    Operator
+highlight link i3Operators         Operator
+
+highlight link i3ExecCommand       Special
+highlight link i3QuotedExecCommand Special
+
+highlight link i3Param             Constant
+highlight link i3Color             Constant
+highlight link i3WsSpecialParam    Constant
+
+highlight link i3Var               Identifier
+highlight link i3SetVar            Identifier
+
+highlight link i3KeyModifier       Function
+
+highlight link i3SimpleString      String
+highlight link i3QuotedString      String
+highlight link i3WsName            String
+highlight link i3QuotedWsName      String
+highlight link i3SetValue          String
+highlight link i3Font              String
+
+highlight link i3ExecKeyword       Keyword
+highlight link i3Command           Keyword
+highlight link i3WsKeyword         Keyword
+
+highlight link i3ColorDef          Define
+highlight link i3ConfigCommand     Define
+highlight link i3IpcSocket         Define
+highlight link i3SetKeyword        Define
+highlight link i3ModeKeyword       Define
+highlight link i3FontStatement     Define
+
+highlight link i3Todo              Todo
+highlight link i3Comment           Comment
\ No newline at end of file
diff --git a/vim/syntax/notmuch-compose.vim b/vim/syntax/notmuch-compose.vim
new file mode 100644
index 0000000..19adb75
--- /dev/null
+++ b/vim/syntax/notmuch-compose.vim
@@ -0,0 +1,7 @@
+runtime! syntax/mail.vim
+
+syntax region nmComposeHelp          contains=nmComposeHelpLine start='^Notmuch-Help:\%1l' end='^\(Notmuch-Help:\)\@!'
+syntax match  nmComposeHelpLine      /Notmuch-Help:/ contained
+
+highlight link nmComposeHelp        Include
+highlight link nmComposeHelpLine    Error
diff --git a/vim/syntax/notmuch-folders.vim b/vim/syntax/notmuch-folders.vim
new file mode 100644
index 0000000..9477f86
--- /dev/null
+++ b/vim/syntax/notmuch-folders.vim
@@ -0,0 +1,12 @@
+" notmuch folders mode syntax file
+
+syntax region nmFoldersCount     start='^' end='\%10v'
+syntax region nmFoldersName      start='\%11v' end='\%31v'
+syntax match  nmFoldersSearch    /([^()]\+)$/
+
+highlight link nmFoldersCount     Statement
+highlight link nmFoldersName      Type
+highlight link nmFoldersSearch    String
+
+highlight CursorLine term=reverse cterm=reverse gui=reverse
+
diff --git a/vim/syntax/notmuch-git-diff.vim b/vim/syntax/notmuch-git-diff.vim
new file mode 100644
index 0000000..6f15fdc
--- /dev/null
+++ b/vim/syntax/notmuch-git-diff.vim
@@ -0,0 +1,26 @@
+syn match diffRemoved	"^-.*"
+syn match diffAdded	"^+.*"
+
+syn match diffSeparator	"^---$"
+syn match diffSubname	" @@..*"ms=s+3 contained
+syn match diffLine	"^@.*" contains=diffSubname
+
+syn match diffFile	"^diff .*"
+syn match diffNewFile	"^+++ .*"
+syn match diffOldFile	"^--- .*"
+
+hi def link diffOldFile		diffFile
+hi def link diffNewFile		diffFile
+
+hi def link diffFile		Type
+hi def link diffRemoved		Special
+hi def link diffAdded		Identifier
+hi def link diffLine		Statement
+hi def link diffSubname		PreProc
+
+syntax match gitDiffStatLine /^ .\{-}\zs[+-]\+$/ contains=gitDiffStatAdd,gitDiffStatDelete
+syntax match gitDiffStatAdd    /+/ contained
+syntax match gitDiffStatDelete /-/ contained
+
+hi def link gitDiffStatAdd diffAdded
+hi def link gitDiffStatDelete diffRemoved
diff --git a/vim/syntax/notmuch-search.vim b/vim/syntax/notmuch-search.vim
new file mode 100644
index 0000000..f458d77
--- /dev/null
+++ b/vim/syntax/notmuch-search.vim
@@ -0,0 +1,12 @@
+syntax region nmSearch		start=/^/ end=/$/		oneline contains=nmSearchDate
+syntax match nmSearchDate	/^.\{-13}/			contained nextgroup=nmSearchNum
+syntax match nmSearchNum	/.\{-4}/			contained nextgroup=nmSearchFrom
+syntax match nmSearchFrom	/.\{-21}/			contained nextgroup=nmSearchSubject
+syntax match nmSearchSubject	/.\{0,}\(([^()]\+)$\)\@=/	contained nextgroup=nmSearchTags
+syntax match nmSearchTags	/.\+$/				contained
+
+highlight link nmSearchDate	Statement
+highlight link nmSearchNum	Type
+highlight link nmSearchFrom	Include
+highlight link nmSearchSubject	Normal
+highlight link nmSearchTags	String
diff --git a/vim/syntax/notmuch-show.vim b/vim/syntax/notmuch-show.vim
new file mode 100644
index 0000000..c3a98b7
--- /dev/null
+++ b/vim/syntax/notmuch-show.vim
@@ -0,0 +1,24 @@
+" notmuch show mode syntax file
+
+syntax cluster nmShowMsgDesc contains=nmShowMsgDescWho,nmShowMsgDescDate,nmShowMsgDescTags
+syntax match   nmShowMsgDescWho /[^)]\+)/ contained
+syntax match   nmShowMsgDescDate / ([^)]\+[0-9]) / contained
+syntax match   nmShowMsgDescTags /([^)]\+)$/ contained
+
+syntax cluster nmShowMsgHead contains=nmShowMsgHeadKey,nmShowMsgHeadVal
+syntax match   nmShowMsgHeadKey /^[^:]\+: / contained
+syntax match   nmShowMsgHeadVal /^\([^:]\+: \)\@<=.*/ contained
+
+syntax cluster nmShowMsgBody contains=@nmShowMsgBodyMail,@nmShowMsgBodyGit
+syntax include @nmShowMsgBodyMail syntax/mail.vim
+
+silent! syntax include @nmShowMsgBodyGit syntax/notmuch-git-diff.vim
+
+highlight nmShowMsgDescWho term=reverse cterm=reverse gui=reverse
+highlight link nmShowMsgDescDate Type
+highlight link nmShowMsgDescTags String
+
+highlight link nmShowMsgHeadKey  Macro
+"highlight link nmShowMsgHeadVal  NONE
+
+highlight Folded term=reverse ctermfg=LightGrey ctermbg=Black guifg=LightGray guibg=Black
diff --git a/vim/syntax/prolog.vim b/vim/syntax/prolog.vim
new file mode 100644
index 0000000..58de71f
--- /dev/null
+++ b/vim/syntax/prolog.vim
@@ -0,0 +1,119 @@
+" Vim syntax file
+" Language:    PROLOG
+" Maintainers: Thomas Koehler <jean-luc@picard.franken.de>
+" Last Change: 2009 Dec 04
+" URL:	       http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/prolog.vim
+
+" There are two sets of highlighting in here:
+" If the "prolog_highlighting_clean" variable exists, it is rather sparse.
+" Otherwise you get more highlighting.
+
+" Quit when a syntax file was already loaded
+if version < 600
+   syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" Prolog is case sensitive.
+syn case match
+
+" Very simple highlighting for comments, clause heads and
+" character codes.  It respects prolog strings and atoms.
+
+syn region   prologCComment	start=+/\*+ end=+\*/+
+syn match    prologComment	+%.*+
+
+syn keyword  prologKeyword	module meta_predicate multifile dynamic
+syn match    prologCharCode	+0'\\\=.+
+syn region   prologString      start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region   prologAtom                start=+'+ skip=+\\\\\|\\'+ end=+'+
+syn region   prologClauseHead   start=+^[a-z][^(]*(+ skip=+\.[^		]+ end=+:-\|\.$\|\.[	 ]\|-->+ contains=prologComment,prologCComment,prologString
+
+if !exists("prolog_highlighting_clean")
+
+  " some keywords
+  " some common predicates are also highlighted as keywords
+  " is there a better solution?
+  syn keyword prologKeyword   abolish current_output  peek_code
+  syn keyword prologKeyword   append  current_predicate       put_byte
+  syn keyword prologKeyword   arg     current_prolog_flag     put_char
+  syn keyword prologKeyword   asserta fail    put_code
+  syn keyword prologKeyword   assertz findall read
+  syn keyword prologKeyword   at_end_of_stream	      float   read_term
+  syn keyword prologKeyword   atom    flush_output    repeat
+  syn keyword prologKeyword   atom_chars      functor retract
+  syn keyword prologKeyword   atom_codes      get_byte	      set_input
+  syn keyword prologKeyword   atom_concat     get_char	      set_output
+  syn keyword prologKeyword   atom_length     get_code	      set_prolog_flag
+  syn keyword prologKeyword   atomic  halt    set_stream_position
+  syn keyword prologKeyword   bagof   integer setof
+  syn keyword prologKeyword   call    is      stream_property
+  syn keyword prologKeyword   catch   nl      sub_atom
+  syn keyword prologKeyword   char_code       nonvar  throw
+  syn keyword prologKeyword   char_conversion number  true
+  syn keyword prologKeyword   clause  number_chars    unify_with_occurs_check
+  syn keyword prologKeyword   close   number_codes    var
+  syn keyword prologKeyword   compound	      once    write
+  syn keyword prologKeyword   copy_term       op      write_canonical
+  syn keyword prologKeyword   current_char_conversion open    write_term
+  syn keyword prologKeyword   current_input   peek_byte       writeq
+  syn keyword prologKeyword   current_op      peek_char
+
+  syn match   prologOperator "=\\=\|=:=\|\\==\|=<\|==\|>=\|\\=\|\\+\|<\|>\|="
+  syn match   prologAsIs     "===\|\\===\|<=\|=>"
+
+  syn match   prologNumber	      "\<[0123456789]*\>'\@!"
+  syn match   prologCommentError      "\*/"
+  syn match   prologSpecialCharacter  ";"
+  syn match   prologSpecialCharacter  "!"
+  syn match   prologQuestion	      "?-.*\."	contains=prologNumber
+
+
+endif
+
+syn sync maxlines=50
+
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_prolog_syn_inits")
+  if version < 508
+    let did_prolog_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  " The default highlighting.
+  HiLink prologComment		Comment
+  HiLink prologCComment		Comment
+  HiLink prologCharCode		Special
+
+  if exists ("prolog_highlighting_clean")
+
+    HiLink prologKeyword	Statement
+    HiLink prologClauseHead	Statement
+
+  else
+
+    HiLink prologKeyword	Keyword
+    HiLink prologClauseHead	Constant
+    HiLink prologQuestion	PreProc
+    HiLink prologSpecialCharacter Special
+    HiLink prologNumber		Number
+    HiLink prologAsIs		Normal
+    HiLink prologCommentError	Error
+    HiLink prologAtom		String
+    HiLink prologString		String
+    HiLink prologOperator	Operator
+
+  endif
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "prolog"
+
+" vim: ts=8
diff --git a/vimrc b/vimrc
new file mode 100644
index 0000000..9b8ad0c
--- /dev/null
+++ b/vimrc
@@ -0,0 +1,34 @@
+" Don't ensure compatibility with vi at all cost
+set nocompatible
+" More flexible backspace
+set backspace=indent,eol,start
+" Dark background
+set bg=dark
+set hlsearch
+" Set the terminals title
+set title
+" Always show a status line
+set laststatus=2
+" Automatically indent, and do it smart
+set autoindent smartindent
+" Enhanced mode for command-line completion
+set wildmenu
+" Don't jump to the matching bracket automatically
+set noshowmatch
+" Enable ruler
+set ruler
+" Use UTF-8
+set fileencoding=utf-8 encoding=utf-8
+" Disable folding completely
+set nofen
+" Enable line numbers
+" set nu
+" Set the tabwidth
+set ts=4
+" Enable syntax highlighting
+syntax on
+" swap file directory
+set directory=/tmp
+
+" don't store .viminfo in $HOME
+set viminfo+=n/tmp/.viminfo_atsu
diff --git a/xombrero.conf b/xombrero.conf
new file mode 100644
index 0000000..f4aa2a8
--- /dev/null
+++ b/xombrero.conf
@@ -0,0 +1,399 @@
+##
+## GENERAL SETTINGS
+##
+
+#
+# The strategy for the config file is as follows:
+#
+# Boolean values are the opposite of the default and need to simply be
+# uncommented to alter the default.
+#
+# Text values *are* set to the default and in order to change them one must
+# uncomment the option *and* change the value.
+#
+
+# NOTE: browser_mode and gui_mode MUST be the first entries in this
+# file!
+
+# Normal browser operation (default).
+# browser_mode		= normal
+
+# Prevent tracking operation.
+browser_mode		= whitelist
+
+# Classic GUI (default).
+gui_mode		= classic
+
+# Minimalistic GUI.
+# gui_mode		= minimal
+
+home			= http://127.0.0.1:7657
+download_dir		= ~/Downloads
+# download_mode		= start
+# download_notifications = 1
+# window_maximize	= 1
+# window_width		= 1024
+# window_height		= 768
+enable_spell_checking	= 1
+spell_check_languages	= en_US
+# default_zoom_level	= 1.0
+encoding		= UTF-8
+# ssl_ca_file		= /etc/ssl/certs/ca-certificates.crt
+# ssl_strict_certs	= 1
+# enable_strict_transport = 0
+# ctrl_click_focus	= 1
+# append_next		= 0
+# save_global_history	= 1
+# color_visited_uris	= 1
+# guess_search		= 1
+# enable_autoscroll	= 1
+session_autosave	= 1
+# history_autosave	= 1
+# autofocus_onload	= 1
+# single_instance	= 1
+enable_socket		= 1
+# enable_js_autorun	= 0
+# auto_load_images	= 0
+# enable_localstorage	= 0
+# userstyle		= /usr/share/xombrero/style.css
+# userstyle_global	= 1
+# enable_favicon_entry	= 0
+# enable_favicon_tabs	= 1
+# preload_strict_transport = 1
+# referer		= always
+# warn_cert_changes	= 1
+
+# See http://www.xroxy.com/proxylist.php for a good list of open
+# proxies.
+#
+# polipo
+# http_proxy			= http://127.0.0.1:8123
+#
+# tsocks
+# http_proxy			= http://127.0.0.1:1080
+#
+# privoxy
+http_proxy = http://127.0.0.1:8118
+
+# If you only occasionally use a proxy
+# http_proxy_starts_enabled	= 0
+
+# Search engines; uncomment one of these lines for you favorite search
+# engine.
+#
+# Google
+# search_string		= https://www.google.com/search?q=%s&&client=xombrero
+#
+# Yahoo
+# search_string		= http://search.yahoo.com/search?p=%s
+#
+# Start Page
+# search_string		= https://startpage.com/do/search?language=english_us&cat=web&query=%s
+#
+# DuckDuckGo
+search_string		= https://www.duckduckgo.com/?q=%s
+
+# External editor.
+# NOTE: The editor specified here must not fork into the background.
+#
+# Examples of editors:
+# external_editor	= gvim -f <file>
+# external_editor	= xterm -geometry 177x58+0+0 -font -*-fixed-medium-r-*-*-15-*-*-*-*-*-iso8859-* -e vim -f <file>
+# external_editor	= emacsclient -c <file>
+external_editor	= medit <file>
+
+# "default_script" points to a script executed by the run_script
+# command. The only argument passed to this script is the current URI.
+#
+# default_script	= ~/.xombrero/playflash.sh
+
+# "user_agent" can be set to just about anything, for a comprehensive
+# list see: http://www.useragentstring.com/pages/All/ . If more than one
+# "user_agent" is given, then xombrero will use them in a round-robin
+# fashion for each request.
+#
+#user_agent		= Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.3) Gecko/20090824 Firefox/3.5.3 (.NET CLR 3.5.30729)
+#user_agent		= Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)
+#user_agent		= Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.195.27 Safari/532.0
+#user_agent		= Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7C144 Safari/528.16
+#
+
+##
+## ALIASES
+##
+
+# Aliases are given in the following format:
+#
+#   alias = <alias>, <link>
+#
+# Where the link part might contain "%s", the "%s" will be substituted
+# with the user's input when the alias is expanded.
+
+# alias = s,	  https://www.google.com/search?q=%s&&client=xombrero
+# alias = w,	  https://secure.wikimedia.org/wikipedia/en/w/index.php?title=Special%3ASearch&search=%s
+# alias = ports,  http://openports.se/search.php?so=%s
+
+
+##
+## COOKIE, JAVASCRIPT AND PLUGIN WHITE LISTS
+##
+
+# Add the domains you trust.
+
+# cookie_wl		= .conformal.com
+# cookie_wl		= .peereboom.us
+
+# js_wl			= .conformal.com
+# js_wl			= .peereboom.us
+
+# pl_wl			= .conformal.com
+# pl_wl			= .peereboom.us
+
+
+##
+## FORCE HTTPS FOR SITES
+##
+
+# Add the domains of sites that should be only accesed over HTTPS.
+
+# force_https		= .conformal.com
+
+
+##
+## MIME TYPES
+##
+
+# PDF, note that xpdf can't load a URI directly; use "@" in front of
+# mime_type to indicate to download the file first.
+
+# mime_type		= application/pdf,kpdf
+mime_type		= @application/pdf,xpdf
+
+# Specific MIME type for video.
+# mime_type		= video/x-ms-wmv,mplayer
+# mime_type		= video/quicktime,mplayer
+
+# Default MIME type for video.
+mime_type		= video/*,mplayer
+
+# Default MIME type for audio.
+mime_type		= audio/*,vlc
+
+# Word documents.
+# mime_type		= application/msword,soffice
+
+# Ignoring flash can be done by using the donothing pseudo-binary.
+mime_type		= application/x-shockwave-flash,donothing
+
+
+##
+## ADVANCED SETTINGS
+##
+
+# resource_dir		= /usr/share/xombrero/
+# refresh_interval	= 10
+# url_regex		= ^[[:blank:]]*[^[:blank:]]*([[:alnum:]-]+\.)+[[:alnum:]-][^[:blank:]]*[[:blank:]]*$
+# gnutls_priority_string = NORMAL:%COMPAT
+
+# NOTE: webkit 1.4.x overwrites these values!
+# max_host_connections	= 5
+# max_connections	= 25
+
+
+##
+## ADVANCED GUI SETTINGS
+##
+
+# The following low-level GUI settings are set by the high-level setting
+# "gui_mode".
+
+# The settings for "gui_mode = classic" are as follows:
+
+# fancy_bar		= 1
+# show_tabs		= 1
+# tab_style		= normal
+# userstyle_global	= 0
+# show_url		= 1
+# show_statusbar	= 0
+# show_scrollbars	= 1
+
+# The settings for "gui_mode = minimal" are as follows:
+
+# fancy_bar		= 0
+# show_tabs		= 1
+# tab_style		= compact
+# show_url		= 0
+# show_statusbar	= 1
+# show_scrollbars	= 0
+
+# The following are settings shared between "classic" and "minimal"
+# "gui_mode":
+
+# statusbar_elems	= BP
+# icon_size		= 2
+# cmd_font		= monospace normal 9
+# oops_font		= monospace normal 9
+# statusbar_font	= monospace normal 9
+# tabbar_font		= monospace normal 9
+
+
+##
+## ADVANCED COOKIE AND JAVASCRIPT SETTINGS
+##
+
+# The following low-level settings are set by the high-level setting
+# "browser_mode", and shouldn't be tweaked manually unless you know what
+# you are doing.
+
+# The settings for "browser_mode = normal" are as follows:
+
+# allow_volatile_cookies	= 0
+# cookie_policy			= allow
+# cookies_enabled		= 1
+# enable_cookie_whitelist	= 0
+# read_only_cookies		= 0
+# save_rejected_cookies		= 0
+# session_timeout		= 3600
+# enable_scripts		= 1
+# enable_js_whitelist		= 0
+# enable_localstorage		= 1
+# enable_plugins		= 1
+# enable_plugin_whitelist	= 0
+# allow_insecure_content	= 1
+# allow_insecure_scripts	= 1
+# do_not_track			= 0
+
+# The settings for "browser_mode = whitelist" are as follows:
+
+# allow_volatile_cookies	= 0
+# cookie_policy			= no3rdparty
+# cookies_enabled		= 1
+# enable_cookie_whitelist	= 1
+# read_only_cookies		= 0
+# save_rejected_cookies		= 0
+# session_timeout		= 3600
+# enable_scripts		= 0
+# enable_js_whitelist		= 1
+# enable_localstorage		= 0
+# enable_plugins		= 0
+# enable_plugin_whitelist	= 1
+# allow_insecure_content	= 0
+# allow_insecure_scripts	= 0
+# do_not_track			= 1
+
+
+##
+## KEY BINDINGS
+##
+
+# To delete all default keybindings use "keybinding = clearall".
+#
+# keybinding	= clearall
+#
+# Key names can be found at:
+#
+#   http://git.gnome.org/browse/gtk+/tree/gdk/gdkkeysyms-compat.h
+#
+# Just chop off the "GDK_" part and you have the keyname. Or look at:
+#
+#   http://git.gnome.org/browse/gtk+/tree/gdk/gdkkeysyms.h
+#
+# and chop off "GDK_KEY_".
+#
+# Be aware that the names are case sensitive!
+#
+# The default keybindings are the following:
+#
+# keybinding	= command,colon
+# keybinding	= search,slash
+# keybinding	= searchb,question
+# keybinding	= command_mode,!Escape
+# keybinding	= insert_mode,i
+# keybinding	= cookiejar,!M1-j
+# keybinding	= downloadmgr,!M1-d
+# keybinding	= history,!M1-h
+# keybinding	= print,!C-p
+# keybinding	= quitall,!C-q
+# keybinding	= restart,!M1-q
+# keybinding	= run_script,!M1-r
+# keybinding	= js toggle,!C-j
+# keybinding	= cookie toggle,!M1-c
+# keybinding	= togglesrc,!C-s
+# keybinding	= yankuri,y
+# keybinding	= pasteuricur,p
+# keybinding	= pasteurinew,P
+# keybinding	= toplevel toggle,!F4
+# keybinding	= help,!F1
+# keybinding	= proxy toggle,!F2
+# keybinding	= searchnext,n
+# keybinding	= searchprevious,N
+# keybinding	= focusaddress,!F6
+# keybinding	= focussearch,!F7
+# keybinding	= hinting,f
+# keybinding	= hinting,period
+# keybinding	= hinting_newtab,S-F
+# keybinding	= hinting_newtab,comma
+# keybinding	= userstyle,s
+# keybinding	= userstyle_global,S
+# keybinding	= goback,BackSpace
+# keybinding	= goback,!M1-Left
+# keybinding	= goforward,!S-BackSpace
+# keybinding	= goforward,!M1-Right
+# keybinding	= reload,!F5
+# keybinding	= reload,!C-r
+# keybinding	= reload,!C-l
+# keybinding	= favorites,!M1-f
+# keybinding	= scrolldown,j
+# keybinding	= scrolldown,Down
+# keybinding	= scrollup,k
+# keybinding	= scrollup,Up
+# keybinding	= scrollbottom,G
+# keybinding	= scrollbottom,End
+# keybinding	= scrolltop,Home
+# keybinding	= scrollpagedown,space
+# keybinding	= scrollpagedown,!C-f
+# keybinding	= scrollpagedown,Page_Down
+# keybinding	= scrollhalfdown,!C-d
+# keybinding	= scrollpageup,Page_Up
+# keybinding	= scrollpageup,!C-b
+# keybinding	= scrollhalfup,!C-u
+# keybinding	= scrollright,l
+# keybinding	= scrollright,Right
+# keybinding	= scrollfarright,dollar
+# keybinding	= scrollleft,h
+# keybinding	= scrollleft,Left
+# keybinding	= scrollfarleft,0
+# keybinding	= statustoggle,!C-n
+# keybinding	= stop,!S-F5
+# keybinding	= tabnew,!C-t
+# keybinding	= tabclose,!C-w
+# keybinding	= tabundoclose,U
+# keybinding	= tabnext 1,!C-1
+# keybinding	= tabnext 2,!C-2
+# keybinding	= tabnext 3,!C-3
+# keybinding	= tabnext 4,!C-4
+# keybinding	= tabnext 5,!C-5
+# keybinding	= tabnext 6,!C-6
+# keybinding	= tabnext 7,!C-7
+# keybinding	= tabnext 8,!C-8
+# keybinding	= tabnext 9,!C-9
+# keybinding	= tabfirst,!C-less
+# keybinding	= tablast,!C-greater
+# keybinding	= tabprevious,!C-Left
+# keybinding	= tabnext,!C-Right
+# keybinding	= focusout,!C-minus
+# keybinding	= focusin,!C-equal
+# keybinding	= focusin,!C-plus
+# keybinding	= focusreset,!C-0
+# keybinding	= editelement,!C-i
+# keybinding	= passthrough,!C-z
+# keybinding	= :open ,!F9
+# keybinding	= :open <uri>,!F10
+# keybinding	= :tabnew ,!F11
+# keybinding	= :tabnew <uri>,!F12
+
+
+keybinding	= favadd,!C-d
+
+# parse the contents of another configuration file
+# include_config	= ~/.xombrero_alternate.conf
diff --git a/zshrc b/zshrc
new file mode 100644
index 0000000..29b7899
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,49 @@
+setopt append_history
+#unsetopt share_history
+export GOPATH=~/go
+export PATH=$(ruby -rubygems -e "puts Gem.user_dir")/bin:/home/atsutane/bin:/home/atsutane/go/bin:$PATH:/opt/bsvc/usr/bin
+export OOO_FORCE_DESKTOP=gnome
+export KEYID="295AFBF4"
+export VISUAL=vim
+export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
+export MSF_DATABASE_CONFIG=/home/atsutane/.armitage_dbconfig.yml
+
+# Edit a temporary file with my template for a C proof-of-concept
+alias cpoc='cd /tmp && FN=$(mktemp --suffix=.c) && cp ~/.poc-template.c $FN && vim $FN && echo "Proof-of-concept stored in $FN"'
+alias rm='nocorrect rm -I'
+alias scr='screen -x || screen'
+
+function getinet () {
+	if [ $(ifconfig wlan0 | grep "inet addr:" | cut -d ":" -f 2 | cut -d " " -f1) ]; then
+		echo "$(ifconfig wlan0 | grep "inet addr:" | cut -d ":" -f 2 | cut -d " " -f1) @wlan0"
+	fi
+	if [ $(ifconfig eth0 | grep "inet addr:" | cut -d ":" -f 2 | cut -d " " -f1) ]; then
+		echo "$(ifconfig eth0 | grep "inet addr:" | cut -d ":" -f 2 | cut -d " " -f1) @eth0"
+	fi
+}
+
+function parse_git_branch() {
+	print "%{\e[1;34m%}$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/')%{\e[0m%}\n"
+}
+
+
+#Run ssh-agent http://mah.everybody.org/docs/ssh
+SSH_ENV="/tmp/.ssh_atsu_environment"
+function start_agent {
+	echo "Initialising new SSH agent..."
+	/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
+	echo succeeded
+	chmod 600 "${SSH_ENV}"
+	. "${SSH_ENV}" > /dev/null
+}
+# Source SSH settings, if applicable
+if [ -f "${SSH_ENV}" ]; then
+	. "${SSH_ENV}" > /dev/null
+	ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
+	start_agent;
+	}
+else
+	start_agent;
+fi
+
+