From 324d59690a4c663f6b2cd175cf517c415a57a51d Mon Sep 17 00:00:00 2001
From: clown <458892+aieu@users.noreply.github.com>
Date: Tue, 5 Jan 2016 17:33:04 +0800
Subject: [PATCH] update dotfiles

---
 home/.Xresources           | 75 +++++++++++++++-----------------------
 home/.Xresources.d/monokai | 42 +++++++++++-----------
 home/.bash_color           | 29 +++++++++++++++
 home/.conkyrc.new          | 90 ++++++++++++++++++++++++++++++++++++++++++++++
 home/.gitignore_global     |  3 ++
 5 files changed, 172 insertions(+), 67 deletions(-)
 rewrite home/.Xresources (99%)
 rewrite home/.Xresources.d/monokai (96%)
 create mode 100644 home/.bash_color
 create mode 100644 home/.conkyrc.new

diff --git a/home/.Xresources b/home/.Xresources
dissimilarity index 99%
index 1453e32..b2faa59 100644
--- a/home/.Xresources
+++ b/home/.Xresources
@@ -1,46 +1,29 @@
-!xterm -xrm "xterm*background: blue" = xterm -bg blue
-
-!look and feel
-xterm*termName: xterm
-xterm*geometry: 116x30
-xterm*scrollBar: false
-!xterm*rightScrollBar: true
-xterm*loginshell: true
-xterm.cursorBlink: true
-xterm*borderLess: true
-xterm*cursorBlink: true
-xterm*borderWidth: 0
-
-!Scrolling
-xterm*saveLines: 4096
-!fix alt key input
-xterm*eightBitInput: false
-xterm*altSendsEscape: true
-xterm*metaSendsEscape: true
-
-!mouse selecting to copy, ctrl-v to paste
-!Ctrl p to print screen content to file
-!XTerm*VT100.Translations: #override \
-!    Ctrl <KeyPress> V: insert-selection(CLIPBOARD,PRIMARY,CUT_BUFFER0) \n\
-!    <BtnUp>: select-end(CLIPBOARD,PRIMARY,CUT_BUFFER0) \n\
-XTerm*translations: #override <Btn1Up>: select-end(PRIMARY, CLIPBOARD, CUT_BUFFER0)
-
-XTerm*renderFont: true
-!font and locale
-xterm*locale: UTF-8
-xterm*utf8:     true
-xterm*utf8Title: true
-!xterm*fontMenu*fontdefault*Label: Default
-XTerm*faceName: DejaVu Sans Mono:antialias=true:pixelsize=13
-XTerm*faceNameDoublesize: WenQuanYi Micro Hei:antialias=false:pixelsize=13
-!xterm*faceSize: 10
-!xterm*xftAntialias: true
-XTerm*cjkWidth:false
-
-!xterm*VT100.font: 9x15
-!xterm*VT100.utf8Fonts.font: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-!xterm*VT100.utf8Fonts.widefont: -misc-fixed-medium-r-normal--18-120-100-100-c-180-iso10646-1
-
-#include ".Xresources.d/monokai"
-
-Emacs.geometry:         120x42+20+10
+! xterm setting
+xterm*termName:             xterm-256color
+xterm*geometry:             110x30
+xterm*scrollBar:            false
+xterm*loginshell:           true
+xterm.cursorBlink:          true
+xterm*borderLess:           true
+xterm*cursorBlink:          true
+xterm*borderWidth:          0
+
+xterm*saveLines:            4096
+xterm*eightBitInput:        false
+xterm*altSendsEscape:       true
+xterm*metaSendsEscape:      true
+
+XTerm*renderFont:           true
+xterm*locale:               true
+xterm*utf8:                 true
+xterm*utf8Title:            true
+XTerm*faceName:             DejaVu Sans Mono:antialias=true
+XTerm*faceNameDoublesize:   Source Han Sans CN:antialias=false
+xterm*faceSize:             10
+XTerm*cjkWidth:             false
+
+#include                    ".Xresources.d/monokai"
+!#include                   ".Xresources.d/solarized"
+
+! emacs gui
+Emacs.geometry:             120x42+20+10
diff --git a/home/.Xresources.d/monokai b/home/.Xresources.d/monokai
dissimilarity index 96%
index 9d3ba70..3ed2c33 100644
--- a/home/.Xresources.d/monokai
+++ b/home/.Xresources.d/monokai
@@ -1,21 +1,21 @@
-! Monokai theme
-
-xterm*background: #262626
-xterm*foreground: #F6F5EE
-xterm*cursorColor: #F6F5EE
-xterm*color0: #262626
-xterm*color1: #D01B24
-xterm*color2: #A7D32C
-xterm*color3: #D8CF67
-xterm*color4: #61B8D0
-xterm*color5: #695ABB
-xterm*color6: #D53864
-xterm*color7: #FEFFFE
-xterm*color8: #1C1D19
-xterm*color9: #D12A24
-xterm*color10: #A7D32C
-xterm*color11: #D8CF67
-xterm*color12: #61B8D0
-xterm*color13: #695ABB
-xterm*color14: #D53864
-xterm*color15: #F6F5EE
+! Monokai theme
+
+xterm*background:   #262626
+xterm*foreground:   #E5E5E5
+xterm*cursorColor:  #E5E5E5
+xterm*color0:       #262626
+xterm*color1:       #D01B24
+xterm*color2:       #A7D32C
+xterm*color3:       #D8CF67
+xterm*color4:       #61B8D0
+xterm*color5:       #FFFF87
+xterm*color6:       #D53864
+xterm*color7:       #FEFFD7
+xterm*color8:       #1C1D19
+xterm*color9:       #D12A24
+xterm*color10:      #A7D32C
+xterm*color11:      #D8CF67
+xterm*color12:      #61B8D0
+xterm*color13:      #D787FF
+xterm*color14:      #D53864
+xterm*color15:      #E5E5E5
diff --git a/home/.bash_color b/home/.bash_color
new file mode 100644
index 0000000..9e93ba6
--- /dev/null
+++ b/home/.bash_color
@@ -0,0 +1,29 @@
+# ~/.bash_color
+#
+# color
+C_DEFAULT="\[\033[m\]"
+C_BLACK="\[\033[30m\]"          # base02
+C_RED="\[\033[31m\]"            # red
+C_GREEN="\[\033[32m\]"          # green
+C_YELLOW="\[\033[33m\]"         # yellow
+C_BLUE="\[\033[34m\]"           # blue
+C_MAGENTA="\[\033[35m\]"        # magenta
+C_CYAN="\[\033[36m\]"           # cyan
+C_WHITE="\[\033[37m\]"          # base2
+C_BRBLACK="\[\033[1;30m\]"      # base03
+C_BRRED="\[\033[1;31m\]"        # orange
+C_BRGREEN="\[\033[1;32m\]"      # base01
+C_BRYELLOW="\[\033[1;33m\]"     # base00
+C_BRBLUE="\[\033[1;34m\]"       # base0
+C_BRMAGENTA="\[\033[1;35m\]"    # violet
+C_BRCYAN="\[\033[1;36m\]"       # base1
+C_BRWHITE="\[\033[1;37m\]"      # base3
+# Background colors (No bright versions, not supported :()
+C_BG_BLACK="\[\033[40m\]"       # base02
+C_BG_RED="\[\033[41m\]"         # red
+C_BG_GREEN="\[\033[42m\]"       # green
+C_BG_YELLOW="\[\033[43m\]"      # yellow
+C_BG_BLUE="\[\033[44m\]"        # blue
+C_BG_MAGENTA="\[\033[45m\]"     # magenta
+C_BG_CYAN="\[\033[46m\]"        # cyan
+C_BG_WHITE="\[\033[47m\]"       # base2
diff --git a/home/.conkyrc.new b/home/.conkyrc.new
new file mode 100644
index 0000000..fa8c017
--- /dev/null
+++ b/home/.conkyrc.new
@@ -0,0 +1,90 @@
+background no
+override_utf8_locale yes
+font DejaVu Sans:size=10
+xftfont DejaVu Sans:size=10
+use_xft yes
+xftalpha 0.1
+
+update_interval 1.0
+total_run_times 0
+own_window yes
+own_window_type conky
+#own_window_type normal
+#own_window_type override
+#own_window_type desktop
+own_window_transparent yes
+own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
+own_window_argb_visual yes
+own_window_argb_value 255
+double_buffer yes
+draw_shades yes
+draw_outline no
+draw_borders no
+draw_graph_borders yes
+minimum_size 200 5
+maximum_width 200
+
+#alignment top_left
+alignment top_right
+#alignment bottom_left
+#alignment bottom_right
+#alignment none
+gap_x 5
+gap_y 5
+no_buffers yes
+cpu_avg_samples 2
+override_utf8_locale yes
+uppercase no
+use_spacer none
+out_to_console no
+
+default_color lightgrey
+default_shade_color black
+default_outline_color grey90
+
+TEXT
+${voffset 10}${color gold}${font OpenLogos:size=80}Q
+${voffset -200}${font}$alignr${color} ${execi 5 cat /sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input | cut -c-2}℃
+${font}$alignr${color} ${cpu cpu0}% ${freq_g cpu0} cpu0
+${font}$alignr${color} ${cpu cpu1}% ${freq_g cpu1} cpu1
+${font}$alignr${color} ${cpu cpu2}% ${freq_g cpu2} cpu2
+${font}$alignr${color} ${cpu cpu3}% ${freq_g cpu3} cpu3
+${voffset 10}${color grey}${hr}
+${font}${color slate grey}UpTime:$alignr${color}$uptime
+${font}${color slate grey}Kern:$alignr${color}$kernel
+${font}${color slate grey}Processes:$alignr${color}$processes  ($running_processes running)
+${color grey}${hr}
+${font}${color slate grey}Highest CPU:$alignr -PID-  CPU%
+${color gold}${top name 1}$alignr${top pid 1}${top cpu 1}
+${color lightgrey}${top name 2}$alignr${top pid 2}${top cpu 2}
+${color lightgrey}${top name 3}$alignr${top pid 3}${top cpu 3}
+${color grey}${hr}
+${color}${font}${color slate grey}Highest MEM:$alignr -PID-  MEM%
+${color gold}${top_mem name 1}$alignr${top_mem pid 1}${top_mem mem 1}
+${color lightgrey}${top_mem name 2}$alignr${top_mem pid 2}${top_mem mem 2}
+${color lightgrey}${top_mem name 3}$alignr${top_mem pid 3}${top_mem mem 3}
+${color grey}${hr}
+${color slate grey}MEM:${color} $memperc%$alignr$mem/$memmax
+${membar 3,200}
+${color slate grey}ROOT:${color} ${fs_used_perc /}%$alignr${fs_used /}/${fs_size /}
+${fs_bar 3,200 /}
+${color grey}${hr}
+${color slate grey}Disk Read:${alignr}${color}${diskio_read}ps
+${color}${diskiograph_read /dev/sda 30,200 ffffff ffffff}
+${color slate grey}Disk Write:${alignr}${color}${diskio_write}ps
+${color}${diskiograph_write /dev/sda 30,200 ffffff ffffff}
+${color grey}${hr}
+${if_up wlp6s0}${color slate grey}Internet:${alignr}${color}${wireless_essid wlp6s0}
+${color slate grey}${font} Tot.up. ${color}${totalup wlp6s0}
+${color slate grey}${font} Up: ${color}${upspeed wlp6s0}ps
+${upspeedgraph wlp6s0 30,200 ffffff ffffff}
+${color slate grey}${font} Tot.dow. ${color}${totaldown wlp6s0}
+${color slate grey}${font} Down: ${color}${downspeed wlp6s0}ps
+${downspeedgraph wlp6s0 30,200 ffffff ffffff}
+${else}${if_up enp3s0}${color slate grey}Internet:${alignr}${color}enp3s0
+${color slate grey}${font} Tot.up. ${color}${totalup enp3s0}
+${color slate grey}${font} Up: ${color}${upspeed enp3s0}ps
+${upspeedgraph enp3s0 30,200 ffffff ffffff}
+${color slate grey}${font} Tot.dow. ${color}${totaldown enp3s0}
+${color slate grey}${font} Down: ${color}${downspeed enp3s0}ps
+${downspeedgraph enp3s0 30,200 ffffff ffffff}${endif}${endif}
diff --git a/home/.gitignore_global b/home/.gitignore_global
index 3faedd7..831458f 100644
--- a/home/.gitignore_global
+++ b/home/.gitignore_global
@@ -1,9 +1,12 @@
 # global
 !.gitkeep
 .DS_Store
+.Spotlight-v100
+*.pyc
 *~
 
 # Windows
 Thumbs.db
 ehtuumbs.db
 Desktop.ini
+.Trashes
-- 
2.11.4.GIT