Merge branch 'master' of gitorious.org:hunner/hunners-dotfiles

.Xdefaults

@@ -1,35 +1,30 @@
-Xft.antialias: true
+Xft*antialias: true
+Xft*dpi: 96
 URxvt*scrollBar: false
-!URxvt*background: rgba:0000/0000/0000/cccc
 URxvt*background: rgba:0000/0000/0000/dddd
-!URxvt*background: rgba:1111/1111/1111/dddd
+URxvt.depth: 32
-URxvt*depth: 32
 URxvt*foreground: #dddddd
-!URxvt*foreground: #c3c6c8
-!URxvt*transparent: true
 URxvt*transparent: false
+URxvt*urgentOnBell: True
 !URxvt*fading: 2%
 !URxvt*shading: 30
 !URxvt*fadeColor: grey
 URxvt*buffered: true
-URxvt*cursorColor: green
+URxvt*cursorColor: #99ff00
-!URxvt*cursorColor: #007998
-!URxvt*font: xft:Terminus:pixelsize=11,xft:IPAGothic:antialias=true
 URxvt*font: xft:DroidSansMonoDotted:pixelsize=12,xft:IPAGothic:antialias=true
+!URxvt*font: xft:Terminus:pixelsize=11,xft:IPAGothic:antialias=true
 !URxvt*font: 6x13,xft:IPAGothic:antialias=true
-!URxvt*perl-ext-common: default
-!URxvt*color1:  #007998
-!URxvt*color9:  #228bba
 
-URxvt.perl-ext-common: default,matcher
+URxvt*perl-ext-common: default,matcher
 !URxvt*urlLauncher: urxvt-to-uzbl.sh
-URxvt*urlLauncher: chromium
+URxvt*urlLauncher: chromium-dev
-URxvt.matcher.button: 1
+URxvt*matcher.button: 1
-URxvt.colorUL: #cc0000
+!URxvt*colorUL: green
-URxvt.searchable-scrollback: CM-S
+URxvt*searchable-scrollback: F10
-!URxvt.colorUL: #007998
+URxvt.underlineColor: #99ff00
+URxvt.urgentOnBell: True
 
-!URxvt.borderLess:True
+URxvt.borderLess:False
 !URxvt.reverseVideo:True
 !URxvt.scrollBar:False
 !URxvt.linespace:5

.muttrc

@@ -0,0 +1,92 @@
+# Gmail stuff
+#set imap_user="hunter.haugen@gmail.com"
+set imap_user="hunner"
+#set imap_pass="password"
+
+#set smtp_url="smtp://hunter.haugen@smtp.gmail.com:587/"
+set smtp_url="smtp://mailhost.cecs.pdx.edu:587/"
+#set ssl_min_dh_prime_bits=512
+#set smtp_pass="password"
+set from="hunner@cat.pdx.edu"
+set realname="Hunter Haugen"
+
+#set folder="imaps://imap.gmail.com:993"
+set folder="imaps://mailhost.cecs.pdx.edu:993"
+set spoolfile="+INBOX"
+#set postponed="+[Gmail]/Drafts"
+#set record="+[Gmail]/Sent Mail"
+
+# Cache message headers for quick retrieval
+set header_cache=~/.mutt/cache/headers
+set message_cachedir=~/.mutt/cache/bodies
+set certificate_file=~/.mutt/certificates
+
+set move=no
+
+# Sort like gmail sorts it
+set sort=threads
+set sort_aux=last-date-received
+# Automatically poll subscribed mailboxes for new mail
+set imap_check_subscribed
+# Display download progress every 5K
+set net_inc=5
+
+# uber-mutt stuff
+set sidebar_width=22
+set sidebar_visible=no
+set sidebar_delim='|'
+set sidebar_sort=yes
+color sidebar_new color148 default
+bind index \CP sidebar-prev
+bind index \CN sidebar-next
+bind index \CO sidebar-open
+bind pager \CP sidebar-prev
+bind pager \CN sidebar-next
+bind pager \CO sidebar-open
+macro index b '<enter-command>toggle sidebar_visible<enter><refresh>'
+macro pager b '<enter-command>toggle sidebar_visible<enter><redraw-screen>'
+bind index B bounce-message
+
+# Ignore gmail stuff, just in case
+ignore "Authentication-Results:"
+ignore "DomainKey-Signature:"
+ignore "DKIM-Signature:"
+
+# Pretty it up
+# ----
+# default list of header fields to weed out when displaying mail
+# ignore them all and then unignore what you want to see
+ignore *
+unignore  Date To From: Cc Subject X-Tts
+hdr_order Date To From: Cc Subject X-Tts
+color normal default default
+color header color148 default '^(Cc|Date|To|From|Subject|X-Tts):'
+color hdrdefault cyan default
+
+color index white default ~N
+color index brightwhite default ~O
+color index magenta default ~F
+color index brightblack default ~D
+
+color tree magenta default
+color quoted magenta default
+color quoted1 white default
+color quoted2 brightred default
+color quoted3 brightmagenta default
+
+#color body cyan default "((ftp|http|https)://|news:)[^ >)\"\t]+"
+color body magenta default "[-a-z_0-9.+]+@[-a-z_0-9.]+\.[a-z]{2,3}"
+color error color88 default
+color indicator black color148
+color signature brightblack default
+color status color148 black
+color tilde blue default
+
+# Key bindings
+bind pager h display-toggle-weed
+
+# Macros
+macro index c   "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro pager c   "<change-folder>?<toggle-mailboxes>" "open a different folder"
+macro index \ec "T.*\n;WN;WO^T.*\n"                  "catch up"
+macro generic ,sm ":source $HOME/.muttrc\r"          "Resource .muttrc without restart"

.vim/syntax/tmux.vim

@@ -0,0 +1,102 @@
+" Vim syntax file
+" Language: tmux(1) configuration file
+" Maintainer: Tiago Cunha <me@tiagocunha.org>
+" Last Change: $Date: 2010/02/26 13:33:22 $
+" License: This file is placed in the public domain.
+
+if version < 600
+	syntax clear
+elseif exists("b:current_syntax")
+	finish
+endif
+
+setlocal iskeyword+=-
+syntax case match
+
+syn keyword tmuxAction	any current none
+syn keyword tmuxBoolean	off on
+
+syn keyword tmuxCmds detach[-client] ls list-sessions neww new-window
+syn keyword tmuxCmds bind[-key] unbind[-key] prev[ious-window] last[-window]
+syn keyword tmuxCmds lsk list-keys set[-option] renamew rename-window selectw
+syn keyword tmuxCmds select-window lsw list-windows attach[-session]
+syn keyword tmuxCmds send-prefix refresh[-client] killw kill-window lsc
+syn keyword tmuxCmds list-clients linkw link-window unlinkw unlink-window
+syn keyword tmuxCmds next[-window] send[-keys] swapw swap-window
+syn keyword tmuxCmds rename[-session] kill-session switchc switch-client
+syn keyword tmuxCmds has[-session] copy-mode pasteb paste-buffer
+syn keyword tmuxCmds new[-session] start[-server] kill-server setw
+syn keyword tmuxCmds set-window-option show[-options] showw show-window-options
+syn keyword tmuxCmds command-prompt setb set-buffer showb show-buffer lsb
+syn keyword tmuxCmds list-buffers deleteb delete-buffer lscm list-commands
+syn keyword tmuxCmds movew move-window select-prompt respawnw respawn-window
+syn keyword tmuxCmds source[-file] info server-info clock-mode lock[-server]
+syn keyword tmuxCmds saveb save-buffer downp down-pane killp
+syn keyword tmuxCmds kill-pane resizep resize-pane selectp select-pane swapp
+syn keyword tmuxCmds swap-pane splitw split-window upp up-pane choose-session
+syn keyword tmuxCmds choose-window loadb load-buffer copyb copy-buffer suspendc
+syn keyword tmuxCmds suspend-client findw find-window breakp break-pane nextl
+syn keyword tmuxCmds next-layout rotatew rotate-window confirm[-before]
+syn keyword tmuxCmds clearhist clear-history selectl select-layout if[-shell]
+syn keyword tmuxCmds display[-message] setenv set-environment showenv
+syn keyword tmuxCmds show-environment choose-client displayp display-panes
+syn keyword tmuxCmds run[-shell] lockc lock-client locks lock-session lsp
+syn keyword tmuxCmds list-panes pipep pipe-pane showmsgs show-messages capturep
+syn keyword tmuxCmds capture-pane joinp join-pane
+
+syn keyword tmuxOptsSet prefix status status-fg status-bg bell-action
+syn keyword tmuxOptsSet default-command history-limit status-left status-right
+syn keyword tmuxOptsSet status-interval set-titles display-time buffer-limit
+syn keyword tmuxOptsSet status-left-length status-right-length message-fg
+syn keyword tmuxOptsSet message-bg lock-after-time default-path repeat-time
+syn keyword tmuxOptsSet message-attr status-attr status-keys set-remain-on-exit
+syn keyword tmuxOptsSet status-utf8 default-terminal visual-activity
+syn keyword tmuxOptsSet visual-bell visual-content status-justify
+syn keyword tmuxOptsSet terminal-overrides status-left-attr status-left-bg
+syn keyword tmuxOptsSet status-left-fg status-right-attr status-right-bg
+syn keyword tmuxOptsSet status-right-fg update-environment base-index
+syn keyword tmuxOptsSet display-panes-colour display-panes-time default-shell
+syn keyword tmuxOptsSet set-titles-string lock-command lock-server
+syn keyword tmuxOptsSet mouse-select-pane message-limit quiet escape-time
+syn keyword tmuxOptsSet pane-active-border-bg pane-active-border-fg
+syn keyword tmuxOptsSet pane-border-bg pane-border-fg
+syn keyword tmuxOptsSet display-panes-active-colour alternate-screen
+
+syn keyword tmuxOptsSetw monitor-activity aggressive-resize force-width
+syn keyword tmuxOptsSetw force-height remain-on-exit uft8 mode-fg mode-bg
+syn keyword tmuxOptsSetw mode-keys clock-mode-colour clock-mode-style
+syn keyword tmuxOptsSetw xterm-keys mode-attr window-status-attr
+syn keyword tmuxOptsSetw window-status-bg window-status-fg automatic-rename
+syn keyword tmuxOptsSetw main-pane-width main-pane-height monitor-content
+syn keyword tmuxOptsSetw window-status-current-attr window-status-current-bg
+syn keyword tmuxOptsSetw window-status-current-fg mode-mouse synchronize-panes
+syn keyword tmuxOptsSetw window-status-format window-status-current-format
+syn keyword tmuxOptsSetw word-separators
+
+syn keyword tmuxTodo FIXME NOTE TODO XXX contained
+
+syn match tmuxKey		/\(C-\|M-\|\^\)\p/	display
+syn match tmuxNumber 		/\d\+/			display
+syn match tmuxOptions		/\s-\a\+/		display
+syn match tmuxVariable		/\w\+=/			display
+syn match tmuxVariableExpansion	/\${\=\w\+}\=/		display
+
+syn region tmuxComment	start=/#/ end=/$/ contains=tmuxTodo display oneline
+syn region tmuxString	start=/"/ end=/"/ display oneline
+syn region tmuxString	start=/'/ end=/'/ display oneline
+
+hi def link tmuxAction			Boolean
+hi def link tmuxBoolean			Boolean
+hi def link tmuxCmds			Keyword
+hi def link tmuxComment			Comment
+hi def link tmuxKey			Special
+hi def link tmuxNumber			Number
+hi def link tmuxOptions			Identifier
+hi def link tmuxOptsSet			Function
+hi def link tmuxOptsSetw		Function
+hi def link tmuxString			String
+hi def link tmuxTodo			Todo
+hi def link tmuxVariable		Constant
+hi def link tmuxVariableExpansion	Constant
+
+let b:current_syntax = "tmux"

.vimrc

@@ -9,7 +9,7 @@ scriptencoding utf-8
 "-----------------------------------------------------------------------
 
 " Want utf8 at all times
-"set termencoding=utf-8
+set termencoding=utf-8
 set encoding=utf-8
 set fenc=utf-8
 
@@ -519,6 +519,9 @@ nmap <C-w>. :bn<CR>
 " v_K is really really annoying
 vmap K k
 
+" Puppet pkg sort
+nmap <Leader>sp vi[:sort<CR>
+
 " Delete a buffer but keep layout
 if has("eval")
     command! Kwbd enew|bw #
@@ -644,6 +647,22 @@ if has("eval")
     noremap <Leader>ig :call MakeIncludeGuards()<CR>
 endif
 
+" javascript folding
+if has("eval")
+    function! JavaScriptFold()
+        setl foldmethod=syntax
+        setl foldlevelstart=1
+        syn region foldBraces start=/{/ end=/}/ transparent fold keepend extend
+
+        function! FoldText()
+            return substitute(getline(v:foldstart), '{.*', '{...}', '')
+        endfunction
+        setl foldtext=FoldText()
+    endfunction
+    au FileType javascript call JavaScriptFold()
+    au FileType javascript setl fen
+endif
+
 " fast buffer switching
 if v:version >= 700 && has("eval")
     let g:switch_header_map = {
@@ -1024,8 +1043,9 @@ nmap <leader>cup <Plug>CVSUpdate
 nmap <leader>cdiff <Plug>CVSDiff
 
 " Spell
-let spell_executable = "aspell"
+"let spell_executable = "aspell"
-let spell_language_list = "spanish,english"
+"let spell_language_list = "spanish,english"
+set spelllang=en_us,eo
 
 " Comentiffy
 let g:EnhCommentifyMultiPartBlocks = 'yes'

.xmonad/xmonad.hs

@@ -36,7 +36,7 @@ import qualified Data.Map        as M
 
 -- mTerminal      = "urxvt;ps -U $USER |grep dzen2|awk '{print $1}'|xargs kill -USR1"
 mTerminal      = "urxvtc"
-mBorderWidth   = 1
+mBorderWidth   = 0
 mModMask       = mod4Mask
 
 -- A tagging example:
@@ -182,7 +182,7 @@ evHook _ = return $ All True
 -- Layouts:
 
 --mLayout = smartBorders Full ||| tiled ||| hintedTile Wide ||| simplestFloat ||| Circle ||| magnifier Circle
-mLayout = smartBorders Full ||| tiled ||| Mirror tiled ||| simplestFloat ||| Circle ||| magnifier Circle
+mLayout = Mirror tiled ||| tiled ||| smartBorders Full ||| simplestFloat ||| Circle ||| magnifier Circle
   where
      -- default tiling algorithm partitions the screen into two panes
      --tiled   = Tall nmaster delta ratio

.zshrc

@@ -10,6 +10,9 @@ bindkey "^I" expand-or-complete-prefix
 umask 022
 
 # Fix $TERM
+if [ -f /etc/termcap ] ; then
+    export TERMCAP=/etc/termcap
+fi
 case "$TERM" in
     rxvt-unicode) export TERM=rxvt;;
     rxvt-256color) export TERM=rxvt;;
@@ -65,6 +68,7 @@ zshhosts=(serenity.cat.pdx.edu hunner@mint.cic.pdx.edu drkatz.cat.pdx.edu walt.e
 HISTSIZE=1000
 SAVEHIST=1000
 HISTFILE=~/.history
+export GPGKEY="48C7AF0C"
 PS1="%m%# "
 if [ `uname -s` = "SunOS" ] ; then
     export LANG="C"
@@ -138,10 +142,13 @@ alias f="TERM=rxvt;ssh hunner@firefly.cat.pdx.edu"
 alias z="TERM=rxvt;ssh hunner@zabava.cat.pdx.edu"
 alias o="TERM=rxvt;ssh hunner@osiris.cat.pdx.edu"
 alias m="TERM=rxvt;ssh hunner@mint.cic.pdx.edu"
+alias chandra="TERM=rxvt;ssh hunner@chandra.cs.pdx.edu"
+export CS=cs.pdx.edu
 alias odin="TERM=xterm;ssh hunner@odin.pdx.edu"
 alias clancy="ssh hunnur@clancy.dreamhost.com"
 alias kvar="ssh hunner@131.252.134.134"
 alias kvin="ssh hunner@131.252.135.22"
+alias mutt="TERM=xterm-256color mutt"
 alias x="exit"
 alias gpg-add="/usr/libexec/gpg-preset-passphrase"
 alias rsync="rsync -azPHe ssh" #-a equals -rlptgoD
@@ -153,7 +160,7 @@ alias sl="screen -ls"
 alias sr="screen -r"
 alias sx="screen -x"
 alias srd="screen -rd"
-alias t="SSH_AUTH_SOCK=$HOME/.tmux-ssh-agent TERM=xterm-256color tmux at||tmux"
+alias t="SSH_AUTH_SOCK=$HOME/.tmux-ssh-agent TERM=xterm-256color tmux at"
 alias tl="tmux ls"
 alias bc="bc -q"
 alias fm="fmstatus.sh&;shell-fm"
@@ -170,6 +177,7 @@ alias -s txt="vi"
 alias -s flv="mplayer"
 alias -s avi="mplayer"
 alias -s mkv="mplayer"
+alias -s mpg="mplayer"
 
 # Functions
 args() { echo $#; }
@@ -191,6 +199,18 @@ alias asdf="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY"
 alias auie="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY"
 alias aoeu='setxkbmap us'
 alias bepo='setxkbmap fr bepo "ctrl:swapcaps"'
+if [ -f $HOME/.termcap ] ; then
+    TERMCAP=$(< $HOME/.termcap)
+    export TERMCAP
+fi
+make_termcap() {
+    cat > $HOME/.termcap << EOF
+rxvt-256color|rxvt-256color terminal (X Window System):\
+    :Co#256:\
+    :tc=rxvt-unicode:\
+    :tc=rxvt:
+EOF
+}
 type7() {
     if [ `uname -s` = "SunOS" ] ; then
         xmodmap ~/keymaps/eo_dv_hunner_type7_sol.pke