Merge branch 'master' of sleepmap.de:dotfiles

* 'master' of sleepmap.de:dotfiles:
  .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.

1 files changed, 5 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 1b10e17..14138d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,6 +97,7 @@ svn/
 .config/asunder
 .config/aurvote
 .config/autostart/
+.config/autorandr/
 .config/awesome/
 .config/brasero/
 .config/calibre/
@@ -114,6 +115,7 @@ svn/
 .config/geeqie/
 .config/ghb/
 .config/goobox/
+.config/gsmartcontrol/
 .config/gtk-2.0/
 .config/guitarix/
 .config/htop/
@@ -138,6 +140,7 @@ svn/
 .config/nautilus-actions/
 .config/nautilus/
 .config/octave/
+.config/pavucontrol.ini
 .config/pd-extended/
 .config/pulse/
 .config/pure-data/
@@ -205,9 +208,7 @@ svn/
 .hydrogen
 .icedtea/
 .inkscape/
-.irssi/config.*
-.irssi/logs/
-.irssi/away.log
+.irssi/
 .iscan_preference
 .jackdrc
 .java/
@@ -338,6 +339,7 @@ svn/
 .vimperator/
 .vimpressrc
 .viminfo
+.viminfo.tmp
 .vmoviedb/
 .wine
 .wireshark/