sync up keychain fixes, tmux cleanups, display detection, and gpg-age…

…nt timeouts

files/.gnupg/gpg-agent.conf

@@ -0,0 +1 @@
+default-cache-ttl 3600

files/.login

@@ -2,6 +2,6 @@
 #  /usr/bin/calendar
 #endif
 
-if (-e /usr/local/bin/keychain) then
-  /usr/local/bin/keychain --host local
+if (-e /usr/local/bin/keychain || -e /usr/bin/keychain) then
+  keychain --host local
 endif

files/.tcshrc

@@ -91,7 +91,7 @@ foreach DIR (pub src bin tmp keys projects)
 end
 
 # keychain
-if (-e /usr/local/bin/keychain) then
+if (-e /usr/local/bin/keychain || -e /usr/bin/keychain) then
   if (-f ~/.keychain/local-csh) then
     source ~/.keychain/local-csh
   endif

files/.tmux.conf

@@ -2,22 +2,37 @@ set -g display-panes-active-colour cyan
 set -g display-panes-colour red
 set -g message-bg blue
 set -g message-fg black
-set -g pane-active-border-bg green
+set -g pane-active-border-bg brightblue
 set -g pane-active-border-fg red
-set -g pane-border-bg black
-set -g pane-border-fg cyan
+set -g pane-border-bg brightyellow
+set -g pane-border-fg brightblue
 set -g set-titles off
-set -g status-bg cyan
-set -g status-fg black
+#set -g status-bg black
+set -g status-bg brightblue
+set -g status-fg brightwhite
+#set -g status-fg white
 set -g visual-activity on
-
 setw -g monitor-activity on
-setw -g window-status-bg cyan
-setw -g window-status-fg blue
-#setw -g window-status-alert-bg white
-setw -g window-status-current-bg black
-setw -g window-status-current-fg cyan
+#setw -g window-status-alert-bg yellow
+setw -g window-status-bg brightblue
+setw -g window-status-current-bg red
+set -g status-right "#[fg=yellow]#(acpi -V | head -1 | sed -e 's/Battery 0: //' | sed -e 's/ remaining//';)"
+
+setw -g window-status-current-fg brightwhite
+setw -g window-status-fg white
+
+#set -g mouse-select-pane on
+#setw -g mode-mouse on
+
+set-option -g mouse-select-pane on
+set-option -g mouse-select-window on
+setw -g mode-mouse on
 
 setw -g mode-keys vi
 bind-key -t vi-copy 'v' begin-selection
 bind-key -t vi-copy 'y' copy-selection
+
+bind-key j save-buffer ~/.tmux-buffer \; run-shell "xsel -i -b <~/.tmux-buffer && rm ~/.tmux-buffer"
+
+#setw -g utf8 off
+#set -g status-utf8 off

files/.xmonad/xmonad.hs

@@ -2,5 +2,6 @@ import XMonad
 
 main = xmonad defaultConfig
         { terminal = "gnome-terminal"
+        , focusFollowsMouse = False
         -- more changes
         }

files/bin/s2

@@ -1,12 +1,12 @@
 #!/bin/sh
 
 acpi -V
-xrandr --auto
 dbus-send --system --print-reply \
     --dest="org.freedesktop.UPower" \
     /org/freedesktop/UPower \
     org.freedesktop.UPower.Suspend
 
+xrandr --auto
 xscreensaver -no-splash &
 xscreensaver-command -lock
 acpi -V