diff options
| author | shmibs <shmibs@gmail.com> | 2014-10-23 18:33:39 -0700 |
|---|---|---|
| committer | shmibs <shmibs@gmail.com> | 2014-10-23 18:33:39 -0700 |
| commit | 774444eb9959b4f260382d1115c6c6160fa6e70c (patch) | |
| tree | 184a915bea14be8922b2c4f329f59ae412f4de83 | |
| parent | e5cf9723cd9f002de3e960f79a56d05304f730f9 (diff) | |
| parent | 42c03c138af4fed3ef52bcb67b2a3d601cd62631 (diff) | |
| download | dotfiles-774444eb9959b4f260382d1115c6c6160fa6e70c.tar.gz | |
Merge branch 'master' of https://github.com/shmibs/dotfiles
Conflicts:
.xinitrc
| -rw-r--r-- | .xinitrc | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -34,8 +34,9 @@ export INFINALITY_FT_FILTER_PARAMS="16 20 28 20 16" xset -dpms xset s off -#urxvt daemon +#daemons urxvtd & +compton -b --backend glx --vsync drm #QT style mimic gtk #export QT_STYLE_OVERRIDE=gtk @@ -46,8 +47,6 @@ urxvtd & command -v optirun && $(echo "" | optirun bar) xsetroot -cursor_name left_ptr -compton -b --backend glx --vsync drm -#ibus-daemon -x & -nitrogen --restore & +nitrogen --restore exec mate-session |