diff --git a/.gitmodules b/.gitmodules index c67bb48..dbeea4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,12 @@ -[submodule "vim/bundle/syntastic"] - path = vim/bundle/syntastic - url = https://github.com/vim-syntastic/syntastic.git -[submodule "vim/bundle/supertab"] - path = vim/bundle/supertab +[submodule "vim/pack/plugins/opt/vim-solarized8"] + path = vim/pack/plugins/opt/vim-solarized8 + url = https://github.com/lifepillar/vim-solarized8.git +[submodule "vim/pack/plugins/start/supertab"] + path = vim/pack/plugins/start/supertab url = https://github.com/ervandew/supertab.git -[submodule "vim/bundle/vim-unimpaired"] - path = vim/bundle/vim-unimpaired - url = https://github.com/tpope/vim-unimpaired +[submodule "vim/pack/plugins/syntastic"] + path = vim/pack/plugins/syntastic + 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 diff --git a/bash_profile b/bash_profile new file mode 100644 index 0000000..8fbea55 --- /dev/null +++ b/bash_profile @@ -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 diff --git a/offlineimaprc b/offlineimaprc index 6253761..439c697 100644 --- a/offlineimaprc +++ b/offlineimaprc @@ -1,134 +1,134 @@ [general] -ui = ttyui -accounts = vt, walko, gmail -maxsyncaccounts = 3 -pythonfile = ~/.mutt/offlineimap.py +ui = ttyui +accounts = vt, walko, gmail +maxsyncaccounts = 3 +pythonfile = ~/.mutt/offlineimap.py ############################ ### Accounts # vt [Account vt] -localrepository = vt-local -remoterepository = vt-remote -autorefresh = 0.5 -quick = 10 +localrepository = vt-local +remoterepository = vt-remote +autorefresh = 0.5 +quick = 10 # walko [Account walko] -localrepository = walko-local -remoterepository = walko-remote -autorefresh = 0.5 -quick = 10 +localrepository = walko-local +remoterepository = walko-remote +autorefresh = 0.5 +quick = 10 # gmail [Account gmail] -localrepository = gmail-local -remoterepository = gmail-remote -autorefresh = 0.5 -quick = 10 +localrepository = gmail-local +remoterepository = gmail-remote +autorefresh = 0.5 +quick = 10 ########################### ### Repositories # vt [Repository vt-local] -type = Maildir -localfolders = ~/.mail/vt -nametrans = lambda folder: { - 'drafts': '[Gmail]/Drafts', - 'sent': '[Gmail]/Sent Mail', - 'flagged': '[Gmail]/Starred', - 'trash': '[Gmail]/Trash', - 'archive': '[Gmail]/All Mail', - }.get(folder, folder) +type = Maildir +localfolders = ~/.mail/vt +nametrans = lambda folder: { + 'drafts': '[Gmail]/Drafts', + 'sent': '[Gmail]/Sent Mail', + 'flagged': '[Gmail]/Starred', + 'trash': '[Gmail]/Trash', + 'archive': '[Gmail]/All Mail', + }.get(folder, folder) [Repository vt-remote] -sslcacertfile = /etc/ssl/certs/ca-certificates.crt -maxconnections = 1 -type = Gmail -keepalive = 60 -holdconnectionopen = yes -remoteuser = pwalko@vt.edu -remotepasseval = get_pass("vt") -realdelete = no -nametrans = lambda folder: { - '[Gmail]/Drafts': 'drafts', - '[Gmail]/Sent Mail': 'sent', - '[Gmail]/Starred': 'flagged', - '[Gmail]/Trash': 'trash', - '[Gmail]/All Mail': 'archive', - }.get(folder, folder) -folderfilter = lambda folder: folder not in [ - '[Gmail]/Trash', - '[Gmail]/Spam', - '[Gmail]/Important', - '[Gmail]/Chats', - ] +sslcacertfile = /etc/ssl/certs/ca-certificates.crt +maxconnections = 1 +type = Gmail +keepalive = 60 +holdconnectionopen = yes +remoteuser = pwalko@vt.edu +remotepasseval = get_pass("vt") +realdelete = no +nametrans = lambda folder: { + '[Gmail]/Drafts': 'drafts', + '[Gmail]/Sent Mail': 'sent', + '[Gmail]/Starred': 'flagged', + '[Gmail]/Trash': 'trash', + '[Gmail]/All Mail': 'archive', + }.get(folder, folder) +folderfilter = lambda folder: folder not in [ + '[Gmail]/Trash', + '[Gmail]/Spam', + '[Gmail]/Important', + '[Gmail]/Chats', + ] # walko [Repository walko-local] -type = Maildir -localfolders = ~/.mail/walko -nametrans = lambda folder: { - 'drafts': '[Gmail]/Drafts', - 'sent': '[Gmail]/Sent Mail', - 'flagged': '[Gmail]/Starred', - 'trash': '[Gmail]/Trash', - 'archive': '[Gmail]/All Mail', - }.get(folder, folder) +type = Maildir +localfolders = ~/.mail/walko +nametrans = lambda folder: { + 'drafts': '[Gmail]/Drafts', + 'sent': '[Gmail]/Sent Mail', + 'flagged': '[Gmail]/Starred', + 'trash': '[Gmail]/Trash', + 'archive': '[Gmail]/All Mail', + }.get(folder, folder) [Repository walko-remote] -sslcacertfile = /etc/ssl/certs/ca-certificates.crt -maxconnections = 1 -type = Gmail -keepalive = 60 -holdconnectionopen = yes -remoteuser = paul@walko.org -remotepasseval = get_pass("walko") -realdelete = no -nametrans = lambda folder: { - '[Gmail]/Drafts': 'drafts', - '[Gmail]/Sent Mail': 'sent', - '[Gmail]/Starred': 'flagged', - '[Gmail]/Trash': 'trash', - '[Gmail]/All Mail': 'archive', - }.get(folder, folder) -folderfilter = lambda folder: folder not in [ - '[Gmail]/Trash', - '[Gmail]/Important', - '[Gmail]/Chats', - ] +sslcacertfile = /etc/ssl/certs/ca-certificates.crt +maxconnections = 1 +type = Gmail +keepalive = 60 +holdconnectionopen = yes +remoteuser = paul@walko.org +remotepasseval = get_pass("walko") +realdelete = no +nametrans = lambda folder: { + '[Gmail]/Drafts': 'drafts', + '[Gmail]/Sent Mail': 'sent', + '[Gmail]/Starred': 'flagged', + '[Gmail]/Trash': 'trash', + '[Gmail]/All Mail': 'archive', + }.get(folder, folder) +folderfilter = lambda folder: folder not in [ + '[Gmail]/Trash', + '[Gmail]/Important', + '[Gmail]/Chats', + ] # gmail [Repository gmail-local] -type = Maildir -localfolders = ~/.mail/gmail -nametrans = lambda folder: { - 'drafts': '[Gmail]/Drafts', - 'sent': '[Gmail]/Sent Mail', - 'flagged': '[Gmail]/Starred', - 'trash': '[Gmail]/Trash', - 'archive': '[Gmail]/All Mail', - }.get(folder, folder) +type = Maildir +localfolders = ~/.mail/gmail +nametrans = lambda folder: { + 'drafts': '[Gmail]/Drafts', + 'sent': '[Gmail]/Sent Mail', + 'flagged': '[Gmail]/Starred', + 'trash': '[Gmail]/Trash', + 'archive': '[Gmail]/All Mail', + }.get(folder, folder) [Repository gmail-remote] -sslcacertfile = /etc/ssl/certs/ca-certificates.crt -maxconnections = 1 -type = Gmail -keepalive = 60 -holdconnectionopen = yes -remoteuser = paulsw.pw@gmail.com -remotepasseval = get_pass("gmail") -realdelete = no -nametrans = lambda folder: { - '[Gmail]/Drafts': 'drafts', - '[Gmail]/Sent Mail': 'sent', - '[Gmail]/Starred': 'flagged', - '[Gmail]/Trash': 'trash', - '[Gmail]/All Mail': 'archive', - }.get(folder, folder) -folderfilter = lambda folder: folder not in [ - '[Gmail]/Trash', - '[Gmail]/Spam', - '[Gmail]/Important', - '[Gmail]/Chats', - ] +sslcacertfile = /etc/ssl/certs/ca-certificates.crt +maxconnections = 1 +type = Gmail +keepalive = 60 +holdconnectionopen = yes +remoteuser = paulsw.pw@gmail.com +remotepasseval = get_pass("gmail") +realdelete = no +nametrans = lambda folder: { + '[Gmail]/Drafts': 'drafts', + '[Gmail]/Sent Mail': 'sent', + '[Gmail]/Starred': 'flagged', + '[Gmail]/Trash': 'trash', + '[Gmail]/All Mail': 'archive', + }.get(folder, folder) +folderfilter = lambda folder: folder not in [ + '[Gmail]/Trash', + '[Gmail]/Spam', + '[Gmail]/Important', + '[Gmail]/Chats', + ] diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim deleted file mode 100644 index 3582fbf..0000000 --- a/vim/autoload/pathogen.vim +++ /dev/null @@ -1,264 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" 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,'\\\@]','\\&','') - 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'\:'=': diff --git a/vim/bundle/supertab b/vim/bundle/supertab deleted file mode 160000 index 22aac5c..0000000 --- a/vim/bundle/supertab +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 22aac5c2cb6a8ebe906bf1495eb727717390e62e diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic deleted file mode 160000 index b0e48d0..0000000 --- a/vim/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0e48d0f66ef173cb70f83af927ba707b9d50fce diff --git a/vim/pack/plugins/opt/vim-solarized8 b/vim/pack/plugins/opt/vim-solarized8 new file mode 160000 index 0000000..c75b42d --- /dev/null +++ b/vim/pack/plugins/opt/vim-solarized8 @@ -0,0 +1 @@ +Subproject commit c75b42d8a2207f7b514d2fa697a50051c4170b87 diff --git a/vim/pack/plugins/start/supertab b/vim/pack/plugins/start/supertab new file mode 160000 index 0000000..40fe711 --- /dev/null +++ b/vim/pack/plugins/start/supertab @@ -0,0 +1 @@ +Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172 diff --git a/vim/pack/plugins/start/syntastic b/vim/pack/plugins/start/syntastic new file mode 160000 index 0000000..0293b00 --- /dev/null +++ b/vim/pack/plugins/start/syntastic @@ -0,0 +1 @@ +Subproject commit 0293b001763113d0cd7d5c8606835bd81624d9f7 diff --git a/vim/bundle/vim-unimpaired b/vim/pack/plugins/start/vim-unimpaired similarity index 100% rename from vim/bundle/vim-unimpaired rename to vim/pack/plugins/start/vim-unimpaired diff --git a/vim/pack/plugins/syntastic b/vim/pack/plugins/syntastic new file mode 160000 index 0000000..0293b00 --- /dev/null +++ b/vim/pack/plugins/syntastic @@ -0,0 +1 @@ +Subproject commit 0293b001763113d0cd7d5c8606835bd81624d9f7 diff --git a/vim/pack/plugins/vim-unimpaired b/vim/pack/plugins/vim-unimpaired new file mode 160000 index 0000000..3a77590 --- /dev/null +++ b/vim/pack/plugins/vim-unimpaired @@ -0,0 +1 @@ +Subproject commit 3a7759075cca5b0dc29ce81f2747489b6c8e36a7 diff --git a/vimrc b/vimrc index bfde604..d73bda6 100644 --- a/vimrc +++ b/vimrc @@ -1,5 +1,6 @@ -""" Start vim.plug -execute pathogen#infect() +"""Weird tmux settings +let &t_8f = "\[38;2;%lu;%lu;%lum" +let &t_8b = "\[48;2;%lu;%lu;%lum" """ Syntastic @@ -38,8 +39,10 @@ set relativenumber " Autoindent set autoindent -" Syntax highlighting +" Colors syntax enable +set background=dark +colorscheme solarized8 filetype plugin on " Fuzzy Finding