Merge branch 'master' of /home/git/repositories/dotfiles

* 'master' of /home/git/repositories/dotfiles: (60 commits)
  .config/systemd/user/default.target.wants/*: Deleting all user services. Not good to have them started as root.
  export.zsh: Don't use /run/user/ directory for roots TMUX_TMPDIR.
  .irssi: Removing irssi as gitmodule, adding it to .gitignore (so it can be added again, without being a gitmodule).
  .gitignore: Adding some now unneeded stuff that will popup from time to time.
  .zprezto: Updating to c34098af20cafdf016f68f3e7f612ed60ca93aa1
  .irssi: Updating .irssi submodule to latest commit.
  .vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters.
  .vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise.
  termite/config: Switching to Inconsolata (made available through powerline-fonts-git).
  pavucontrol.ini: Removing, as it's going to be rewritten each call anyways.
  .tmux.conf: Updating colours, incorporating tpm, removing powerline stuff.
  .compton.conf: Adding MPlayer to comptons exclude lists.
  Updating irssi settings.
  .autorandr/*: Clean slate for all autorandr profiles.
  .password-store: Updating password store to latest commits.
  .gitignore: Removing some unneeded stuff that has been added to the repo.
  fonts.conf: Updating to a correct path structure.
  .fonts: Removing top level configuration.
  .fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
  .fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
  ...

1 files changed, 47 insertions, 0 deletions

diff --git a/.config/conky/bottom b/.config/conky/bottom
new file mode 100755
index 0000000..aa2f13b
--- /dev/null
+++ b/.config/conky/bottom
@@ -0,0 +1,47 @@
+use_xft yes
+xftfont 123:size=8
+xftalpha 0.1
+background true
+update_interval 0.1
+total_run_times 0
+own_window yes
+own_window_type override
+own_window_argb_visual true
+own_window_argb_value 100
+own_window_hints undecorated,sticky,below,skip_taskbar,skip_pager
+double_buffer yes
+draw_shades no
+draw_outline no
+draw_borders no
+draw_graph_borders no
+default_color white
+default_shade_color 222222
+default_outline_color green
+alignment bottom_left
+minimum_size 1920 30
+#maximum_width 160
+gap_x 0
+gap_y -10
+no_buffers yes
+uppercase no
+cpu_avg_samples 1
+net_avg_samples 1
+override_utf8_locale yes
+use_spacer left
+color1 EAEAEA
+color2 00FF66
+color3 11EAEA
+color4 EAEAEA
+color5 FFA300
+color6 22FFFF
+color7 FF8888
+text_buffer_size 256
+pad_percents 0
+short_units yes
+format_human_readable yes
+default_bar_size 100 6
+if_up_strictness link
+draw_shades yes
+
+TEXT
+${font Terminus:pixelsize=14}${color1}  CPU: ${color3}${cpu cpu0}% ${goto 110}${color1}Memory: ${color3}[$memmax] $mem / $buffers / $cached   ${goto 440}${color1}HD: ${color3}$diskio   ${goto 540}${color1}Network: ${color3}${downspeedf wlp3s0} KB / ${upspeedf wlp3s0} KB ${goto 1750}${color5} ${time %H:%M:%S %d-%m-%Y}