Merge branch 'master' of github.com:zanshin/dotfiles

* 'master' of github.com:zanshin/dotfiles:
  Install Vim-Plug on fermata
  Change ip alias to ipp
  Updating and dusting off mutt configuration
  added tmux shortcuts to scripts
  added new linux desktop to config
  Created password template
  New Chef snippet

bash/bash_aliases

@@ -106,11 +106,11 @@ alias tls='tmux ls'
 alias tk='tmux kill-session -t'
 
 # tmux scripts 
-alias blog='~/.dotfiles/scripts/blog'
-alias dev='~/.dotfiles/scripts/chef'
-alias console='~/.dotfiles/scripts/console'
-alias tools='~/.dotfiles/scripts/tools'
-alias deploy='~/.dotfiles/scripts/deploy'
+alias tb='~/.dotfiles/scripts/blog'
+alias td='~/.dotfiles/scripts/chef'
+alias tc='~/.dotfiles/scripts/console'
+alias tt='~/.dotfiles/scripts/tools'
+alias td='~/.dotfiles/scripts/deploy'
 
 # force tmux to use 256 colors
 # alias tmux='TERM=screen-256colors tmux'
@@ -174,7 +174,7 @@ alias off='deactivate'
 
 # }}}
 # Oddball stuff {{{
-alias ip='dig +short myip.opendns.com @resolver1.opendns.com'
+alias ipp='dig +short myip.opendns.com @resolver1.opendns.com'
 alias sloc='/usr/local/sloccount/bin/sloccount'
 alias adventure='emacs -batch -l dunnet'
 alias ttop='top -ocpu -R -F -s 2 -n30'

mutt/mutt/muttrc

@@ -25,13 +25,16 @@ set thorough_search      # strip headers and eval mimes before searching
 
 # }}}
 # Color Scheme {{{ 
+source ~/.mutt/themes/mhn.muttrc
+#source ~/.mutt/themes/mutt-colors-solarized-dark-256.muttrc
+#source ~/.mutt/themes/vombatidae.muttrc
 #source ~/.mutt/themes/colors.muttrc
-source ~/.mutt/themes/tomorrow-night.muttrc
+#source ~/.mutt/themes/tomorrow-night.muttrc
 
 # }}}
 # Sidebar Patch {{{ 
 set sidebar_visible = yes 
-set sidebar_delim   = ' | '
+set sidebar_divider_char   = ' | '
 set sidebar_width   = 30 
 # set sidebar_delim_chars = "./"
 color sidebar_new  yellow default

mutt/mutt/themes/mhn.muttrc

@@ -0,0 +1,78 @@
+# Colours for items in the index
+color index brightblack black ~N
+# Hmm, don't like this.
+#color index brightgreen black "~N (~x byers.world)|(~x byers.x)|(~x langly.levallois123.axialys.net)|(~x the.earth.li)"
+color index brightyellow black ~F
+color index black green ~T
+color index brightred black ~D
+mono index bold ~N
+mono index bold ~F
+mono index bold ~T
+mono index bold ~D
+
+# Highlights inside the body of a message.
+
+# URLs
+color body brightgreen black "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*"
+color body brightgreen black "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
+mono body bold "(http|ftp|news|telnet|finger)://[^ \"\t\r\n]*"
+mono body bold "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
+
+# email addresses
+color body brightgreen black "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+#mono body bold "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+
+# header
+color header green black "^from:"
+color header green black "^to:"
+color header green black "^cc:"
+color header green black "^date:"
+color header yellow black "^newsgroups:"
+color header yellow black "^reply-to:"
+color header brightcyan black "^subject:"
+color header red black "^x-spam-rule:"
+color header green black "^x-mailer:"
+color header yellow black "^message-id:"
+color header yellow black "^Organization:"
+color header yellow black "^Organisation:"
+color header yellow black "^User-Agent:"
+color header yellow black "^message-id: .*pine"
+color header yellow black "^X-Fnord:"
+color header yellow black "^X-WebTV-Stationery:"
+color header yellow black "^X-Message-Flag:"
+color header yellow black "^X-Spam-Status:"
+color header yellow black "^X-SpamProbe:"
+color header red black "^X-SpamProbe: SPAM"
+
+
+# Coloring quoted text - coloring the first 7 levels:
+color quoted cyan black
+color quoted1 yellow black
+color quoted2 red black
+color quoted3 green black
+color quoted4 cyan black
+color quoted5 yellow black
+color quoted6 red black
+color quoted7 green black
+
+
+# Default color definitions
+#color hdrdefault white green
+color signature brightmagenta black
+color indicator brightblack black 
+color attachment black green
+color error red black
+color message white black
+color search brightwhite magenta
+color status brightyellow blue
+color tree brightblue black
+color normal white black
+color tilde green black
+color bold brightyellow black
+#color underline magenta black
+color markers brightcyan black
+# Colour definitions when on a mono screen
+mono bold bold
+mono underline underline
+mono indicator reverse
+

mutt/mutt/themes/sjl.muttrc

@@ -0,0 +1,43 @@
+# general-doesn't-fit stuff
+color normal color252 color233
+color error color193 color124
+color markers color142 color233
+color tilde color142 color233
+color status color172 color233
+#
+# # index stuff
+color tree color244 color233
+color indicator color255 color235
+color index color117 color233 ~N
+color index color124 color233 ~D
+#
+# # header stuff
+color hdrdefault color248 color233
+color header color226 color233 "^Subject"
+#
+# # url, email and web stuff
+color body color68 color233 "(finger|ftp|http|https|news|telnet)://[^ >]*"
+color body color111 color233 "<URL:[^ ]*>"
+color body color111 color233 "www\\.[-.a-z0-9]+\\.[a-z][a-z][a-z]?([-_./~a-z0-9]+)?"
+color body color111 color233 "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+color body brightred color233 "^-.*"
+color body green color233 "^[+].*"
+color body brightwhite color233 "^diff .*"
+color body brightyellow color233 "^@@.*"
+#
+# # misc body stuff
+color attachment color111 color233
+color signature color244 color233
+#
+# # quote levels
+color quoted color34   color233
+color quoted1 color142 color233
+color quoted2 color34  color233
+color quoted3 color142 color233
+color quoted4 color34  color233
+color quoted5 color142 color233
+color quoted6 color34  color233
+color quoted7 color142 color233
+color quoted8 color34  color233
+color quoted9 color142 color233
+

mutt/offlineimaprc

@@ -2,8 +2,8 @@
 
 [general]
 # ui = ttyui
+# ui = quiet
 ui = blinkenlights
-#ui = quiet
 accounts = mark,root,chef,marknichols,codeprole,mhn
 pythonfile=~/.mutt/offlineimap.py
 fsync = False

ssh/config

@@ -16,6 +16,12 @@ Host fugazi
 Host mhn
     HostName ome-wse-mhn.campus.ksu.edu
 
+# Ubuntu desktop
+Host fermata
+    HostName 68.102.23.189
+    Port 11122
+    user mark
+
 # Access GitHub even when port 22 isn't available
 Host github.com
     HostName ssh.github.com

vim/autoload/plug.vim

@@ -203,7 +203,9 @@ function! plug#end()
   endif
   let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
 
-  filetype off
+  if exists('g:did_load_filetypes')
+    filetype off
+  endif
   for name in g:plugs_order
     if !has_key(g:plugs, name)
       continue
@@ -223,6 +225,7 @@ function! plug#end()
           endif
           call add(s:triggers[name].map, cmd)
         elseif cmd =~# '^[A-Z]'
+          let cmd = substitute(cmd, '!*$', '', '')
           if exists(':'.cmd) != 2
             call s:assoc(lod.cmd, cmd, name)
           endif
@@ -249,16 +252,16 @@ function! plug#end()
 
   for [cmd, names] in items(lod.cmd)
     execute printf(
-    \ 'command! -nargs=* -range -bang %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
+    \ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)',
     \ cmd, string(cmd), string(names))
   endfor
 
   for [map, names] in items(lod.map)
     for [mode, map_prefix, key_prefix] in
           \ [['i', '<C-O>', ''], ['n', '', ''], ['v', '', 'gv'], ['o', '', '']]
       execute printf(
-      \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, "%s")<CR>',
-      \ mode, map, map_prefix, string(map), string(names), key_prefix)
+      \ '%snoremap <silent> %s %s:<C-U>call <SID>lod_map(%s, %s, %s, "%s")<CR>',
+      \ mode, map, map_prefix, string(map), string(names), mode != 'i', key_prefix)
     endfor
   endfor
 
@@ -310,7 +313,7 @@ endfunction
 
 function! s:git_version_requirement(...)
   if !exists('s:git_version')
-    let s:git_version = map(split(split(s:system('git --version'))[-1], '\.'), 'str2nr(v:val)')
+    let s:git_version = map(split(split(s:system('git --version'))[2], '\.'), 'str2nr(v:val)')
   endif
   return s:version_requirement(s:git_version, a:000)
 endfunction
@@ -399,7 +402,7 @@ function! s:reorg_rtp()
 
   let s:middle = get(s:, 'middle', &rtp)
   let rtps     = map(s:loaded_names(), 's:rtp(g:plugs[v:val])')
-  let afters   = filter(map(copy(rtps), 'globpath(v:val, "after")'), 'isdirectory(v:val)')
+  let afters   = filter(map(copy(rtps), 'globpath(v:val, "after")'), '!empty(v:val)')
   let rtp      = join(map(rtps, 'escape(v:val, ",")'), ',')
                  \ . ','.s:middle.','
                  \ . join(map(afters, 'escape(v:val, ",")'), ',')
@@ -498,7 +501,7 @@ function! s:lod_cmd(cmd, bang, l1, l2, args, names)
   execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
 endfunction
 
-function! s:lod_map(map, names, prefix)
+function! s:lod_map(map, names, with_prefix, prefix)
   call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
   call s:dobufread(a:names)
   let extra = ''
@@ -510,15 +513,17 @@ function! s:lod_map(map, names, prefix)
     let extra .= nr2char(c)
   endwhile
 
-  let prefix = v:count ? v:count : ''
-  let prefix .= '"'.v:register.a:prefix
-  if mode(1) == 'no'
-    if v:operator == 'c'
-      let prefix = "\<esc>" . prefix
+  if a:with_prefix
+    let prefix = v:count ? v:count : ''
+    let prefix .= '"'.v:register.a:prefix
+    if mode(1) == 'no'
+      if v:operator == 'c'
+        let prefix = "\<esc>" . prefix
+      endif
+      let prefix .= v:operator
     endif
-    let prefix .= v:operator
+    call feedkeys(prefix, 'n')
   endif
-  call feedkeys(prefix, 'n')
   call feedkeys(substitute(a:map, '^<Plug>', "\<Plug>", '') . extra)
 endfunction
 
@@ -572,8 +577,7 @@ function! s:infer_properties(name, repo)
       let fmt = get(g:, 'plug_url_format', 'https://git::@github.com/%s.git')
       let uri = printf(fmt, repo)
     endif
-    let dir = s:dirpath( fnamemodify(join([g:plug_home, a:name], '/'), ':p') )
-    return { 'dir': dir, 'uri': uri }
+    return { 'dir': s:dirpath(g:plug_home.'/'.a:name), 'uri': uri }
   endif
 endfunction
 
@@ -747,7 +751,7 @@ function! s:prepare(...)
   for k in ['<cr>', 'L', 'o', 'X', 'd', 'dd']
     execute 'silent! unmap <buffer>' k
   endfor
-  setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile nowrap cursorline modifiable
+  setlocal buftype=nofile bufhidden=wipe nobuflisted nolist noswapfile nowrap cursorline modifiable nospell
   setf vim-plug
   if exists('g:syntax_on')
     call s:syntax()