diff options
author | David Runge <dave@sleepmap.de> | 2015-03-11 18:50:47 +0100 |
---|---|---|
committer | David Runge <dave@sleepmap.de> | 2015-03-11 18:50:47 +0100 |
commit | 378c9f89e43d135f6b8c7ae263643441d1193758 (patch) | |
tree | 186d216eab682164d82f5c466e769ee9bf8c1726 /.config | |
parent | 78d47f7aca8e4f47c0d6714a7cb0095ff1975e07 (diff) | |
parent | c377702f4c9cb27df06ae534c185ed25ab9c6262 (diff) | |
download | dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.gz dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.bz2 dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.tar.xz dotfiles-378c9f89e43d135f6b8c7ae263643441d1193758.zip |
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.
Diffstat (limited to '.config')
-rw-r--r-- | .config/compton.conf | 9 | ||||
-rw-r--r-- | .config/pavucontrol.ini | 3 | ||||
-rw-r--r-- | .config/termite/config | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.config/compton.conf b/.config/compton.conf index dc15cc4..378058e 100644 --- a/.config/compton.conf +++ b/.config/compton.conf @@ -45,7 +45,8 @@ blur-background-exclude = [ "window_type = 'desktop'", "name *= 'VLC'", "name *= 'Firefox'", - "name *= 'Vimperator'" + "name *= 'Vimperator'", + "name *= 'MPlayer'" ]; # Exclude conditions for background blur. @@ -58,7 +59,8 @@ fade-out-step = 0.03; # Opacity change between steps while fading out. (defaul fade-exclude = [ "name *= 'VLC'", "name *= 'Firefox'", - "name *= 'Vimperator'" + "name *= 'Vimperator'", + "name *= 'MPlayer'" ]; # Exclude conditions for fading. # Other @@ -85,7 +87,8 @@ unredir-if-possible = false; # Unredirect all windows if a full-screen opaque w focus-exclude = [ "name *= 'VLC'", "name *= 'Firefox'", - "name *= 'Vimperator'" + "name *= 'Vimperator'", + "name *= 'MPlayer'" ]; # A list of conditions of windows that should always be considered # focused. detect-transient = true; # Use WM_TRANSIENT_FOR to group windows, and consider windows in diff --git a/.config/pavucontrol.ini b/.config/pavucontrol.ini deleted file mode 100644 index 5931a51..0000000 --- a/.config/pavucontrol.ini +++ /dev/null @@ -1,3 +0,0 @@ -[window] -width=960 -height=600 diff --git a/.config/termite/config b/.config/termite/config index b1158e3..16d01da 100644 --- a/.config/termite/config +++ b/.config/termite/config @@ -7,7 +7,7 @@ allow_bold = true dynamic_title = true urgent_on_bell = true clickable_url = true -font = Monospace 9 +font = Inconsolata 10 scrollback_lines = 10000 search_wrap = true icon_name = terminal |