diff --git a/conky/conky/clock.conkyrc b/conky/conky/clock.conkyrc index e6494d9..b133b64 100644 --- a/conky/conky/clock.conkyrc +++ b/conky/conky/clock.conkyrc @@ -144,10 +144,6 @@ use_spacer left # enables anti-aliased font for example use_xft yes -# the xft font to use -xftfont DejaVu Sans Mono:size=10 - - ############################################################################### @@ -251,6 +247,8 @@ xftfont DejaVu Sans Mono:size=10 TEXT -${font Ubuntu:size=70:bold}${alignr}${time %R}${font} +${font Ubuntu:size=112:light}${alignr}${time %R}${font} +${font Ubuntu:size=30:light}_______________________${font} + +${font Ubuntu:size=30:light}${alignr}${time %A, %d %B %Y}${font} -${font Ubuntu:size=24}${alignr}${time %A, %d %B %Y}${font} diff --git a/conky/conky/conkyrc b/conky/conky/conkyrc index 859bde8..61a7354 100644 --- a/conky/conky/conkyrc +++ b/conky/conky/conkyrc @@ -26,7 +26,11 @@ ############################################################################### -alignment top_right +alignment top_left + +# gap between window and screen borders +gap_x 40 +gap_y 40 # do not fork to the background after startup background no @@ -71,10 +75,6 @@ extra_newline no # print byte values in human readable form format_human_readable yes -# gap between window and screen borders -gap_x 10 -gap_y 10 - # do not break lines max_text_width 0 @@ -144,10 +144,6 @@ use_spacer left # enables anti-aliased font for example use_xft yes -# the xft font to use -xftfont DejaVu Sans Mono:size=10 - - ############################################################################### @@ -249,28 +245,36 @@ xftfont DejaVu Sans Mono:size=10 # seti_progbar (height) Seti@home current progress bar # seti_credit Seti@hoome total user credit +color1 \#e16b40 + +#${hr} +#MEM : ${mem}/${memmax} (${memperc}%) ${membar} +#SWAP : ${swap}/${swapmax} (${swapperc}%) ${swapbar} +#${hr} +#NETWORK: +#wlp2s0: ${addr wlp2s0} +#DOWN: ${downspeed wlp2s0}${alignr}UP: ${upspeed wlp2s0} +#${downspeedgraph wlp2s0 40,130}${alignr}${upspeedgraph wlp2s0 40,130} +#TOTAL DOWN: ${totaldown wlp2s0}${alignr}UP: ${totalup wlp2s0} TEXT -${alignc}${tztime local %A, %Y-%m-%d %H:%M:%S} -${hr} -${nodename}${alignr}Uptime: ${uptime} -${sysname} ${kernel}${alignr}Load: ${loadavg 1} -${hr} -BAT: ${battery_short} (${battery_time}) ${battery_bar} -${hr} -CPU usage: ${cpu cpu0}% ${cpubar} -${cpugraph cpu0 40,200} ${alignr}${cpugauge cpu0 40,80} -${hr} -/ : ${fs_used /}/${fs_size /} (${fs_used_perc /}%) ${fs_bar /} -/home: ${fs_used /home}/${fs_size /home} (${fs_used_perc /home}%) ${fs_bar /home} -/var : ${fs_used /var}/${fs_size /var} (${fs_used_perc /var}%) ${fs_bar /var} -/boot: ${fs_used /boot}/${fs_size /boot} (${fs_used_perc /boot}%) ${fs_bar /boot} -${hr} -MEM : ${mem}/${memmax} (${memperc}%) ${membar} -SWAP : ${swap}/${swapmax} (${swapperc}%) ${swapbar} -${hr} -NETWORK: -wlp2s0: ${addr wlp2s0} -DOWN: ${downspeed wlp2s0}${alignr}UP: ${upspeed wlp2s0} -${downspeedgraph wlp2s0 40,130}${alignr}${upspeedgraph wlp2s0 40,130} -TOTAL DOWN: ${totaldown wlp2s0}${alignr}UP: ${totalup wlp2s0} +${font Ubuntu Mono:size=16} +${color1}${nodename}${color}${alignr}Uptime: ${uptime} +${sysname}${alignr}${color1}${kernel}${color} + + +CPU : ${cpu cpu0}% ${cpubar 10} + +${color1}${hr 2}${color} + +/ : ${fs_used_perc /}% ${fs_bar 10 /} + +/home: ${fs_used_perc /home}% ${fs_bar 10 /home} + +/boot: ${fs_used_perc /boot}% ${fs_bar 10 /boot} + +${color1}${hr 2}${color} + +MEM : ${memperc}% ${membar 10} + +SWAP ; ${swapperc}% ${swapbar 10} diff --git a/i3/i3/config b/i3/i3/config index e835392..ae1710c 100644 --- a/i3/i3/config +++ b/i3/i3/config @@ -305,7 +305,7 @@ client.urgent #2f343a #900000 #ffffff #900000 for_window [class="^Truecrypt$"] floating enable for_window [class="^URxvt$"] border 1pixel for_window [class="^Cairo-dock$"] floating enable , border none - for_window [class="^Pavucontrol$"] floating enable + for_window [class="^Pavucontrol$"] floating enable , border normal for_window [title="^Skype.*for Linux$" ] floating enable , border none for_window [class="^Chromium$" ] border none for_window [class="^yad-status$" ] floating enable , border none diff --git a/i3/i3/config.d/notebook.config b/i3/i3/config.d/notebook.config index c3bac5c..d6a9838 100644 --- a/i3/i3/config.d/notebook.config +++ b/i3/i3/config.d/notebook.config @@ -30,7 +30,7 @@ bar { id bar-0 - font pango:DejaVu Sans Mono, Icons 10.5 + font pango:DejaVu Sans, Icons 11 colors { background #222222 diff --git a/i3/i3/conky/virtualarch.conkyrc b/i3/i3/conky/virtualarch.conkyrc index 6b24c15..fe16a86 100644 --- a/i3/i3/conky/virtualarch.conkyrc +++ b/i3/i3/conky/virtualarch.conkyrc @@ -24,7 +24,7 @@ ${if_match "${mpd_status}" == "Paused"}\ ${else}\ \ ${endif}\ - - " , "name" : "mpd_toggle" ,"separator" : false , "separator_block_width" : 0 },\ + ~ " , "name" : "mpd_toggle" ,"separator" : false , "separator_block_width" : 0 },\ ${endif}\ \ \ diff --git a/i3/i3/scripts/i3exit.bash b/i3/i3/scripts/i3exit.bash index ca677e1..8478ac5 100755 --- a/i3/i3/scripts/i3exit.bash +++ b/i3/i3/scripts/i3exit.bash @@ -51,7 +51,8 @@ case "$1" in ;; hibernate) log "[I] Hibernating." - lock && systemctl hibernate + #lock && + systemctl hibernate ;; reboot) log "[I] Rebooting." diff --git a/x/xinitrc b/x/xinitrc index 413b25b..4aeb524 100755 --- a/x/xinitrc +++ b/x/xinitrc @@ -77,7 +77,7 @@ fi #fi log "starting conky clock on desktop" -conky -c "$HOME/.conky/clock.conkyrc +(sleep 5 && conky -c "$HOME/.conky/clock.conkyrc" &> $LOGFILE) & # start the pulseaudio volume control tray applet log "starting pasystray"