diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/muttrc | 11 | ||||
| -rwxr-xr-x | base/vim/bundle/fetch_bundles.sh | 10 | ||||
| -rw-r--r-- | base/vimrc | 26 |
3 files changed, 23 insertions, 24 deletions
diff --git a/base/muttrc b/base/muttrc index b3b2531..bad1a74 100644 --- a/base/muttrc +++ b/base/muttrc @@ -18,6 +18,7 @@ unset markers set text_flowed=yes set display_filter="~/bin/mutt-display-filter.sh" auto_view text/html +alternative_order text/plain text/enriched text/html # Headers ignore * @@ -28,6 +29,7 @@ set forward_format="Fwd: %s" macro pager <Up> "<previous-line>" "Previous line" macro pager <Down> "<next-line>" "Next line" +bind index g noop bind index gg first-entry bind index G last-entry bind index R group-reply @@ -35,14 +37,17 @@ macro index c "<change-folder>?<toggle-mailboxes>" "open a different folder" macro pager c "<change-folder>?<toggle-mailboxes>" "open a different folder" macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox" macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox" -macro index e "<save-message>+archived<enter>" "Archive a message." -macro pager e "<save-message>+archived<enter>" "Archive a message." +# For gmail, don't move the message to archive, just remove it from the inbox. +#macro index e "<save-message>+archive<enter>" "Archive a message." +#macro pager e "<save-message>+archive<enter>" "Archive a message." +macro index e "<delete-message>" "Archive a message." +macro pager e "<delete-message>" "Archive a message." macro index S "<save-message>+spam<enter>" "Report message as spam." macro index d "<save-message>+trash<enter>" "Move to trash" macro pager d "<save-message>+trash<enter>" "Move to trash" macro pager \Cu "|urlview<enter>" "view links in urlview" -macro index \es "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py ~/.maildir/search<enter><change-folder-readonly>=search<enter>" "Search All Mail" +macro index \es "<enter-command>unset wait_key<enter><shell-escape>notmuch-mutt --prompt search<enter><change-folder-readonly>~/.cache/notmuch/mutt/results/<enter>" "Search All Mail" # Colors #color index brightwhite default ~N diff --git a/base/vim/bundle/fetch_bundles.sh b/base/vim/bundle/fetch_bundles.sh new file mode 100755 index 0000000..315100f --- /dev/null +++ b/base/vim/bundle/fetch_bundles.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +## +## I don't want to include the plugin repos in my dotfiles, +## so here are the comments to fetch the plugins I care about. +## + +git clone git://github.com/tpope/vim-abolish.git +git clone https://github.com/ctrlpvim/ctrlp.vim.git +git clone https://github.com/tomtom/tcomment_vim.git @@ -118,27 +118,6 @@ endfunction " Run it every time we change buffers autocmd BufEnter,BufFilePost * call SetTitle() -perl <<EOT - # Get the user name, should probably get the home dir... - my $home_dir = (getpwuid($<))[7]; - - if ( -e $home_dir ) { - my $temp_location = "$home_dir/.vim-tmp"; - my $tmp_dir = $temp_location . '/vXXX'; - my $swp_dir = $temp_location . '/swps'; - - # If the location doesn't exist, create it - mkdir $temp_location unless ( -e $temp_location ); - - mkdir $tmp_dir unless ( -e $tmp_dir ); - mkdir $swp_dir unless ( -e $swp_dir ); - - # Set TMPDIR and directory to the new location - VIM::DoCommand("let \$TMPDIR = '" . $tmp_dir . "'") if ( -w $tmp_dir ); - VIM::DoCommand("set directory=" . $swp_dir) if ( -w $swp_dir ); - } -EOT - " Scratch Plugin let g:scratchBackupFile="/tmp/scratch.txt" @@ -159,6 +138,11 @@ highlight SpellRare term=underline cterm=underline highlight clear SpellLocal highlight SpellLocal term=underline cterm=underline +" ctrlp +let g:ctrlp_extensions = ['tag', 'buffertag'] +map <C-r> :CtrlPTag<Enter> +map <C-y> :redo<Enter> + " Load host-specific settings set runtimepath^=~/.host-specific/vim, set runtimepath+=~/.host-specific/vim/after |