update maek

master
paulwalko 2017-11-15 18:30:43 -05:00
commit 5cd60a59c1
13 changed files with 149 additions and 382 deletions

19
.gitmodules vendored
View File

@ -1,9 +1,12 @@
[submodule "vim/bundle/syntastic"] [submodule "vim/pack/plugins/opt/vim-solarized8"]
path = vim/bundle/syntastic path = vim/pack/plugins/opt/vim-solarized8
url = https://github.com/vim-syntastic/syntastic.git url = https://github.com/lifepillar/vim-solarized8.git
[submodule "vim/bundle/supertab"] [submodule "vim/pack/plugins/start/supertab"]
path = vim/bundle/supertab path = vim/pack/plugins/start/supertab
url = https://github.com/ervandew/supertab.git url = https://github.com/ervandew/supertab.git
[submodule "vim/bundle/vim-unimpaired"] [submodule "vim/pack/plugins/syntastic"]
path = vim/bundle/vim-unimpaired path = vim/pack/plugins/syntastic
url = https://github.com/tpope/vim-unimpaired url = https://github.com/vim-syntastic/syntastic.git
[submodule "vim/pack/plugins/vim-unimpaired"]
path = vim/pack/plugins/vim-unimpaired
url = https://github.com/tpope/vim-unimpaired.git

22
bash_profile Normal file
View File

@ -0,0 +1,22 @@
#if [[ "$SSH_CONNECTION" != "" && "$MY_SSH_CONNECTION" != "yes" ]]; then
# /bin/zsh
#fi
#export SHELL=/bin/zsh
#exec /bin/zsh -l
if [[ -z $TMUX ]]; then
if [ -e /usr/share/terminfo/x/xterm-256color ]; then # may be xterm-256 depending on your distro
export TERM='rxvt-256color'
else
export TERM='rxvt'
fi
else
if [ -e /usr/share/terminfo/s/screen-256color ]; then
export TERM='screen-256color'
else
export TERM='screen'
fi
fi
export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 13)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
export PATH=$HOME/.local/bin:$PATH

View File

@ -1,134 +1,134 @@
[general] [general]
ui = ttyui ui = ttyui
accounts = vt, walko, gmail accounts = vt, walko, gmail
maxsyncaccounts = 3 maxsyncaccounts = 3
pythonfile = ~/.mutt/offlineimap.py pythonfile = ~/.mutt/offlineimap.py
############################ ############################
### Accounts ### Accounts
# vt # vt
[Account vt] [Account vt]
localrepository = vt-local localrepository = vt-local
remoterepository = vt-remote remoterepository = vt-remote
autorefresh = 0.5 autorefresh = 0.5
quick = 10 quick = 10
# walko # walko
[Account walko] [Account walko]
localrepository = walko-local localrepository = walko-local
remoterepository = walko-remote remoterepository = walko-remote
autorefresh = 0.5 autorefresh = 0.5
quick = 10 quick = 10
# gmail # gmail
[Account gmail] [Account gmail]
localrepository = gmail-local localrepository = gmail-local
remoterepository = gmail-remote remoterepository = gmail-remote
autorefresh = 0.5 autorefresh = 0.5
quick = 10 quick = 10
########################### ###########################
### Repositories ### Repositories
# vt # vt
[Repository vt-local] [Repository vt-local]
type = Maildir type = Maildir
localfolders = ~/.mail/vt localfolders = ~/.mail/vt
nametrans = lambda folder: { nametrans = lambda folder: {
'drafts': '[Gmail]/Drafts', 'drafts': '[Gmail]/Drafts',
'sent': '[Gmail]/Sent Mail', 'sent': '[Gmail]/Sent Mail',
'flagged': '[Gmail]/Starred', 'flagged': '[Gmail]/Starred',
'trash': '[Gmail]/Trash', 'trash': '[Gmail]/Trash',
'archive': '[Gmail]/All Mail', 'archive': '[Gmail]/All Mail',
}.get(folder, folder) }.get(folder, folder)
[Repository vt-remote] [Repository vt-remote]
sslcacertfile = /etc/ssl/certs/ca-certificates.crt sslcacertfile = /etc/ssl/certs/ca-certificates.crt
maxconnections = 1 maxconnections = 1
type = Gmail type = Gmail
keepalive = 60 keepalive = 60
holdconnectionopen = yes holdconnectionopen = yes
remoteuser = pwalko@vt.edu remoteuser = pwalko@vt.edu
remotepasseval = get_pass("vt") remotepasseval = get_pass("vt")
realdelete = no realdelete = no
nametrans = lambda folder: { nametrans = lambda folder: {
'[Gmail]/Drafts': 'drafts', '[Gmail]/Drafts': 'drafts',
'[Gmail]/Sent Mail': 'sent', '[Gmail]/Sent Mail': 'sent',
'[Gmail]/Starred': 'flagged', '[Gmail]/Starred': 'flagged',
'[Gmail]/Trash': 'trash', '[Gmail]/Trash': 'trash',
'[Gmail]/All Mail': 'archive', '[Gmail]/All Mail': 'archive',
}.get(folder, folder) }.get(folder, folder)
folderfilter = lambda folder: folder not in [ folderfilter = lambda folder: folder not in [
'[Gmail]/Trash', '[Gmail]/Trash',
'[Gmail]/Spam', '[Gmail]/Spam',
'[Gmail]/Important', '[Gmail]/Important',
'[Gmail]/Chats', '[Gmail]/Chats',
] ]
# walko # walko
[Repository walko-local] [Repository walko-local]
type = Maildir type = Maildir
localfolders = ~/.mail/walko localfolders = ~/.mail/walko
nametrans = lambda folder: { nametrans = lambda folder: {
'drafts': '[Gmail]/Drafts', 'drafts': '[Gmail]/Drafts',
'sent': '[Gmail]/Sent Mail', 'sent': '[Gmail]/Sent Mail',
'flagged': '[Gmail]/Starred', 'flagged': '[Gmail]/Starred',
'trash': '[Gmail]/Trash', 'trash': '[Gmail]/Trash',
'archive': '[Gmail]/All Mail', 'archive': '[Gmail]/All Mail',
}.get(folder, folder) }.get(folder, folder)
[Repository walko-remote] [Repository walko-remote]
sslcacertfile = /etc/ssl/certs/ca-certificates.crt sslcacertfile = /etc/ssl/certs/ca-certificates.crt
maxconnections = 1 maxconnections = 1
type = Gmail type = Gmail
keepalive = 60 keepalive = 60
holdconnectionopen = yes holdconnectionopen = yes
remoteuser = paul@walko.org remoteuser = paul@walko.org
remotepasseval = get_pass("walko") remotepasseval = get_pass("walko")
realdelete = no realdelete = no
nametrans = lambda folder: { nametrans = lambda folder: {
'[Gmail]/Drafts': 'drafts', '[Gmail]/Drafts': 'drafts',
'[Gmail]/Sent Mail': 'sent', '[Gmail]/Sent Mail': 'sent',
'[Gmail]/Starred': 'flagged', '[Gmail]/Starred': 'flagged',
'[Gmail]/Trash': 'trash', '[Gmail]/Trash': 'trash',
'[Gmail]/All Mail': 'archive', '[Gmail]/All Mail': 'archive',
}.get(folder, folder) }.get(folder, folder)
folderfilter = lambda folder: folder not in [ folderfilter = lambda folder: folder not in [
'[Gmail]/Trash', '[Gmail]/Trash',
'[Gmail]/Important', '[Gmail]/Important',
'[Gmail]/Chats', '[Gmail]/Chats',
] ]
# gmail # gmail
[Repository gmail-local] [Repository gmail-local]
type = Maildir type = Maildir
localfolders = ~/.mail/gmail localfolders = ~/.mail/gmail
nametrans = lambda folder: { nametrans = lambda folder: {
'drafts': '[Gmail]/Drafts', 'drafts': '[Gmail]/Drafts',
'sent': '[Gmail]/Sent Mail', 'sent': '[Gmail]/Sent Mail',
'flagged': '[Gmail]/Starred', 'flagged': '[Gmail]/Starred',
'trash': '[Gmail]/Trash', 'trash': '[Gmail]/Trash',
'archive': '[Gmail]/All Mail', 'archive': '[Gmail]/All Mail',
}.get(folder, folder) }.get(folder, folder)
[Repository gmail-remote] [Repository gmail-remote]
sslcacertfile = /etc/ssl/certs/ca-certificates.crt sslcacertfile = /etc/ssl/certs/ca-certificates.crt
maxconnections = 1 maxconnections = 1
type = Gmail type = Gmail
keepalive = 60 keepalive = 60
holdconnectionopen = yes holdconnectionopen = yes
remoteuser = paulsw.pw@gmail.com remoteuser = paulsw.pw@gmail.com
remotepasseval = get_pass("gmail") remotepasseval = get_pass("gmail")
realdelete = no realdelete = no
nametrans = lambda folder: { nametrans = lambda folder: {
'[Gmail]/Drafts': 'drafts', '[Gmail]/Drafts': 'drafts',
'[Gmail]/Sent Mail': 'sent', '[Gmail]/Sent Mail': 'sent',
'[Gmail]/Starred': 'flagged', '[Gmail]/Starred': 'flagged',
'[Gmail]/Trash': 'trash', '[Gmail]/Trash': 'trash',
'[Gmail]/All Mail': 'archive', '[Gmail]/All Mail': 'archive',
}.get(folder, folder) }.get(folder, folder)
folderfilter = lambda folder: folder not in [ folderfilter = lambda folder: folder not in [
'[Gmail]/Trash', '[Gmail]/Trash',
'[Gmail]/Spam', '[Gmail]/Spam',
'[Gmail]/Important', '[Gmail]/Important',
'[Gmail]/Chats', '[Gmail]/Chats',
] ]

View File

@ -1,264 +0,0 @@
" pathogen.vim - path option manipulation
" Maintainer: Tim Pope <http://tpo.pe/>
" Version: 2.4
" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
"
" For management of individually installed plugins in ~/.vim/bundle (or
" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
" .vimrc is the only other setup necessary.
"
" The API is documented inline below.
if exists("g:loaded_pathogen") || &cp
finish
endif
let g:loaded_pathogen = 1
" Point of entry for basic default usage. Give a relative path to invoke
" pathogen#interpose() or an absolute path to invoke pathogen#surround().
" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all
" subdirectories inside "bundle" inside all directories in the runtime path.
" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}"
" on versions of Vim without native package support.
function! pathogen#infect(...) abort
if a:0
let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")')
else
let paths = ['bundle/{}', 'pack/{}/start/{}']
endif
if has('packages')
call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"')
endif
let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$'
for path in filter(copy(paths), 'v:val =~# static')
call pathogen#surround(path)
endfor
for path in filter(copy(paths), 'v:val !~# static')
if path =~# '^\%([$~\\/]\|\w:[\\/]\)'
call pathogen#surround(path)
else
call pathogen#interpose(path)
endif
endfor
call pathogen#cycle_filetype()
if pathogen#is_disabled($MYVIMRC)
return 'finish'
endif
return ''
endfunction
" Split a path into a list.
function! pathogen#split(path) abort
if type(a:path) == type([]) | return a:path | endif
if empty(a:path) | return [] | endif
let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
endfunction
" Convert a list to a path.
function! pathogen#join(...) abort
if type(a:1) == type(1) && a:1
let i = 1
let space = ' '
else
let i = 0
let space = ''
endif
let path = ""
while i < a:0
if type(a:000[i]) == type([])
let list = a:000[i]
let j = 0
while j < len(list)
let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
let path .= ',' . escaped
let j += 1
endwhile
else
let path .= "," . a:000[i]
endif
let i += 1
endwhile
return substitute(path,'^,','','')
endfunction
" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
function! pathogen#legacyjoin(...) abort
return call('pathogen#join',[1] + a:000)
endfunction
" Turn filetype detection off and back on again if it was already enabled.
function! pathogen#cycle_filetype() abort
if exists('g:did_load_filetypes')
filetype off
filetype on
endif
endfunction
" Check if a bundle is disabled. A bundle is considered disabled if its
" basename or full name is included in the list g:pathogen_blacklist or the
" comma delimited environment variable $VIMBLACKLIST.
function! pathogen#is_disabled(path) abort
if a:path =~# '\~$'
return 1
endif
let sep = pathogen#slash()
let blacklist = get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) + pathogen#split($VIMBLACKLIST)
if !empty(blacklist)
call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
endif
return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
endfunction
" Prepend the given directory to the runtime path and append its corresponding
" after directory. Curly braces are expanded with pathogen#expand().
function! pathogen#surround(path) abort
let sep = pathogen#slash()
let rtp = pathogen#split(&rtp)
let path = fnamemodify(a:path, ':s?[\\/]\=$??')
let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
call filter(rtp, 'index(before + after, v:val) == -1')
let &rtp = pathogen#join(before, rtp, after)
return &rtp
endfunction
" For each directory in the runtime path, add a second entry with the given
" argument appended. Curly braces are expanded with pathogen#expand().
function! pathogen#interpose(name) abort
let sep = pathogen#slash()
let name = a:name
if has_key(s:done_bundles, name)
return ""
endif
let s:done_bundles[name] = 1
let list = []
for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
else
let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
endif
endfor
let &rtp = pathogen#join(pathogen#uniq(list))
return 1
endfunction
let s:done_bundles = {}
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
function! pathogen#helptags() abort
let sep = pathogen#slash()
for glob in pathogen#split(&rtp)
for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
silent! execute 'helptags' pathogen#fnameescape(dir)
endif
endfor
endfor
endfunction
command! -bar Helptags :call pathogen#helptags()
" Execute the given command. This is basically a backdoor for --remote-expr.
function! pathogen#execute(...) abort
for command in a:000
execute command
endfor
return ''
endfunction
" Section: Unofficial
function! pathogen#is_absolute(path) abort
return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
endfunction
" Given a string, returns all possible permutations of comma delimited braced
" alternatives of that string. pathogen#expand('/{a,b}/{c,d}') yields
" ['/a/c', '/a/d', '/b/c', '/b/d']. Empty braces are treated as a wildcard
" and globbed. Actual globs are preserved.
function! pathogen#expand(pattern, ...) abort
let after = a:0 ? a:1 : ''
let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '')
if pattern =~# '{[^{}]\+}'
let [pre, pat, post] = split(substitute(pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
let found = map(split(pat, ',', 1), 'pre.v:val.post')
let results = []
for pattern in found
call extend(results, pathogen#expand(pattern))
endfor
elseif pattern =~# '{}'
let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)')
let post = pattern[strlen(pat) : -1]
let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
else
let results = [pattern]
endif
let vf = pathogen#slash() . 'vimfiles'
call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
return filter(results, '!empty(v:val)')
endfunction
" \ on Windows unless shellslash is set, / everywhere else.
function! pathogen#slash() abort
return !exists("+shellslash") || &shellslash ? '/' : '\'
endfunction
function! pathogen#separator() abort
return pathogen#slash()
endfunction
" Convenience wrapper around glob() which returns a list.
function! pathogen#glob(pattern) abort
let files = split(glob(a:pattern),"\n")
return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
endfunction
" Like pathogen#glob(), only limit the results to directories.
function! pathogen#glob_directories(pattern) abort
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
endfunction
" Remove duplicates from a list.
function! pathogen#uniq(list) abort
let i = 0
let seen = {}
while i < len(a:list)
if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
call remove(a:list,i)
elseif a:list[i] ==# ''
let i += 1
let empty = 1
else
let seen[a:list[i]] = 1
let i += 1
endif
endwhile
return a:list
endfunction
" Backport of fnameescape().
function! pathogen#fnameescape(string) abort
if exists('*fnameescape')
return fnameescape(a:string)
elseif a:string ==# '-'
return '\-'
else
return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
endif
endfunction
" Like findfile(), but hardcoded to use the runtimepath.
function! pathogen#runtime_findfile(file,count) abort
let rtp = pathogen#join(1,pathogen#split(&rtp))
let file = findfile(a:file,rtp,a:count)
if file ==# ''
return ''
else
return fnamemodify(file,':p')
endif
endfunction
" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':

@ -1 +0,0 @@
Subproject commit 22aac5c2cb6a8ebe906bf1495eb727717390e62e

@ -1 +0,0 @@
Subproject commit b0e48d0f66ef173cb70f83af927ba707b9d50fce

@ -0,0 +1 @@
Subproject commit c75b42d8a2207f7b514d2fa697a50051c4170b87

@ -0,0 +1 @@
Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172

@ -0,0 +1 @@
Subproject commit 0293b001763113d0cd7d5c8606835bd81624d9f7

@ -0,0 +1 @@
Subproject commit 0293b001763113d0cd7d5c8606835bd81624d9f7

@ -0,0 +1 @@
Subproject commit 3a7759075cca5b0dc29ce81f2747489b6c8e36a7

9
vimrc
View File

@ -1,5 +1,6 @@
""" Start vim.plug """Weird tmux settings
execute pathogen#infect() let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
""" Syntastic """ Syntastic
@ -38,8 +39,10 @@ set relativenumber
" Autoindent " Autoindent
set autoindent set autoindent
" Syntax highlighting " Colors
syntax enable syntax enable
set background=dark
colorscheme solarized8
filetype plugin on filetype plugin on
" Fuzzy Finding " Fuzzy Finding