From bd34674049ab626b4e1587d4e53ba04eb84f552e Mon Sep 17 00:00:00 2001
From: Collin Doering <rekahsoft@gmail.com>
Date: Tue, 9 Aug 2011 23:04:59 -0400
Subject: [PATCH] Did a variety of small fixes including:   * fixed a typo in
 .emacs relating to the haskell template used   * automatic work done on
 .mc/ini by mc it self   * added nvlc to the list of programs to run in screen
   * added a new alias "skreen" = "screen -c /dev/null" to both .bashrc and
 .zshrc   * changed both .xinitrc and .xmonad/xmonad.hs to support urxvt
 daemon/client shared terminal

Signed-off-by: Collin Doering <rekahsoft@gmail.com>
---
 .bashrc           |  1 +
 .emacs            |  2 +-
 .mc/ini           | 28 ++++++++++++++++++++++++++++
 .screenrc         |  1 +
 .xinitrc          |  1 +
 .xmonad/xmonad.hs | 12 +++++++-----
 .zshrc            |  1 +
 7 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/.bashrc b/.bashrc
index 4f47f28..c04eb28 100644
--- a/.bashrc
+++ b/.bashrc
@@ -10,6 +10,7 @@ alias egrep='egrep --color-auto'
 alias ncmpc='ncmpc -c'
 alias knk='knock rekahsoft-mini 7713:tcp 1377:udp && sleep 3s && '
 alias knkc='knk ssh rekahsoft-mini '
+alias skreen='screen -c /dev/null'
 
 export GREP_COLOR="1;33"
 alias grep='grep --color=auto'
diff --git a/.emacs b/.emacs
index 0584b48..547c3f4 100644
--- a/.emacs
+++ b/.emacs
@@ -280,7 +280,7 @@
 	("\\.rkt$" . ["racket-template.rkt" auto-update-generic-template])
 	("\\.scm$" . ["scheme-template.scm" auto-update-generic-template])
 	("\\.clj$" . ["clojure-template.clj" auto-update-generic-template])
-	("\\.hs$" . ["haskell-template.rkt" auto-update-generic-template])
+	("\\.hs$" . ["haskell-template.hs" auto-update-generic-template])
 	("\\.py$" . ["python-template.py" auto-update-generic-template])))
 (setq auto-insert 'other)
 
diff --git a/.mc/ini b/.mc/ini
index c3b563e..f553e93 100644
--- a/.mc/ini
+++ b/.mc/ini
@@ -119,6 +119,7 @@ autodetect_codeset=
 clipboard_store=
 clipboard_paste=
 
+
 [Colors]
 base_color=
 screen=
@@ -145,9 +146,36 @@ filetype_mode=true
 permission_mode=false
 quick_search_mode=2
 
+simple_swap=false
+
 [HotlistConfig]
 expanded_view_of_groups=0
 
+[FindFile]
+ignore_dirs=
+file_case_sens=true
+file_shell_pattern=true
+file_find_recurs=true
+file_skip_hidden=false
+file_all_charsets=false
+content_use=true
+content_case_sens=true
+content_regexp=false
+content_first_hit=false
+content_whole_words=false
+content_all_charsets=false
+
+[DiffView]
+show_symbols=false
+show_numbers=false
+tab_size=8
+diff_quality=0
+diff_ignore_tws=false
+diff_ignore_all_space=false
+diff_ignore_space_change=false
+diff_tab_expansion=false
+diff_ignore_case=false
+
 [Panelize]
 Find *.orig after patching=find . -name \\*.orig -print
 Find SUID and SGID programs=find . \\( \\( -perm -04000 -a -perm +011 \\) -o \\( -perm -02000 -a -perm +01 \\) \\) -print
diff --git a/.screenrc b/.screenrc
index cd615de..ef884c6 100644
--- a/.screenrc
+++ b/.screenrc
@@ -4,6 +4,7 @@ screen -t irssi      1   irssi
 screen -t ncmpcpp    2   ncmpcpp
 screen -t alsamixer  3   alsamixer
 screen -t mc	     4	 mc
+screen -t nvlc       5   nvlc
 
 # Switch to window 1 (irssi)
 #screen -p irssi
diff --git a/.xinitrc b/.xinitrc
index f81adcf..597edf7 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -27,6 +27,7 @@ xbindkeys &
 # Start-up applications
 parcellite &
 emacs --daemon &
+urxvtd --quiet &
 xcompmgr &
 
 # Create variable GENERAL_SCREEN which is the pid of a screen called "general"
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 1fb523b..8ca1b22 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -46,7 +46,7 @@ import qualified Data.Map        as M
 -- The preferred terminal program, which is used in a binding below and by
 -- certain contrib modules.
 --
-myTerminal      = "urxvt"
+myTerminal      = "urxvtc"
  
 -- Whether focus follows the mouse pointer.
 myFocusFollowsMouse :: Bool
@@ -111,8 +111,9 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     [ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf)
 
     -- launch dmenu
-    , ((modm,               xK_p     ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"")
- 
+    --, ((modm,               xK_p     ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"")
+    , ((modm,               xK_p     ), spawn "dmenu_run")
+      
     -- close focused window
     , ((modm .|. shiftMask, xK_c     ), kill)
  
@@ -328,7 +329,8 @@ myManageHook = composeAll
 --    , title =? "DOOM 3" --> doIgnore
     , resource =? "Qt-subapplication" <&&> title /=? "Oracle VM VirtualBox Manager" --> doFloat
     , resource =? "vncviewer" --> doCenterFloat
-    , resource =? "Steam.exe" --> doCenterFloat  
+    , resource =? "Steam.exe" --> doCenterFloat
+    , title =? "Xnest" --> doCenterFloat  
 --    , resource =? "hl2.exe" --> doCenterFloat  
     , isFullscreen --> (doF W.focusDown <+> doFullFloat)
     , resource  =? "desktop_window" --> doIgnore ] <+> namedScratchpadManageHook scratchpads <+> manageDocks
@@ -340,7 +342,7 @@ scratchpads = [ NS "maintainance-terminal" spawnMaintainanceTerminal findMaintai
                    where
                      findMaintainanceTerminal = resource =? "scratchpad"
                      findScreenTerminal = resource =? "screen-scratch"
-                     findDeluge = resource =? "deluge-gtk"
+                     findDeluge = resource =? "deluge"
                      
                      spawnMaintainanceTerminal = myTerminal ++ " -name scratchpad"
                      spawnScreenTerminal = myTerminal ++ " -name screen-scratch -bg black"
diff --git a/.zshrc b/.zshrc
index 384cd2b..0c9e882 100644
--- a/.zshrc
+++ b/.zshrc
@@ -25,6 +25,7 @@ alias ncmpc='ncmpc -c'
 alias knk='knock rekahsoft-mini 7713:tcp 1377:udp && sleep 3s && '
 alias knkc='knk ssh rekahsoft-mini '
 alias kgit='knk git'
+alias skreen='screen -c /dev/null'
 
 export GREP_COLOR="1;33"
 alias grep='grep --color=auto'