From 07b12a4a6f32f18447af175a629f27a1fb9aff02 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Sat, 31 Mar 2012 16:15:16 +0900
Subject: [PATCH] misc changes

---
 bashrc    |  6 ++++--
 conkyrc   | 21 +++++++++------------
 conkyrc.2 |  4 ++--
 xprograms |  2 +-
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/bashrc b/bashrc
index d6a9272..986a5b0 100755
--- a/bashrc
+++ b/bashrc
@@ -102,6 +102,7 @@ alias _reloadrc="test -f ~/.bashrc && source ~/.bashrc"
 alias mytime="date +%Y%m%d-%H%M%S"
 alias sh="ENV=$HOME/.shrc PS1=\$\  sh"
 # type trash >/dev/null 2>&1 && alias rm=trash
+alias wicdc=wicd-curses
 
 alias aptin="apt-get install"
 alias aptsearch="apt-cache search"
@@ -142,7 +143,7 @@ showinfo(){
     __try_exec diskinfo
 
     ! isdarwin && test -n "${DISPLAY}" && {
-        __try_exec xrandr | grep --color=never ^Screen
+        __try_exec xrandr | \grep --color=never ^Screen
     }
 
     iswindows || __try_exec finger $USER
@@ -250,6 +251,7 @@ _my_git_config(){
     git config --global user.name '10sr'
     git config --global user.email '8slashes+git@gmail.com'
     git config --global core.autocrlf false
+    git config --global core.excludesfile '~/.gitignore'
     git config --global color.ui auto
     git config --global status.relativePaths false
     git config --global status.showUntrackedFiles normal
@@ -373,7 +375,7 @@ __my_battery_status(){
 alias bat='__my_battery_status %s\\n'
 
 ip-address(){
-    local ip=$(LANG=C ifconfig | grep --color=never "inet " | grep --color=never -v "127.0.0.1" | awk '{print $2}')
+    local ip=$(LANG=C ifconfig | \grep --color=never "inet " | \grep --color=never -v "127.0.0.1" | awk '{print $2}')
     test -n "$ip" && printf $1 $ip
 }
 
diff --git a/conkyrc b/conkyrc
index 8765694..3a5b0ff 100644
--- a/conkyrc
+++ b/conkyrc
@@ -30,9 +30,11 @@ gap_y 40
 default_color green # slategrey 
 default_shade_color lightgrey
 default_outline_color black
-color0 white
-color1 white
-color2 green
+color0 white                    # value
+color1 white                    # vertical border
+color2 green                    # name
+color3 yellow                   # displays
+color4 888888                   # border of netspeed graph
 
 no_buffers yes
 uppercase no
@@ -42,16 +44,12 @@ TEXT
 ${color0}${alignr}${sysname} ${kernel} (${machine})
 ${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}cpu  ${color1}|${color0} ${cpu}% ${cpubar}
 ${color2}freq ${color1}|${color0} ${freq 1}Mhz | ${freq 2}Mhz
 ${color2}temp ${color1}|${color0} ${acpitemp} °C
-#${color2}btry ${color1}|${color0} ${battery}
-#${color2}btime${color1}|${color0} ${battery_time}
 ${color0}${hr}
 ${color2}ram  ${color1}|${color0} ${mem} ${membar}
 ${color2}swap ${color1}|${color0} ${if_match "${swapperc}" == "No swap"}None${else}${swap} ${swapbar}${endif}
@@ -66,10 +64,9 @@ ${color2}if   ${color1}|${color0} ${gw_iface}:${addr}
 ${color2}ssid ${color1}|${color0} ${wireless_essid}
 ${color0}${stippled_hr}
 ${color2}down ${color1}|${color0} ${downspeed}/s
-${color #888888}${downspeedgraph ff0000 0000ff}
+${color4}${downspeedgraph ff0000 0000ff}
 ${color2}up   ${color1}|${color0} ${upspeed}/s
-${color #888888}${upspeedgraph 0000ff ff0000}
+${color4}${upspeedgraph 0000ff ff0000}
+${color0}${alignr}conky ${conky_version}
 ${color0}${hr}
-${alignr}conky ${conky_version}
-# on Page${desktop}
-#${color0}${alignr}${execi 900 cal -1}
+${color3}${alignr}${texeci 10 bash -c 'xrandr|\grep " connected "|cut -f 1,3 -d " "'}
diff --git a/conkyrc.2 b/conkyrc.2
index ad04bef..75e69c8 100644
--- a/conkyrc.2
+++ b/conkyrc.2
@@ -35,6 +35,6 @@ uppercase no
 format_human_readable yes
 
 TEXT
-${color yellow}$$ tail -f -n 12 /var/log/everything.log
-${color white}${tail /var/log/everything.log 12}
+${color yellow}$$ tail -f -n 10 /var/log/everything.log
+${color white}${tail /var/log/everything.log 10}
 ${time %b %d %T}
diff --git a/xprograms b/xprograms
index 056d3bf..5228d2b 100755
--- a/xprograms
+++ b/xprograms
@@ -9,7 +9,7 @@ sh "$HOME/.fehbg"
 
 tint2 &
 
-#dropboxd & # done by ~/.config/autostart/dropbox.desktop
+dropboxd & # done by ~/.config/autostart/dropbox.desktop
 
 volumeicon &