From d31d57b1b05ecf92bb93f33ffd8dad18b4629781 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <h.haugen@gmail.com>
Date: Mon, 4 Jan 2010 17:35:03 -0800
Subject: [PATCH] Recent changes like color for term

---
 .Xdefaults        |  2 ++
 .emacs            | 12 ++++++------
 .vimrc            |  9 +++------
 .xmonad/xmonad.hs |  9 +++++----
 .zshrc            | 30 ++++--------------------------
 5 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/.Xdefaults b/.Xdefaults
index cbefc2a..d37a98e 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -13,6 +13,8 @@ URxvt*cursorColor: #007998
 !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*urlLauncher: urxvt-to-uzbl.sh
diff --git a/.emacs b/.emacs
index 7e28672..8ee8407 100644
--- a/.emacs
+++ b/.emacs
@@ -129,12 +129,12 @@
                  (buffer-string)))))))
 
 ;; Set my location sunrise-sunset
-;; (setq calendar-latitude 40.1)
-;; (setq calendar-longitude -88.2)
-;; (setq calendar-location-name "Portland, OR")
-(setq calendar-latitude 17.5)
-(setq calendar-longitude 78.5)
-(setq calendar-location-name "Hyderabad, India")
+(setq calendar-latitude 45.4)
+(setq calendar-longitude -122.6)
+(setq calendar-location-name "Portland, OR")
+;; (setq calendar-latitude 17.5)
+;; (setq calendar-longitude 78.5)
+;; (setq calendar-location-name "Hyderabad, India")
 
 ;; Start the server for emacsclient
 ;(server-start)
diff --git a/.vimrc b/.vimrc
index 6177542..a03ade6 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,3 @@
-scriptencoding utf-8
-
 "-----------------------------------------------------------------------
 "BaSS vimrc based con ciaran
 "-----------------------------------------------------------------------
@@ -12,10 +10,6 @@ scriptencoding utf-8
 set termencoding=utf-8
 set encoding=utf-8
 
-" Turn off the menubar so we don't get key accelerators with Meta.
-" Don't include the toolbar
-set guioptions=aegiLt
-"colorscheme ir_black
 set fenc=utf-8
 
 if exists('&t_SI')
@@ -116,6 +110,9 @@ if ! has("gui_running")
     colors inkpot
 else
     colors ir_black
+    " Turn off the menubar so we don't get key accelerators with Meta.
+    " Don't include the toolbar
+    set guioptions=aegit
 endif
 " set background=light gives a different style, feel free to choose between them.
 set background=dark
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 1ee9f6f..e8df3d3 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -6,13 +6,13 @@
 
 import XMonad hiding (Tall)
 import System.Exit
+import XMonad.Layout.Circle
+import XMonad.Layout.HintedTile
+import XMonad.Layout.MagicFocus
+import XMonad.Layout.Magnifier
 import XMonad.Layout.NoBorders (noBorders, smartBorders)
 import XMonad.Layout.ResizableTile
 import XMonad.Layout.SimplestFloat
-import XMonad.Layout.Circle
-import XMonad.Layout.MagicFocus
-import XMonad.Layout.Magnifier
-import XMonad.Layout.HintedTile
 import XMonad.Actions.CopyWindow
 import XMonad.Actions.DynamicWorkspaces
 import XMonad.Actions.GridSelect
@@ -23,6 +23,7 @@ import XMonad.Prompt
 import XMonad.Util.EZConfig
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.ManageHelpers
+import XMonad.Hooks.FadeInactive
 import XMonad.Hooks.SetWMName
 import Data.Monoid
 import Data.List
diff --git a/.zshrc b/.zshrc
index d5f1d58..c11283b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -172,32 +172,10 @@ if [ x$DISPLAY != x ] ; then
     preexec() { [ -z "$WINTITLE" ] && print -Pn "\e]0;%m [$1]\a" || : }
 fi
 resize() { printf '\33]50;%s%d\007' "xft:Terminus:pixelsize=" $1 ":antialias=true" }
-asdf() {
-    if [ `uname -s` = "SunOS" ] ; then
-        if [ x`hostname` = x"chandra.cs.pdx.edu" ] ; then
-            xmodmap ~/keymaps/eo_dv_hunner_type7.pke
-        else
-            xmodmap ~/keymaps/eo_dv_hunner_type7.pke
-        fi
-    else
-        if [ x`hostname` = x"ni" ] ; then
-            xmodmap ~/keymaps/nu_x61.pke
-        else
-            xmodmap ~/keymaps/nu_std.pke
-        fi
-    fi
-}
-aoeu() {
-    if [ `uname -s` = "SunOS" ] ; then
-        xmodmap ~/keymaps/original-type7-sol.pke
-    else
-        if [ x`hostname` = x"ni" ] ; then
-            xmodmap ~/keymaps/qwerty_x61.pke
-        else
-            xmodmap ~/keymaps/kvar.pke
-        fi
-    fi
-}
+asdf() { xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY }
+auie() { xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY }
+aoeu() { setxkbmap us }
+bepo() { setxkbmap fr bepo "ctrl:swapcaps" }
 type7() {
     if [ `uname -s` = "SunOS" ] ; then
         xmodmap ~/keymaps/eo_dv_hunner_type7_sol.pke