From efbddc10845e65e1bad8fa637f393d8cd9981a54 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Sun, 8 Jan 2012 00:58:00 -0500
Subject: Pineapples

---
 _config/openbox/rc.xml | 18 +++++++++---------
 _vimrc                 |  2 ++
 _zshrc                 | 15 ++++++++-------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/_config/openbox/rc.xml b/_config/openbox/rc.xml
index ea5b10a0..dfd07ece 100644
--- a/_config/openbox/rc.xml
+++ b/_config/openbox/rc.xml
@@ -90,14 +90,14 @@
       <slant>Normal</slant>
       <!-- 'italic' or 'normal' -->
     </font>
-    <font place="OnScreenDisplay">
-      <name>sans</name>
-      <size>9</size>
-      <!-- font size in points -->
-      <weight>bold</weight>
-      <!-- 'bold' or 'normal' -->
-      <slant>normal</slant>
-      <!-- 'italic' or 'normal' -->
+    <font place="ActiveOnScreenDisplay">
+      <name/>
+    </font>
+    <font place="InactiveOnScreenDisplay">
+      <name>Sans</name>
+      <size>8</size>
+      <weight/>
+      <slant/>
     </font>
   </theme>
   <desktops>
@@ -402,7 +402,7 @@
         <action name="Lower"/>
     </mousebind>-->
       <mousebind action="Click" button="Up">
-          <action name="ToggleAlwaysOnTop"/>
+        <action name="ToggleAlwaysOnTop"/>
       </mousebind>
       <mousebind action="Click" button="Down">
         <action name="Unshade"/>
diff --git a/_vimrc b/_vimrc
index b7dd6b6f..20cb2441 100644
--- a/_vimrc
+++ b/_vimrc
@@ -98,3 +98,5 @@ set list
 set listchars=tab:»·,trail:·
 
 set smarttab
+
+command W :w " I often accidentally type :W when I mean :w
diff --git a/_zshrc b/_zshrc
index 907ec7bd..6e62d440 100644
--- a/_zshrc
+++ b/_zshrc
@@ -142,22 +142,23 @@ alias irb='ripl'
 
 function prompt_char {
 	#[ -e ".git" ] && echo '+' && return
-	git branch &> /dev/null && echo '+' && return
+	#git branch &> /dev/null && echo '+' && return
 	#[ -e ".hg" ] && echo '☿' && return
-	hg root &> /dev/null && echo '☿' && return
+	#hg root &> /dev/null && echo '☿' && return
 	#echo '$'
 	echo '%(!.#.$)'
 }
 
 function git_branch {
 	#[ -e ".git" ] && echo ':'${"$(cat .git/HEAD)"##*/}
+    #git branch &> /dev/null && echo -e '\033[32m:\033[33m'${"$(git branch)"##* } && return
 }
 
-#setopt PROMPT_SUBST
-function chpwd {
-    PROMPT="%{$terminfo[bold]$fg[green]%}[%{$fg[blue]%}%30<..<%~$(git_branch)%{$fg[green]%}]$(prompt_char)%{$terminfo[sgr0]$reset_color%} "
-}
-chpwd
+#setopt prompt_subst
+#function chpwd {
+PROMPT="%{$terminfo[bold]$fg[green]%}[%{$fg[blue]%}%30<..<%~$(git_branch)%{$fg[green]%}]$(prompt_char)%{$terminfo[sgr0]$reset_color%} "
+#}
+#chpwd
 RPROMPT="%(?..%{$terminfo[bold]$fg[green]%}[%{$fg[red]%}%?%{$fg[green]%}]%{$terminfo[sgr0]%})"
 
 source ~/.zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-- 
cgit 1.4.1