From 7b0c5575fda9e2aebfdc3d24452375932ead2e78 Mon Sep 17 00:00:00 2001 From: Blubber Date: Sun, 16 Oct 2016 23:01:17 +0200 Subject: refactoring --- .Xcommon | 20 ----------- .Xresources_gray | 64 ----------------------------------- .Xresources_solarized | 73 ---------------------------------------- .conkyrc | 93 --------------------------------------------------- .gitconfig | 14 -------- Xresources | 74 ++++++++++++++++++++++++++++++++++++++++ conkyrc | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ gitconfig | 14 ++++++++ 8 files changed, 181 insertions(+), 264 deletions(-) delete mode 100644 .Xcommon delete mode 100644 .Xresources_gray delete mode 100644 .Xresources_solarized delete mode 100755 .conkyrc delete mode 100644 .gitconfig create mode 100644 Xresources create mode 100755 conkyrc create mode 100644 gitconfig diff --git a/.Xcommon b/.Xcommon deleted file mode 100644 index 314cfd8..0000000 --- a/.Xcommon +++ /dev/null @@ -1,20 +0,0 @@ -! dotfiles -- .Xcommon -! author: johannst - -!xterm*font: 9x15 -!XTerm*renderFont: true -!XTerm*faceName: Vera Serif Mono -!XTerm*faceName: Liberation Mono -!XTerm*faceName: Droid Sans Mono -xterm*faceName: Terminess Powerline -xterm*faceSize: 12 - -XTerm*scaleHeight: 1.1 -xterm*metaSendsEscape: true -xterm*saveLines: 16384 -xterm*loginShell: true -xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 -xterm*termName: xterm-256color -xterm*eightBitInput: false -XTerm*selectToClipboard: true -XTerm*visualBell: false diff --git a/.Xresources_gray b/.Xresources_gray deleted file mode 100644 index 4c2ea62..0000000 --- a/.Xresources_gray +++ /dev/null @@ -1,64 +0,0 @@ -! dotfiles -- .Xresources_gray -! author: johannst - -#include ".Xcommon" - -! ------------------------------------------------------------------------------ -! --- generated with 4bit Terminal Color Scheme Designer ----------------------- -! --- http://ciembor.github.com/4bit ------------------------------------------- -! ------------------------------------------------------------------------------ - -! --- special colors --- - -*background: #262626 -*foreground: #d9d9d9 - -! --- standard colors --- - -! black -*color0: #000000 - -! bright_black -*color8: #262626 - -! red -*color1: #c05b69 - -! bright_red -*color9: #cda0ae - -! green -*color2: #50cd68 - -! bright_green -*color10: #95d9ad - -! yellow -*color3: #c0cb68 - -! bright_yellow -*color11: #cdd8ad - -! blue -*color4: #4e5dd9 - -! bright_blue -*color12: #93a1e6 - -! magenta -*color5: #be5bd9 - -! bright_magenta -*color13: #cba0e6 - -! cyan -*color6: #4ecdd8 - -! bright_cyan -*color14: #93d9e5 - -! white -*color7: #d9d9d9 - -! bright_white -*color15: #ffffff diff --git a/.Xresources_solarized b/.Xresources_solarized deleted file mode 100644 index 3995ec1..0000000 --- a/.Xresources_solarized +++ /dev/null @@ -1,73 +0,0 @@ -! dotfiles -- .Xresources_solarized -! author: johannst - -#include ".Xcommon" - -! blue - gray mix with different brightness -! S_base03 ^ -! S_base02 | brightness -! S_base01 | reduces -! S_base00 | - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 - -! S_base0 light blue -! S_base1 light gray -! S_base2 light beige -! S_base3 super light yellow - -#define S_base0 #c8d9ea -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - -*background: S_base03 -*foreground: S_base0 -*fadeColor: S_base03 -*cursorColor: S_base1 -*pointerColorBackground:S_base01 -*pointerColorForeground:S_base1 - -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - -!! black dark/light -*color0: S_base02 -*color8: S_base03 - -!! red dark/light -*color1: S_red -*color9: S_orange - -!! green dark/light -*color2: S_green -*color10: S_base01 - -!! yellow dark/light -*color3: S_yellow -*color11: S_base00 - -!! blue dark/light -*color4: S_blue -*color12: S_base0 - -!! magenta dark/light -*color5: S_magenta -*color13: S_violet - -!! cyan dark/light -*color6: S_cyan -*color14: S_base1 - -!! white dark/light -*color7: S_base2 -*color15: S_base3 diff --git a/.conkyrc b/.conkyrc deleted file mode 100755 index b4b586d..0000000 --- a/.conkyrc +++ /dev/null @@ -1,93 +0,0 @@ -# dotfiles -- .conkyrc -# author: johannst - -background yes -use_xft yes -xftfont Bitstream Vera Sans Mono:size=9 -xftalpha 0.8 -update_interval 2.0 -total_run_times 0 -own_window yes -own_window_type normal -own_window_transparent yes -own_window_colour black -own_window_hints undecorated,skip_pager,skip_taskbar -double_buffer yes -minimum_size 260 5 -draw_shades no -draw_outline no -draw_borders no -draw_graph_borders no -stippled_borders 0 -border_margin 4 -border_width 0 -default_color white -default_shade_color black -default_outline_color black -alignment top_right -gap_x 0 -gap_y 25 -no_buffers yes -uppercase no -cpu_avg_samples 1 -net_avg_samples 1 -override_utf8_locale no -use_spacer yes -mpd_host localhost -mpd_portPort 6060 -#mpd_password - -TEXT -############################################################# -# CPU # -############################################################# -${font Verdana:style=Bold:size=16}${color #75C8ff}${alignc}${time %a %d. %b %k:%M} -$font$color${alignc}Kernel: $kernel -${color #75C8ff}$stippled_hr - -############################################################# -# POWER # -############################################################# -${color lightgrey}Power: ${battery_short BAT0} ${battery_time BAT0} ${battery_bar BAT0} - -############################################################# -# CPU # -############################################################# -${color lightgrey}Processes:$color $processes ${color grey}Running:$color $running_processes ${color lightgrey}Up:$color $uptime -#(cpu 0)=total util (cpuX)=util core X [here X=1,2,3,4] -${color #75C8ff}CPU: ${cpu cpu0}% ${cpubar} -${color}Name PID CPU% MEM% -${font Monospace:size=8}${color lightgrey}${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} -${color lightgrey}${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} -${color lightgrey}${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} - -${font Monospace:size=8}${color}core0 core1 -${cpugraph cpu1 30,160 0032bc 75C8ff} ${cpugraph cpu2 30,160 0032bc 75C8ff} -${font Monospace:size=8}${color}core2 core3 -${cpugraph cpu3 30,160 0032bc 75C8ff} ${cpugraph cpu4 30,160 0032bc 75C8ff} - -############################################################# -# MEMORY # -############################################################# -$font${color #75C8ff}RAM: $mem/$memmax - $memperc% ${membar} -${color lightgrey}Swap: $swap/$swapmax - $swapperc% ${swapbar} -${color}Name PID CPU% MEM% -${font Monospace:size=8}${color lightgrey}${top_mem name 1} ${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem 1} -${color lightgrey}${top_mem name 2} ${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem 2} -${color lightgrey}${top_mem name 3} ${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem 3} - -############################################################# -# NETWORK # -############################################################# -$font${color #75C8ff}Connections${alignr}${color #75C8ff}In:$color ${tcp_portmon 1 32767 count} ${color #75C8ff}Out:$color ${tcp_portmon 32768 61000 count} ${color #75C8ff}ALL:$color ${tcp_portmon 1 65535 count} -${color lightgrey}$stippled_hr -${color lightgrey}Down:$color ${downspeedf wlp3s0} k/s${color lightgrey} ${offset 40}Up:$color ${upspeedf wlp3s0} k/s -${downspeedgraph wlp3s0 32,120 75C8ff ffffff} ${offset 40} ${upspeedgraph wlp3s0 32,120 75C8ff ffffff} -#${color #75C8ff}IPs:$color ${addr wlp3s0} ${offset 40} ${execi 7200 ~/.conky/publicip.sh} -${color lightgrey}$stippled_hr - -############################################################# -# HDD # -############################################################# -${color lightgrey}system: ${fs_used /}/${fs_size /} free:${fs_free_perc /}% ${fs_bar /} -${color lightgrey}home: ${fs_used /home}/${fs_size /home} free:${fs_free_perc /home}% ${fs_bar /home} diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index 65d0e58..0000000 --- a/.gitconfig +++ /dev/null @@ -1,14 +0,0 @@ -[alias] - lol = log --graph --decorate --pretty=oneline --abbrev-commit --all - d = difftool -[user] - email = stoelp@eit.uni-kl.de - name = johannst -[core] - editor = vim -[diff] - tool = vimdiff -[difftool] - prompt = false -[color] - ui = true diff --git a/Xresources b/Xresources new file mode 100644 index 0000000..c007c88 --- /dev/null +++ b/Xresources @@ -0,0 +1,74 @@ +! dotfiles -- .Xresources_gray +! author: johannst + +!XTerm*font: 9x15 +!XTerm*renderFont: true +!XTerm*faceName: Vera Serif Mono +!XTerm*faceName: Liberation Mono +!XTerm*faceName: Droid Sans Mono +XTerm*faceName: Terminess Powerline +XTerm*faceSize: 12 + +XTerm*scaleHeight: 1.1 +XTerm*metaSendsEscape: true +XTerm*saveLines: 16384 +XTerm*loginShell: true +XTerm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 +XTerm*termName: xterm-256color +XTerm*eightBitInput: false +XTerm*selectToClipboard: true +XTerm*visualBell: false + +! --- generated with http://ciembor.github.com/4bit +! --- special colors --- +*background: #262626 +*foreground: #d9d9d9 + +! --- standard colors --- +! black +*color0: #000000 + +! bright_black +*color8: #262626 + +! red +*color1: #c05b69 + +! bright_red +*color9: #cda0ae + +! green +*color2: #50cd68 + +! bright_green +*color10: #95d9ad + +! yellow +*color3: #c0cb68 + +! bright_yellow +*color11: #cdd8ad + +! blue +*color4: #4e5dd9 + +! bright_blue +*color12: #93a1e6 + +! magenta +*color5: #be5bd9 + +! bright_magenta +*color13: #cba0e6 + +! cyan +*color6: #4ecdd8 + +! bright_cyan +*color14: #93d9e5 + +! white +*color7: #d9d9d9 + +! bright_white +*color15: #ffffff diff --git a/conkyrc b/conkyrc new file mode 100755 index 0000000..b4b586d --- /dev/null +++ b/conkyrc @@ -0,0 +1,93 @@ +# dotfiles -- .conkyrc +# author: johannst + +background yes +use_xft yes +xftfont Bitstream Vera Sans Mono:size=9 +xftalpha 0.8 +update_interval 2.0 +total_run_times 0 +own_window yes +own_window_type normal +own_window_transparent yes +own_window_colour black +own_window_hints undecorated,skip_pager,skip_taskbar +double_buffer yes +minimum_size 260 5 +draw_shades no +draw_outline no +draw_borders no +draw_graph_borders no +stippled_borders 0 +border_margin 4 +border_width 0 +default_color white +default_shade_color black +default_outline_color black +alignment top_right +gap_x 0 +gap_y 25 +no_buffers yes +uppercase no +cpu_avg_samples 1 +net_avg_samples 1 +override_utf8_locale no +use_spacer yes +mpd_host localhost +mpd_portPort 6060 +#mpd_password + +TEXT +############################################################# +# CPU # +############################################################# +${font Verdana:style=Bold:size=16}${color #75C8ff}${alignc}${time %a %d. %b %k:%M} +$font$color${alignc}Kernel: $kernel +${color #75C8ff}$stippled_hr + +############################################################# +# POWER # +############################################################# +${color lightgrey}Power: ${battery_short BAT0} ${battery_time BAT0} ${battery_bar BAT0} + +############################################################# +# CPU # +############################################################# +${color lightgrey}Processes:$color $processes ${color grey}Running:$color $running_processes ${color lightgrey}Up:$color $uptime +#(cpu 0)=total util (cpuX)=util core X [here X=1,2,3,4] +${color #75C8ff}CPU: ${cpu cpu0}% ${cpubar} +${color}Name PID CPU% MEM% +${font Monospace:size=8}${color lightgrey}${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} +${color lightgrey}${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} +${color lightgrey}${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} + +${font Monospace:size=8}${color}core0 core1 +${cpugraph cpu1 30,160 0032bc 75C8ff} ${cpugraph cpu2 30,160 0032bc 75C8ff} +${font Monospace:size=8}${color}core2 core3 +${cpugraph cpu3 30,160 0032bc 75C8ff} ${cpugraph cpu4 30,160 0032bc 75C8ff} + +############################################################# +# MEMORY # +############################################################# +$font${color #75C8ff}RAM: $mem/$memmax - $memperc% ${membar} +${color lightgrey}Swap: $swap/$swapmax - $swapperc% ${swapbar} +${color}Name PID CPU% MEM% +${font Monospace:size=8}${color lightgrey}${top_mem name 1} ${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem 1} +${color lightgrey}${top_mem name 2} ${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem 2} +${color lightgrey}${top_mem name 3} ${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem 3} + +############################################################# +# NETWORK # +############################################################# +$font${color #75C8ff}Connections${alignr}${color #75C8ff}In:$color ${tcp_portmon 1 32767 count} ${color #75C8ff}Out:$color ${tcp_portmon 32768 61000 count} ${color #75C8ff}ALL:$color ${tcp_portmon 1 65535 count} +${color lightgrey}$stippled_hr +${color lightgrey}Down:$color ${downspeedf wlp3s0} k/s${color lightgrey} ${offset 40}Up:$color ${upspeedf wlp3s0} k/s +${downspeedgraph wlp3s0 32,120 75C8ff ffffff} ${offset 40} ${upspeedgraph wlp3s0 32,120 75C8ff ffffff} +#${color #75C8ff}IPs:$color ${addr wlp3s0} ${offset 40} ${execi 7200 ~/.conky/publicip.sh} +${color lightgrey}$stippled_hr + +############################################################# +# HDD # +############################################################# +${color lightgrey}system: ${fs_used /}/${fs_size /} free:${fs_free_perc /}% ${fs_bar /} +${color lightgrey}home: ${fs_used /home}/${fs_size /home} free:${fs_free_perc /home}% ${fs_bar /home} diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..08c45e1 --- /dev/null +++ b/gitconfig @@ -0,0 +1,14 @@ +[user] + email = stoelp@eit.uni-kl.de + name = johannst +[diff] + tool = vimdiff +[difftool] + prompt = false +[alias] + lol = log --graph --decorate --pretty=oneline --abbrev-commit --all + d = difftool +[core] + editor = vim +[color] + ui = true -- cgit v1.2.3