new file mode 100644

@@ -0,0 +1,26 @@

+new -s catchnet

+set -g default-terminal "screen-256color"

+setw -g mode-keys vi

+

+# smart pane switching with awareness of vim splits

+bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L"

+bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"

+bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"

+bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"

+bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys 'C-\\') || tmux select-pane -l"

+

+

+set -g status-left-length 52

+set -g status-right-length 451

+set -g status-fg white

+set -g status-bg colour234

+set -g window-status-activity-attr bold

+set -g pane-border-fg colour245

+set -g pane-active-border-fg colour39

+set -g message-fg colour16

+set -g message-bg colour221

+set -g message-attr bold

+set -g status-left '#[fg=colour235,bg=colour252,bold]  #S #[fg=colour252,bg=colour238,nobold]#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]'

+set -g window-status-format "#[fg=white,bg=colour234] #I #W"

+set -g window-status-current-format "#[fg=colour234,bg=colour39] #[fg=colour25,bg=colour39,noreverse,bold] #I  #W #[fg=colour39,bg=colour234,nobold]"

+

@@ -1,5 +1,3 @@

-set nocompatible

-

 "NeoBundle Scripts-----------------------------

 if has('vim_starting')

   set nocompatible               " Be iMproved

@@ -26,6 +24,8 @@ NeoBundle 'godlygeek/tabular'

 NeoBundle 'ytsunetsune/unite-outline-euslisp'

 NeoBundle 'Shougo/unite-outline'

 NeoBundle 'Shougo/unite.vim'

+NeoBundle 'Shougo/vimshell.vim'

+NeoBundle 'Shougo/vimproc'

 NeoBundle 'bling/vim-airline'

 NeoBundle 'guns/vim-clojure-static'

 NeoBundle 'altercation/vim-colors-solarized'

@@ -59,7 +59,6 @@ NeoBundleCheck

 " IMPORTANT: grep will sometimes skip displaying the file name if you

 " search in a singe file. This will confuse Latex-Suite. Set your grep

 " program to always generate a file-name.

-set grepprg=grep\ -nH\ $*

 " OPTIONAL: This enables automatic indentation as you type.

 filetype indent on

@@ -67,17 +66,13 @@ filetype indent on

 " OPTIONAL: Starting with Vim 7, the filetype of empty .tex files defaults to

 " 'plaintex' instead of 'tex', which results in vim-latex not being loaded.

 " The following changes the default filetype back to 'tex':

-let g:tex_flavor='xelatex'

-let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*'

 " Configuration file for vim

-set modelines=1      " CVE-2007-2438

 " Normally we use vim-extensions. If you want true vi-compatibility

 " remove change the following statements

-set backspace=2      " more powerful backspacing

 " Don't write backup file if vim is being called by "crontab -e"

 au BufWrite /private/tmp/crontab.* set nowritebackup

@@ -98,92 +93,136 @@ au BufWrite /private/etc/pw.* set nowritebackup

-

-"Turn on line-numbering and auto-indent

-:set nu

-":set cindent shiftwidth=2

-":set cindent cino=>2

-

 "Diable the anti-python smart indent of #

-:set ignorecase

-:set smartcase

-:set autoindent

-

-

-"SmartIndent for Python

-:autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

-:autocmd BufRead *.mako set ft=mako

-:autocmd BufRead *.tac set ft=python

-:autocmd! BufNewFile * silent! 0r ~/.vim/skel/tmpl.%:e

-

-:autocmd BufRead *.md set dictionary+=/usr/share/dict/words

-

-:inoremap # X#

-

+set ignorecase

+set smartcase

+set autoindent

+set nu

+set expandtab

+set tabstop=3 softtabstop=2

+set shiftwidth=2

 set incsearch

-set scrolloff=3

+set scrolloff=4

 set wildmode=longest,list

 set autoread

-

-"Render tabs as 2 columns wide

-set tabstop=3 expandtab

-set shiftwidth=3

-":else

-":  set tabstop=3 softtabstop=2 expandtab

-":  set shiftwidth=2

-":endif

-

-"Code shifting with >> operator will shift code by 2 cols

-"    is there a way to shift code by a tab?

-

-"Turn Syntax Highlighting on by default, and assume the xterm background is black

-syntax enable

-let g:solarized_termtrans=1

 set background=dark

 set omnifunc=syntaxcomplete#Complete

-colorscheme solarized

+set pastetoggle=<F12>

+set undodir=~/.vim/undodir

+set undofile

+set undolevels=10000

+set undoreload=100000

+set foldlevel=9

+set hidden

+set laststatus=2

+set splitbelow

+set splitright

+set grepprg=grep\ -nH\ $*

+set modelines=1      " CVE-2007-2438

+set backspace=2      " more powerful backspacing

+let counter = 0

+let g:airline_theme="murmur"

+let g:ghc="/usr/bin/ghc"

+let g:haddock_browser_callformat = "%s %s"

+let g:haddock_browser = "open"

+let g:lisp_rainbow=1 

+let g:pandoc_no_empty_implicits=1

+let g:pandoc_use_hard_wraps = 1

+let g:pantondoc_enabled_modules =  ["formatting", "folding", "bibliographies",

+                                       \"completion", "externals", "metadata",

+                                              \"menu", "executors", "motions"]

+let g:pantondoc_formatting_settings = "h"

+let g:pantondoc_handled_filetypes = ["markdown", "rst", "textile"]

+let g:slimv_disable_clojure=1

+let g:snips_author="Edward Langley"

+let g:solarized_termtrans=1

+let g:syntastic_python_checkers = ['python']

+let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*'

+let g:tex_flavor='xelatex'

+let g:vimclojure#HighlightBuiltins = 1

+let g:vimclojure#HighlightBuiltins = 1

+let g:vimclojure#ParenRainbow = 1

+let g:vimclojure#ParenRainbow = 1

+let g:virtualenv_directory = "$HOME/python_envs"

+let maplocalleader=','

+let $PAGER=''

 let python_highlight_all = 1

-let python_space_errors=1

 let python_no_tab_space_error=1

-nnoremap <F2> :set nonumber!<CR>:set foldcolumn=0<CR>

-inoremap <F2> :set nonumber! foldcolumn=0<CR>

+let python_space_errors=1

+let vimclojure#WantNailgun = 1

-inoremap <F3> :!spot_control pr<CR>

-noremap <F3> :!spot_control pr<CR>

-inoremap <F4> :!spot_control p<CR><CR>

-noremap <F4> :!spot_control p<CR><CR>

-inoremap <F5> :!spot_control n<CR>

-noremap <F5> :!spot_control n<CR>

+syntax enable

+colorscheme solarized

-autocmd FileType python set complete+=k~/.vim/syntax/python.vim "isk+=.,(

-autocmd FileType python set noexpandtab

-autocmd FileType python map K \pW

+

+if &term =~ "xterm\\|rxvt"

+  " use an orange cursor in insert mode

+  let &t_SI = "\<Esc>]12;blue\x7"

+  " use a red cursor otherwise

+  let &t_EI = "\<Esc>]12;yellow\x7"

+  silent !echo -ne "\033]12;yellow\007"

+  " reset cursor when vim exits

+  autocmd VimLeave * silent !echo -ne "\033]112\007"

+  " use \003]12;gray\007 for gnome-terminal

+endif

+

+"SmartIndent for Python

+autocmd BufEnter *.hs compiler ghc

+autocmd! BufNewFile * silent! 0r ~/.vim/skel/tmpl.%:e

+autocmd BufRead *.mako set ft=mako

+autocmd BufRead *.md set dictionary+=/usr/share/dict/words

+autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif

+autocmd BufRead *.tac set ft=python

+autocmd BufRead *.py set smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class

+autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

+autocmd FileType markdown set linebreak tw=110 noexpandtab nosmartindent autoindent

 autocmd FileType pandoc set linebreak tw=110 noexpandtab nosmartindent autoindent

 autocmd FileType pantondoc set linebreak tw=110 noexpandtab nosmartindent autoindent

-autocmd FileType markdown set linebreak tw=110 noexpandtab nosmartindent autoindent

-let g:snips_author="Edward Langley"

-let g:pandoc_no_empty_implicits=1

-let g:pandoc_use_hard_wraps = 1

-"let g:pandoc_auto_format = 1

+"autocmd FileType python map K \pW

+autocmd FileType python set complete+=k~/.vim/syntax/python.vim "isk+=.,(

+" when we reload, tell vim to restore the cursor to the saved position

-map W wb"_dwP

-map CS :sil! :%s/\s\+$//g<CR>``:%s/^\(\t\+\)\( \+\(\t*\)\)\+/\1\3/gc<CR>``

-autocmd BufWritePre *.py normal m`:%s/\s\+$//e ``

+"inoremap  X#

-map ZZ :w<CR>

-map ZX :wq<cr>

+"Turn Syntax Highlighting on by default, and assume the xterm background is black

+imap <C-g> :Unite outline
i

+imap <F7> :Unite outline
i

+imap <F8> o
:,!pbpaste

+imap <F9> o
:,!pbpaste

+inoremap <expr> <C-L> ListItem()

+inoremap <expr> <C-R> ListReset()

+inoremap <F2> :set nonumber! foldcolumn=0<CR>

+inoremap <F3> :!spot_control pr<CR>

+inoremap <F4> :!spot_control p<CR><CR>

+inoremap <F5> :!spot_control n<CR>

+inoremap <Return> <Return><C-g>u

+inoremap <Space> <Space><C-g>u

+inoremap <Tab> <Tab><C-g>u

 map <BS> dh

+map <C-g> :Unite outline
i

+map CS :sil! :%s/\s\+$//g<CR>``:%s/^\(\t\+\)\( \+\(\t*\)\)\+/\1\3/gc<CR>``

+map <F7> :Unite outline
i

+map <F8> o
:,!pbpaste

+map <F9> o
:,!pbpaste

+map <leader>f :Unite file<CR>i

+map <leader>q :Unite buffer<CR>i

+map W wb"_dwP

+map ZX :wq<cr>

+map ZZ :w<CR>

-" when we reload, tell vim to restore the cursor to the saved position

-:au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif

-

-filetype plugin on

-

-:set pastetoggle=<F12>

+nmap <Leader>ci <Plug>VCSCommit

+nnoremap <C-H> <C-W><C-H>

+nnoremap <C-J> <C-W><C-J>

+nnoremap <C-K> <C-W><C-K>

+nnoremap <C-L> <C-W><C-L>

+nnoremap <F2> :set nonumber!<CR>:set foldcolumn=0<CR>

+noremap <F3> :!spot_control pr<CR>

+noremap <F4> :!spot_control p<CR><CR>

+noremap <F5> :!spot_control n<CR>

 python << EOF

 import os

@@ -194,9 +233,6 @@ for p in sys.path:

         vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))

 EOF

-let counter = 0

-inoremap <expr> <C-L> ListItem()

-inoremap <expr> <C-R> ListReset()

 func ListItem()

  let g:counter += 1

@@ -208,15 +244,8 @@ func ListReset()

  return ''

 endfunc

-:set diffopt=vertical,filler,iwhite,foldcolumn:0

-

-map <F8> o
:,!pbpaste

-map <F9> o
:,!pbpaste

-imap <F8> o
:,!pbpaste

-imap <F9> o
:,!pbpaste

+set diffopt=vertical,filler,iwhite,foldcolumn:0

-let $PAGER=''

-let maplocalleader=','

 "command! -range FmtTable python FmtTable(<f-line1>,<f-line2>)

@@ -245,80 +274,12 @@ let maplocalleader=','

 "    cb[1:]=tmpBuf[:]

 "EOS

-let g:haddock_browser = "open"

-let g:haddock_browser_callformat = "%s %s"

-let g:ghc="/usr/bin/ghc"

-au BufEnter *.hs compiler ghc

-

-:inoremap <Space> <Space><C-g>u

-:inoremap <Tab> <Tab><C-g>u

-:inoremap <Return> <Return><C-g>u

-let g:vimclojure#HighlightBuiltins = 1

-let g:vimclojure#ParenRainbow = 1

-let vimclojure#WantNailgun = 1

 highlight PmenuSel ctermfg=LightGray  ctermbg=DarkRed

-nmap <Leader>ci <Plug>VCSCommit

-

-set undodir=~/.vim/undodir

-set undofile

-set undolevels=10000

-set undoreload=100000

-set foldlevel=9

-set hidden

-

-map <leader>f :Unite file<CR>i

-map <leader>q :Unite buffer<CR>i

-

-map <F7> :Unite outline
i

-imap <F7> :Unite outline
i

-map <C-g> :Unite outline
i

-imap <C-g> :Unite outline
i

-

-

-if &term =~ "xterm\\|rxvt"

-  " use an orange cursor in insert mode

-  let &t_SI = "\<Esc>]12;blue\x7"

-  " use a red cursor otherwise

-  let &t_EI = "\<Esc>]12;yellow\x7"

-  silent !echo -ne "\033]12;yellow\007"

-  " reset cursor when vim exits

-  autocmd VimLeave * silent !echo -ne "\033]112\007"

-  " use \003]12;gray\007 for gnome-terminal

-endif

-

-" Pantondoc

-

-let g:pantondoc_handled_filetypes = ["markdown", "rst", "textile"]

-let g:pantondoc_enabled_modules =  ["formatting", "folding",

-         \"bibliographies", "completion", "externals", "metadata",

-         \"menu", "executors", "motions"]

-let g:pantondoc_formatting_settings = "h"

-let g:lisp_rainbow=1 

-let g:slimv_disable_clojure=1

-

-let g:vimclojure#HighlightBuiltins = 1

-let g:vimclojure#ParenRainbow = 1

-

-set laststatus=2

-

-" airline

-"

-let g:airline_theme="murmur"

-

-" split settings

-"

-nnoremap <C-J> <C-W><C-J>

-nnoremap <C-K> <C-W><C-K>

-nnoremap <C-L> <C-W><C-L>

-nnoremap <C-H> <C-W><C-H>

-set splitbelow

-set splitright

-

-let g:syntastic_python_checkers = ['python']

 if filereadable(".vim.custom")

     so .vim.custom

 endif

+

new file mode 100644

@@ -0,0 +1,21 @@

+Config { font = "xft:Source Code Pro:size=8:antialias=true"

+       , bgColor = "black"

+       , fgColor = "grey"

+       , position = TopW L 90

+       , commands = [ Run Weather "EGPF" ["-t"," <tempF>F","-L","64","-H","77","--normal","green","--high","red","--low","lightblue"] 36000

+                    , Run Cpu ["-L","3","-H","50","--normal","green","--high","red"] 10

+                    , Run Mpris2 "mpd" ["-t", "(<state>) <artist>/<composer>: <title>"] 10

+                    , Run Memory ["-t","Mem: <usedratio>%"] 10

+                    , Run Swap [] 10

+                    , Run Date "%a %b %_d" "date" 36000

+                    , Run Date "%H:%M:%S" "time" 10

+                    , Run Com "cat" ["/proc/loadavg"] "loadavg" 20

+                    , Run Com "echo" ["$USER"] "username" 864000

+                    , Run Com "hostname" ["-s"] "hostname" 864000

+                    , Run StdinReader

+                    ]

+       , sepChar = "%"

+       , alignSep = "}{"

+       , template = "%mpris2% :: %StdinReader% }{ %cpu% | %memory% * %swap% | %loadavg% -- %username%@%hostname%    <fc=#ee9a00>%date% %time%</fc> | %EGPF%"

+       }

+

@@ -154,12 +154,19 @@ compinit

 # End of lines added by compinstall

 bindkey -e

-bindkey '' backward-word

-bindkey '' backward-word

-bindkey '' forward-word

-bindkey '' forward-word

-bindkey 'OH' beginning-of-line

-bindkey 'OF' end-of-line

+if [[ ${TERM%-256color} == "screen" ]]; then

+  bindkey '' backward-word

+  bindkey '' forward-word

+  bindkey '[1~' beginning-of-line

+  bindkey '[4~' end-of-line

+else

+  bindkey '' backward-word

+  bindkey '' backward-word

+  bindkey '' forward-word

+  bindkey '' forward-word

+  bindkey 'OH' beginning-of-line

+  bindkey 'OF' end-of-line

+fi

 bindkey '[3~' delete-char

 [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function

@@ -314,6 +321,14 @@ pathswitch() {

 	cd ${PWD/$REMOVE/$REPLACE}

 }

 #debug

+

+dirsave() {

+  pwd | ctext

+}

+dirgo() {

+  cd `ptext`

+}

+

 ccwd() {

     pwd | pbcopy

 }

@@ -468,48 +483,48 @@ export CPATH=$CPATH:$HOME/include

 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib

 export VIMCLOJURE_SERVER_JAR="$HOME/lib/vimclojure/server-2.3.6.jar"

-set_colors()

-{

-    local base03="002b36"

-    local base02="073642"

-    local base01="586e75"

-    local base00="657b83"

-    local base0="839496"

-    local base1="93a1a1"

-    local base2="eee8d5"

-    local base3="fdf6e3"

-    local yellow="b58900"

-    local orange="cb4b16"

-    local red="dc322f"

-    local magenta="d33682"

-    local violet="6c71c4"

-    local blue="268bd2"

-    local cyan="2aa198"

-    local green="859900"

-

-    echo -en "\e]P0${base02}" #black

-    echo -en "\e]P8${base03}" #brblack

-    echo -en "\e]P1${red}" #red

-    echo -en "\e]P9${orange}" #brred

-    echo -en "\e]P2${green}" #green

-    echo -en "\e]PA${base01}" #brgreen

-    echo -en "\e]P3${yellow}" #yellow

-    echo -en "\e]PB${base00}" #bryellow

-    echo -en "\e]P4${blue}" #blue

-    echo -en "\e]PC${base0}" #brblue

-    echo -en "\e]P5${magenta}" #magenta

-    echo -en "\e]PD${violet}" #brmagenta

-    echo -en "\e]P6${cyan}" #cyan

-    echo -en "\e]PE${base1}" #brcyan

-    echo -en "\e]P7${base2}" #white

-    echo -en "\e]PF${base3}" #brwhite

-    clear #for background artifacting

-}

-

-if [ "$TERM" = "linux" ]; then

-    set_colors

-fi

-

-unset -f set_colors

+#set_colors()

+#{

+    #local base03="002b36"

+    #local base02="073642"

+    #local base01="586e75"

+    #local base00="657b83"

+    #local base0="839496"

+    #local base1="93a1a1"

+    #local base2="eee8d5"

+    #local base3="fdf6e3"

+    #local yellow="b58900"

+    #local orange="cb4b16"

+    #local red="dc322f"

+    #local magenta="d33682"

+    #local violet="6c71c4"

+    #local blue="268bd2"

+    #local cyan="2aa198"

+    #local green="859900"

+

+    #echo -en "\e]P0${base02}" #black

+    #echo -en "\e]P8${base03}" #brblack

+    #echo -en "\e]P1${red}" #red

+    #echo -en "\e]P9${orange}" #brred

+    #echo -en "\e]P2${green}" #green

+    #echo -en "\e]PA${base01}" #brgreen

+    #echo -en "\e]P3${yellow}" #yellow

+    #echo -en "\e]PB${base00}" #bryellow

+    #echo -en "\e]P4${blue}" #blue

+    #echo -en "\e]PC${base0}" #brblue

+    #echo -en "\e]P5${magenta}" #magenta

+    #echo -en "\e]PD${violet}" #brmagenta

+    #echo -en "\e]P6${cyan}" #cyan

+    #echo -en "\e]PE${base1}" #brcyan

+    #echo -en "\e]P7${base2}" #white

+    #echo -en "\e]PF${base3}" #brwhite

+    ##clear #for background artifacting

+#}

+

+#if [ "$TERM" = "linux" ]; then

+    #set_colors

+#fi

+

+#unset -f set_colors

 # vim: set filetype=sh: