From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 12 Dec 2015 15:16:22 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos/?a=commitdiff_plain;h=604947c3c99a54a4ce5310ec46879be342963d45;hp=-c;p=config

Merge branch 'master' of github.com/plomlompom/config
---

604947c3c99a54a4ce5310ec46879be342963d45
diff --combined jessie_postinstall.sh
index e6145e5,8d5d5c1..e6fd2e5
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@@ -59,8 -59,8 +59,8 @@@ f
  
  # Package management config, system upgrade.
  echo 'deb http://ftp.debian.org/debian/ jessie main contrib non-free' \
 -    >/etc/apt/sources.list
 -echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \ 
 +    > /etc/apt/sources.list
 +echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \
      >> /etc/apt/sources.list
  echo 'deb http://ftp.debian.org/debian/ jessie-updates main contrib non-free' \
      >> /etc/apt/sources.list
@@@ -199,8 -199,8 +199,8 @@@ elif [ "$1" = "thinkpad" ]; the
          amixer -c 1 sset Master playback 100% unmute
      fi
  
-     # Set up window system and OpenGL.
-     apt-get -y install xserver-xorg xinit xterm i3 i3status dmenu
+     # Set up window system, i3, redshift.
+     apt-get -y install xserver-xorg xinit xterm i3 i3status dmenu redshift
  
      # Set up OpenGL and hardware acceleration.
      apt-get -y install libgl1-mesa-dri