From e0a391551c3b11b2d54c1968a13f00afc735140c Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Wed, 14 Mar 2012 15:33:04 +0900
Subject: [PATCH] update conkyrc

---
 conkyrc   | 60 ++++++++++++++++++++++++++++++++-----------------------
 conkyrc.2 |  5 +++--
 emacs.el  |  2 ++
 3 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/conkyrc b/conkyrc
index 9c7e812..6334786 100644
--- a/conkyrc
+++ b/conkyrc
@@ -23,36 +23,46 @@ draw_outline no
 draw_borders no
 stippled_borders 0
 border_width 1
-default_color green # slategrey 
-default_shade_color lightgrey
-default_outline_color black
 alignment top_right
 gap_x 20
 gap_y 50
+
+default_color green # slategrey 
+default_shade_color lightgrey
+default_outline_color black
+color0 white
+color1 black
+color2 green
+
 no_buffers yes
 uppercase no
 format_human_readable yes
 
 TEXT
-${color white}${alignr}Arch Linux
-${color white}${hr}
-${color}host ${color black}:${color white} ${nodename} 
-${color}os   ${color black}:${color white} ${sysname} ${kernel}
-${color}freq ${color black}:${color white} ${freq 1}Mhz | ${freq 2}Mhz
-${color}upt  ${color black}:${color white} ${uptime}
-#${color}btry ${color black}:${color white} ${battery}
-#${color}btime${color black}:${color white} ${battery_time}
-${color white}${hr}
-${color}cpu  ${color black}:${color white} ${cpu cpu0}% ${cpubar cpu0}
-${color}ram  ${color black}:${color white} ${memperc}% ${membar}
-${color white}${stippled_hr}
-${color}root ${color black}:${color white} ${fs_free /} ${fs_bar /}
-${color}/tmp ${color black}:${color white} ${fs_free /tmp} ${fs_bar /tmp}
-${color white}${stippled_hr}
-${color}addr ${color black}:${color white} ${addr}
-${color}down ${color black}:${color white} ${downspeed}/s
-${color #888888}${downspeedgraph ff0000 0000ff}
-${color}up   ${color black}:${color white} ${upspeed}/s
-${color #888888}${upspeedgraph 0000ff ff0000}
-${color white}${hr}
-#${color white}${alignr}${execi 900 cal -1}
+${color0}${alignr}${conky_build_arch}
+${color0}${alignr}${execi 30000 whoami}@${nodename}
+${color0}${hr}
+#${color2}host ${color1}:${color0} ${nodename} 
+${color2}uptm ${color1}:${color0} ${uptime}
+${color2}lgin ${color1}:${color0} ${uptime}
+#${color2}os   ${color1}:${color0} ${sysname} ${kernel}
+${color0}${stippled_hr}
+${color2}freq ${color1}:${color0} ${freq 1}Mhz | ${freq 2}Mhz
+${color2}cpu  ${color1}:${color0} ${cpu cpu0}% ${cpubar cpu0}
+#${color2}btry ${color1}:${color0} ${battery}
+#${color2}btime${color1}:${color0} ${battery_time}
+${color0}${hr}
+${color2}ram  ${color1}:${color0} ${memperc}% ${membar}
+${color2}swap ${color1}:${color0} None
+${color0}${stippled_hr}
+${color2}root ${color1}:${color0} ${fs_free /} ${fs_bar /}
+${color2}/tmp ${color1}:${color0} ${fs_free /tmp} ${fs_bar /tmp}
+${color0}${hr}
+${color2}addr ${color1}:${color0} ${addr}
+${color0}${stippled_hr}
+${color2}down ${color1}:${color0} ${downspeed eth0}/s
+${color #888888}${downspeedgraph eth0 ff0000 0000ff}
+${color2}up   ${color1}:${color0} ${upspeed eth0}/s
+${color #888888}${upspeedgraph eth0 0000ff ff0000}
+${color0}${hr}
+#${color0}${alignr}${execi 900 cal -1}
diff --git a/conkyrc.2 b/conkyrc.2
index 679691b..c0d4251 100644
--- a/conkyrc.2
+++ b/conkyrc.2
@@ -35,5 +35,6 @@ format_human_readable yes
 
 TEXT
 
-${color yellow}/var/log/dmesg.log:
-${color white}${tail /var/log/dmesg.log 15}
+${color yellow}$$ tail -f /var/log/everything.log
+${color white}${tail /var/log/everything.log 30}
+${time %b %d %T}
diff --git a/emacs.el b/emacs.el
index 5244b96..85ceb86 100644
--- a/emacs.el
+++ b/emacs.el
@@ -769,6 +769,8 @@ return nil if LIB unfound and downloading failed, otherwise the path of LIB."
           'my-frame-buffer-add)
 (add-hook 'eshell-mode-hook
           'my-frame-buffer-add)
+(add-hook 'Man-mode-hook
+          'my-frame-buffer-add)
 
 (add-hook 'kill-buffer-hook
           'my-frame-buffer-remove)