Updated for color theme, and a bit of erc

.emacs.d/irblack.el

@@ -57,8 +57,10 @@
      (font-lock-variable-name-face ((t (:foreground "steel blue"))))
      (font-lock-warning-face ((t (:background "#CC1503" :foreground "#FFFFFF"))))
      (gui-element ((t (:background "#D4D0C8" :foreground "black"))))
+     (fringe ((t (:background "grey10"))))
      (region ((t (:background "dark red"))))
      (mode-line ((t (:background "dim gray" :foreground "dark gray"))))
+     (mode-line-buffer-id ((t (:bold t :background "dim gray" : foreground "dark gray" :weight bold))))
      (highlight ((t (:background "#111111"))))
      (highline-face ((t (:background "SeaGreen"))))
      (left-margin ((t (nil))))

.emacs.hunner.el

@@ -21,9 +21,9 @@
 ;; GLOBAL
 (color-theme-initialize)
 
-(if window-system
-    (set-background-color "black")
-    ())
+;; (if window-system
+;;     (set-background-color "black")
+;;     ())
 (color-theme-irblack)
 ;(if window-system
 ;    (color-theme-gentooish)
@@ -188,6 +188,7 @@
             ("C-c s a" shellfm-add-to-playlist)
             ("C-c s q" shellfm 0)
             ("C-c s i" shellfm-track-info)
+            ("C-c e"   ido-erc-buffer)
             ("C-S-<left>"  shrink-window-horizontally)
             ("C-S-<right>" enlarge-window-horizontally)
             ("C-S-<down>"  shrink-window)
@@ -261,6 +262,20 @@
              (setq scroll-margin 0)
              (setq erc-scrolltobottom-mode 1)))
 (load "~/.emacs.d/erc-bip") ;; Passwords here
+(defun ido-erc-buffer()
+  (interactive)
+  (switch-to-buffer
+   (ido-completing-read "Channel:" 
+                        (save-excursion
+                          (delq
+                           nil
+                           (mapcar (lambda (buf)
+                                     (when (buffer-live-p buf)
+                                       (with-current-buffer buf
+                                         (and (eq major-mode 'erc-mode)
+                                              (buffer-name buf)))))
+                                   (buffer-list)))))))
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Haskell mode
@@ -328,6 +343,13 @@
  '(scroll-step 1)
  '(scroll-up-aggressively 0.0)
  '(show-paren-mode t nil (paren)))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(mumamo-border-face-in ((t nil)))
+ '(mumamo-border-face-out ((t nil))))
 
 
 ;;; This was installed by package-install.el.
@@ -340,10 +362,3 @@
      (expand-file-name "~/.emacs.d/elpa/package.el"))
   (package-initialize)
   (require 'starter-kit-elpa))
-(custom-set-faces
-  ;; custom-set-faces was added by Custom.
-  ;; If you edit it by hand, you could mess it up, so be careful.
-  ;; Your init file should contain only one such instance.
-  ;; If there is more than one, they won't work right.
- '(mumamo-border-face-in ((t nil)))
- '(mumamo-border-face-out ((t nil))))

.zshrc

@@ -3,7 +3,7 @@ setopt appendhistory hist_ignore_space hist_ignore_all_dups extendedglob nomatch
 unsetopt beep
 bindkey -e
 zstyle :compinstall filename '~/.zshrc'
-autoload -Uz compinit
+autoload -Uz compinit colors && colors
 compinit -u
 #bindkey '^L' push-line
 bindkey "^I" expand-or-complete-prefix
@@ -69,7 +69,15 @@ HISTSIZE=1000
 SAVEHIST=1000
 HISTFILE=~/.history
 export GPGKEY="48C7AF0C"
-PS1="%m%# "
+#C[0]="$reset_color"
+#C[1]="$fg[red]"
+C=(foo bar)
+#PS1="%m%# "
+return_red="%(?..$fg[red])"
+git_unstaged_green="%($GIT..$fg[green])"
+git_staged_yellow="%(?..$fg[yellow])"
+PS1="%m$git_changed_green$git_staged_yellow$return_red%#%{$reset_color%} "
+#PS1=${FACE[$[($?)?1:0]]}
 export LANG="en_US.UTF-8"
 #export LC_CTYPE="en_US.UTF-8"
 export LC_COLLATE="C" #order files in ls
@@ -84,6 +92,10 @@ export MAILCHECK=0
 #export AWT_TOOLKIT=MToolkit
 #export AWT_TOOLKIT=XToolkit
 export _JAVA_AWT_WM_NONREPARENTING=1
+if [ -x `which git` ] ; then
+    GIT_STATUS="git status"
+    GIT_STAGED="git status"
+fi
 if [ -x `which less` ] ; then
     export PAGER==less
 else