aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2015-03-25 16:29:07 +0100
committerDavid Runge <dave@sleepmap.de>2015-03-25 16:29:07 +0100
commit32e8f95bb412d6f61afdd18836976061635378e5 (patch)
treec0e6e65d7c5aa46ce942001051b0c35e97391283 /.gitignore
parent6867bda2d82e01c1daf81ee4b39443ecc6609694 (diff)
parenta0ef42e0a70ac6264835ba77936d1ba5bf2294fe (diff)
downloaddotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.gz
dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.bz2
dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.xz
dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.zip
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. ...
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore32
1 files changed, 16 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index 9a4e45b..14138d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ Session.vim
# Files/folders that appear in my home
# ----------------------------------------------------------------------------------------------
+Desktop/
Documents/
Downloads/
Dropbox/
@@ -43,7 +44,6 @@ backup/
build/
git/
ownCloud/
-yankring_history_v2.txt
svn/
.ICEauthority
@@ -63,6 +63,7 @@ svn/
.bash_login
.bash_logout
.bash_profile
+.bashburn_history
.bashrc
.benutzerordnung
.bundle/
@@ -80,6 +81,7 @@ svn/
.config/Fidra/
.config/ImageMagick/
.config/MusE/
+.config/Mumble/
.config/MusicBrainz/
.config/QtProject.conf
.config/Skype/
@@ -89,10 +91,13 @@ svn/
.config/Thunar/
.config/Trolltech.conf
.config/Trolltech/
-.config/ardour3/
+.config/ardour3/recent
+.config/ardour3/ardour.bindings
+.config/ario
.config/asunder
.config/aurvote
.config/autostart/
+.config/autorandr/
.config/awesome/
.config/brasero/
.config/calibre/
@@ -110,6 +115,7 @@ svn/
.config/geeqie/
.config/ghb/
.config/goobox/
+.config/gsmartcontrol/
.config/gtk-2.0/
.config/guitarix/
.config/htop/
@@ -124,7 +130,6 @@ svn/
.config/libreoffice/
.config/lxterminal/
.config/mate/
-.config/mpd/folders/
.config/mpd/mpd.db
.config/mpd/mpd.log
.config/mpd/mpd.pid
@@ -137,7 +142,6 @@ svn/
.config/octave/
.config/pavucontrol.ini
.config/pd-extended/
-.config/profile-cleaner.conf
.config/pulse/
.config/pure-data/
.config/q4wine
@@ -146,8 +150,6 @@ svn/
.config/smplayer
.config/sound-juicer/
.config/synergy-dvzrv.conf
-.config/systemd/
-.config/termite/.asound.conf
.config/tint2/
.config/user-dirs.locale
.config/vlc/
@@ -161,14 +163,12 @@ svn/
.dingrc
.dmrc
.docear/
-.dropbox-dist/
-.dropbox-master/
-.dropbox/
.dvdcss/
.dvdrip*
.e
.editrc
.electrum/
+.elementary/
.escaped_colors.rb
.esd_auth
.envtab
@@ -202,14 +202,13 @@ svn/
.gtickrc
.gtk*
.h264enc/
+.hplip/
.htoprc
.hugin
.hydrogen
.icedtea/
.inkscape/
-.irssi/config.*
-.irssi/logs/
-.irssi/away.log
+.irssi/
.iscan_preference
.jackdrc
.java/
@@ -217,7 +216,6 @@ svn/
.jsampler/
.kde4/
.keychain/
-.khal/
.kicad
.lesshst
.lfm_history
@@ -247,7 +245,6 @@ svn/
.local/share/mc/
.local/share/mime/
.local/share/recently-used.xbel
-.local/share/shotwell
.local/share/spacepiratesandzombies/
.local/share/systemd/
.local/share/Trash/
@@ -280,6 +277,7 @@ svn/
.octave_hist
.openra
.p7zip
+.parallel/
.pdextended
.pdfedit/
.pdirc
@@ -300,7 +298,6 @@ svn/
.recently-used
.revenge_of_the_titans/
.revenge_of_the_titans_1.80/
-.rtorrent.rc
.rubberband*
.rvm/
.sane/
@@ -326,11 +323,13 @@ svn/
.texlive/
.thumbnails/
.thunderbird/
+.tmux/
.tor-browser-en
.trousers/
.ts3client/
.tuxguitar-1.2/
.unescaped_colors.rb
+.unknown-horizons/
.vdirsyncer/status
.vim/backups/
.vim/sessions/
@@ -340,16 +339,17 @@ svn/
.vimperator/
.vimpressrc
.viminfo
+.viminfo.tmp
.vmoviedb/
.wine
.wireshark/
.wolf3d/
.wxcam
.xine/
+.xournal/
.xsession
.xsession-errors
.xsession-errors.old
-.yadr/
.yankring-history_v2.txt
.yaourtrc
.zcompcache/