fiddlerwoaroof/dotfiles - Change XPUW7ZNKIKNUQSCPNU3DT4W4ADHJY3XN5FSK2SNJWLUDVCWIVP5QC

Adding xmobar and tmux configurations, updating zshrc and vimrc

xmobar configuration new: gets mpd info from mpDris2 . . .
tmux.conf now correctly deals with $TERM environment variable (I think)
.zshrc: upated keybindings for Ctrl+Arrows / Home+End keys to work in tmux.
- TODO: trim fat / split out dependencies on particular programs.
.vimrc: major reorg. to make config make more sense
- TODO: figger out how to split this up more

Created by fiddlerwoaroof on July 25, 2014

XPUW7ZNKIKNUQSCPNU3DT4W4ADHJY3XN5FSK2SNJWLUDVCWIVP5QC

Dependencies

In channels

main

Change contents

Replacement in .zshrc at line 157 [3.1]

B:BD[3.4331] → [3.4331:4507]

bindkey '[1;5D' backward-word
bindkey '[5D' backward-word
bindkey '[1;5C' forward-word
bindkey '[5C' forward-word
bindkey 'OH' beginning-of-line
bindkey 'OF' end-of-line

[3.4331]

[3.4507]

if [[ ${TERM%-256color} == "screen" ]]; then
  bindkey '[D' backward-word
  bindkey '[C' forward-word
  bindkey '[1~' beginning-of-line
  bindkey '[4~' end-of-line
else
  bindkey '[1;5D' backward-word
  bindkey '[5D' backward-word
  bindkey '[1;5C' forward-word
  bindkey '[5C' forward-word
  bindkey 'OH' beginning-of-line
  bindkey 'OF' end-of-line
fi

Insertion in .zshrc at line 324 [3.1]

[3.7298]


dirsave() {
  pwd | ctext
}
dirgo() {
  cd `ptext`
}

Replacement in .zshrc at line 486 [3.1]

B:BD[4.2660] → [4.2660:3080]

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"

[4.2660]

[4.3080]

#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"

Replacement in .zshrc at line 505 [3.1]

B:BD[4.3081] → [4.3081:3716]

    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
}

[4.3081]

[4.3716]

    #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
#}

Replacement in .zshrc at line 524 [3.1]

B:BD[4.3717] → [4.3717:3766]

if [ "$TERM" = "linux" ]; then
    set_colors
fi

[4.3717]

[4.3766]

#if [ "$TERM" = "linux" ]; then
    #set_colors
#fi

Replacement in .zshrc at line 528 [3.1]
B:BD[4.3767] → [4.3767:3787]
```
unset -f set_colors
```
[4.3767]
[4.3787]
```
#unset -f set_colors
```

File addition: .xmobarrc (----------)

[5.2]

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%"
       }

Deletion in .vimrc at line 1 [5.4]
B:BD[5.4] → [4.3814:3831]
B:BD[4.3831] → [2.459:460]
```
set nocompatible
```

Insertion in .vimrc at line 27 [5.4]

[4.4526]

NeoBundle 'Shougo/vimshell.vim'
NeoBundle 'Shougo/vimproc'

Deletion in .vimrc at line 62 [5.4]
B:BD[6.2361] → [6.2361:2387]
```
set grepprg=grep\ -nH\ $*
```
Deletion in .vimrc at line 69 [5.4]
B:BD[6.2682] → [6.2682:2709]
B:BD[6.2709] → [4.5354:5420]
```
let g:tex_flavor='xelatex'
let g:Tex_CompileRule_pdf = 'xelatex -interaction=nonstopmode $*'
```
Deletion in .vimrc at line 73 [5.4]
B:BD[5.34] → [7.292:329]
```
set modelines=1      " CVE-2007-2438
```
Deletion in .vimrc at line 76 [5.4]
B:BD[5.251] → [5.251:300]
```
set backspace=2      " more powerful backspacing
```

Deletion in .vimrc at line 96 [5.4]

B:BD[5.709] → [5.709:808]


"Turn on line-numbering and auto-indent
:set nu
":set cindent shiftwidth=2
":set cindent cino=>2

Replacement in .vimrc at line 97 [5.4]

B:BD[5.850] → [5.850:881]

B:BD[5.881] → [4.5421:5437]

∅:D[4.5437] → [5.881:907]

B:BD[5.881] → [5.881:907]

B:BD[5.924] → [5.924:1059]

B:BD[5.1059] → [8.4:41]

B:BD[8.41] → [6.2803:2858]

B:BD[6.2858] → [4.5438:5499]

∅:D[8.41] → [5.1059:1077]

∅:D[6.2858] → [5.1059:1077]

∅:D[4.5499] → [5.1059:1077]

B:BD[5.1059] → [5.1059:1077]

: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#

[5.850]

[5.1077]

set ignorecase
set smartcase
set autoindent
set nu
set expandtab
set tabstop=3 softtabstop=2
set shiftwidth=2

Replacement in .vimrc at line 105 [5.4]
B:BD[5.1091] → [5.1091:1107]
```
set scrolloff=3
```
[5.1091]
[5.1107]
```
set scrolloff=4
```

Deletion in .vimrc at line 108 [5.4]

B:BD[5.1146] → [5.1146:1483]

B:BD[5.1483] → [4.5500:5542]


"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

Replacement in .vimrc at line 110 [5.4]

B:BD[4.5580] → [4.5580:5602]

colorscheme solarized

[4.5580]

[4.5602]

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

Insertion in .vimrc at line 124 [5.4]

[4.5603]

[5.1517]

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=''

Deletion in .vimrc at line 151 [5.4]
B:BD[5.1546] → [5.1546:1572]
```
let python_space_errors=1
```

Replacement in .vimrc at line 152 [5.4]

B:BD[5.1604] → [5.1604:1658]

B:BD[5.1658] → [4.5604:5651]

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

[5.1604]

[4.5651]

let python_space_errors=1
let vimclojure#WantNailgun = 1
syntax enable
colorscheme solarized

Replacement in .vimrc at line 159 [5.4]

B:BD[4.5652] → [4.5652:5875]

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>

[4.5652]

[4.5875]

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

Deletion in .vimrc at line 170 [5.4]

∅:D[4.5876] → [5.1658:1806]

B:BD[5.1658] → [5.1658:1806]

autocmd FileType python set complete+=k~/.vim/syntax/python.vim "isk+=.,(
autocmd FileType python set noexpandtab
autocmd FileType python map K \pW

Insertion in .vimrc at line 172 [5.4]

[4.5878]

"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

Replacement in .vimrc at line 184 [5.4]

B:BD[4.6045] → [4.6045:6261]

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

[4.6045]

[4.6261]

"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

Replacement in .vimrc at line 188 [5.4]
∅:D[4.6262] → [5.1807:1821]
B:BD[5.1807] → [5.1807:1821]
B:BD[5.1821] → [4.6263:6338]
∅:D[4.6338] → [5.1896:1946]
B:BD[5.1896] → [5.1896:1946]
```
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 ``
```
[4.6262]
[5.1946]
```
"inoremap  X#
```

Replacement in .vimrc at line 190 [5.4]

B:BD[5.1947] → [5.1947:1976]

map ZZ :w<CR>
map ZX :wq<cr>

[5.1947]

[5.1976]

"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

Insertion in .vimrc at line 206 [5.4]

[5.1989]

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>

Replacement in .vimrc at line 217 [5.4]

B:BD[5.1990] → [5.1990:2175]

B:BD[5.2175] → [4.6339:6363]

" 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>

[5.1990]

[5.2198]

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>

Deletion in .vimrc at line 236 [5.4]

B:BD[5.2357] → [6.2859:2942]

let counter = 0
inoremap <expr> <C-L> ListItem()
inoremap <expr> <C-R> ListReset()

Deletion in .vimrc at line 246 [5.4]
∅:D[6.3061] → [5.3521:3571]
B:BD[5.3521] → [5.3521:3571]
```
:set diffopt=vertical,filler,iwhite,foldcolumn:0
```

Replacement in .vimrc at line 247 [5.4]

B:BD[6.3063] → [6.3063:3161]

map <F8> o:,!pbpaste
map <F9> o:,!pbpaste
imap <F8> o:,!pbpaste
imap <F9> o:,!pbpaste

[6.3063]

[6.3161]

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

Deletion in .vimrc at line 249 [5.4]
B:BD[6.3162] → [6.3162:3199]
```
let $PAGER=''
let maplocalleader=','
```

Deletion in .vimrc at line 277 [5.4]

B:BD[6.4123] → [6.4123:4252]

let g:haddock_browser = "open"
let g:haddock_browser_callformat = "%s %s"
let g:ghc="/usr/bin/ghc"
au BufEnter *.hs compiler ghc

Deletion in .vimrc at line 278 [5.4]

B:BD[4.7279] → [4.7279:7373]

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

Deletion in .vimrc at line 279 [5.4]
B:BD[6.4253] → [6.4253:4326]
B:BD[6.4326] → [4.7374:7405]
∅:D[4.7405] → [6.4358:4359]
B:BD[6.4358] → [6.4358:4359]
```
let g:vimclojure#HighlightBuiltins = 1
let g:vimclojure#ParenRainbow = 1
let vimclojure#WantNailgun = 1
```

Deletion in .vimrc at line 281 [5.4]

B:BD[9.58] → [9.58:90]

B:BD[9.90] → [4.7406:8038]

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

Deletion in .vimrc at line 282 [5.4]

B:BD[4.8039] → [4.8039:8718]

" 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']

Insertion in .vimrc at line 285 [5.4]
[4.8774]

File addition: .tmux.conf (----------)