Merge remote-tracking branch 'origin/master'

.gitignore

@@ -3,3 +3,5 @@
 zsh/cache/
 vim/view/
 vim/spelling*
+
+irssi/away.log

gitconfig

@@ -60,8 +60,6 @@
 	prompt = false
 [difftool]
 	prompt = false
-[difftool "Kaleidoscope"]
-	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [mergetool "Kaleidoscope"]
 	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
 	trustExitCode = true

irssi/default.theme

@@ -118,7 +118,7 @@ abstracts = {
   ##
 
   # the basic styling of how to print message, $0 = nick mode, $1 = nick
-  msgnick = "%K<%n$0$1-%K>%n %|";
+  msgnick = "  %n$0$1-%k>%n %|";
 
   # message from you is printed. "msgownnick" specifies the styling of the
   # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the
@@ -250,7 +250,7 @@ abstracts = {
 
   # default background for all statusbars. You can also give
   # the default foreground color for statusbar items.
-  sb_background = "%4%w";
+  sb_background = "%n%0";
 
   # default backround for "default" statusbar group
   #sb_default_bg = "%4";
@@ -266,14 +266,14 @@ abstracts = {
   sbstart = "";
   # text at the end of statusbars. Use space so that it's never
   # used for anything.
-  sbend = " ";
+  sbend = "";
 
   topicsbstart = "{sbstart $*}";
   topicsbend = "{sbend $*}";
 
-  prompt = "[$*] ";
+  prompt = "[%n$*] ";
 
-  sb = " %c[%n$*%c]%n";
+  sb = "%c[%n$*%c]%n ";
   sbmode = "(%c+%n$*)";
   sbaway = " (%GzZzZ%n)";
   sbservertag = ":$0 (change with ^X)";
@@ -286,9 +286,9 @@ abstracts = {
   # normal text
   sb_act_text = "%c$*";
   # public message
-  sb_act_msg = "%W$*";
+  sb_act_msg = "%w$*";
   # hilight
-  sb_act_hilight = "%M$*";
+  sb_act_hilight = "%m$*";
   # hilight with specified color, $0 = color, $1 = text
   sb_act_hilight_color = "$0$1-%n";
 };

tmux.conf

@@ -22,20 +22,31 @@ set -g mode-keys vi
 set -g repeat-time 0
 
 # No left status; right status bar is session name
-set -g status-bg green
 set -g status-left ""
+set -g status-left-bg black
+set -g status-left-fg brightblue
 set -g status-left-attr none
+
 set -g status-right "| #S "
+set -g status-right-bg black
+set -g status-right-fg brightblue
 set -g status-right-attr none
 
 # Start window and pane indexing from 1 instead of 0
 set-option -g base-index 1
 set-option -g pane-base-index 1
 
-# Tabs like this: " <index>:<window_name>(<pane_number>) "
-setw -g window-status-format " #I:#W(#P) "
-setw -g window-status-current-bg yellow
-setw -g window-status-current-format " #I:#W(#P) "
+# Tabs like this: "(<index>:<window_name>)"
+setw -g window-status-bg black
+setw -g window-status-fg brightgreen
+setw -g window-status-format "(#I:#W)"
+setw -g window-status-current-bg black
+setw -g window-status-current-fg yellow
+setw -g window-status-current-format "(#I:#W)"
+
+setw -g window-status-bell-fg red
+setw -g window-status-content-fg brightred
+setw -g window-status-activity-fg brightred
 
 setw -g alternate-screen on
 

vimrc

@@ -183,6 +183,7 @@ function! <SID>strip_trailing_whitespace()
     call cursor(l, c)
 endfunction
 
+
 function! <SID>FindProjectFileOrDirectory(fod)
     let l:dir = getcwd()
     " Search up the path, starting at the current working directory, for the
@@ -197,14 +198,17 @@ function! <SID>FindProjectFileOrDirectory(fod)
     return ""
 endfunction
 
+
 function! GetProjectRuntimeDirectory()
     return <SID>FindProjectFileOrDirectory("vim")
 endfunction
 
+
 function! GetProjectFile()
     return <SID>FindProjectFileOrDirectory("project.vim")
 endfunction
 
+
 function! <SID>SourceProjectFile()
     let l:project_file = GetProjectFile()
     if l:project_file != ""
@@ -212,6 +216,7 @@ function! <SID>SourceProjectFile()
     endif
 endfunction
 
+
 function! <SID>AddProjectRuntimeDirectory()
     let l:project_rtp = GetProjectRuntimeDirectory()
     if isdirectory(l:project_rtp)

zsh/func/prompt_loquacious_setup

@@ -1,5 +1,8 @@
 #!/usr/bin/zsh
+# vim:sw=4:sts=4:
+#
 # A wordy prompt theme.
+#
 # Eryn Wells <eryn@erynwells.me>
 
 
@@ -84,11 +87,18 @@ function set_prompt_info
         PS1_HOST=''
     fi
 
+    # Get git repo information, if it exists. See setup function for
+    # configuration details.
     vcs_info loquacious
     if [[ -n "$vcs_info_msg_0_" ]]; then
-       PS1_REPO="on $vcs_info_msg_0_ "
+        PS1_REPO="on $vcs_info_msg_0_ "
     else
-       PS1_REPO=""
+        PS1_REPO=""
+    fi
+
+    # Show background jobs, if any.
+    if [[ `jobs | wc -l` -ge 1 ]]; then
+        PS1_JOBS='%j'
     fi
 
     # Show background job count if any exist.

zshrc

@@ -1,5 +1,5 @@
 # .zshrc
-# vim: ft=zsh fdm=marker
+# vim:ft=zsh:fdm=marker:sw=4:sts=4:
 #
 # ZSH init for interactive shells
 #
@@ -174,6 +174,26 @@ function configure_completion #{{{
 } #}}}
 
 
+function configure_vcs_info #{{{
+{
+    autoload -U add-zsh-hook
+    autoload -Uz vcs_info
+
+    zstyle ':vcs_info:*' disable bzr cdv darcs mtn svk tla cvs svn
+    zstyle ':vcs_info:*' enable git p4
+
+    zstyle ':vcs_info:git:general:*' formats '%b'
+
+    # Export the current Git branch before every prompt.
+    function export_gitbranch {
+        vcs_info general
+        export gitbranch=${vcs_info_msg_0_}
+    }
+
+    add-zsh-hook precmd export_gitbranch
+} #}}}
+
+
 configure_general
 configure_omz
 configure_zle
@@ -181,6 +201,7 @@ configure_modules_and_functions
 configure_zsh_aliases
 configure_history
 configure_completion
+configure_vcs_info
 configure_prompt