X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=jessie_postinstall.sh;h=7aafe79cd2f273f8adf8e1d9979de71470eb636f;hb=85c133c68f9c315b07f5ac5f4293444e24c7076f;hp=007d594a4ed8605347a2c83238997bb46b941df7;hpb=baf69e50267bb32369c2d89dda091f41f70cf418;p=config

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 007d594..7aafe79 100755
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -65,10 +65,8 @@ echo 'deb http://security.debian.org/ jessie/updates main contrib non-free' \
 echo 'deb http://ftp.debian.org/debian/ jessie-updates main contrib non-free' \
     >> /etc/apt/sources.list
 if [ "$1" = "thinkpad" ]; then
-    if [ "$2" = "T450s" ]; then
-        echo 'deb http://ftp.debian.org/debian/ jessie-backports main contrib' \
+    echo 'deb http://ftp.debian.org/debian/ jessie-backports main contrib' \
 ' non-free' >> /etc/apt/sources.list
-    fi
     echo 'deb http://ftp.debian.org/debian/ testing main contrib non-free' \
         >> /etc/apt/sources.list
     echo 'deb http://security.debian.org/ testing/updates main contrib' \
@@ -205,26 +203,28 @@ elif [ "$1" = "thinkpad" ]; then
         amixer -c 0 sset Master playback 100% unmute
     elif [ "$2" = "T450s" ]; then
         amixer -c 1 sset Master playback 100% unmute
+        # Re-order souncards so the commonly used one is the first one.
+        echo 'options snd_hda_intel index=1,0' >> /etc/modprobe.d/sound.conf
     fi
 
     # Set up window system, i3, redshift.
     apt-get -y install xserver-xorg xinit xterm i3 i3status dmenu redshift
 
     # Set up OpenGL and hardware acceleration.
-    if [ "$1" = "X220s" ]; then
-        apt-get -y install libgl1-mesa-dri
+    if [ "$2" = "X200s" ]; then
         apt-get -y install i965-va-driver
-        usermod -aG video plom
     elif [ "$2" = "T450s" ]; then
         apt-get -y -t jessie-backports install xserver-xorg-video-intel
     fi
+    apt-get -y install libgl1-mesa-dri
+    usermod -aG video plom
 
     # Install xrandr.
     apt-get -y install x11-xserver-utils
 
     # Set up pentadactyl. 
     apt-get -y install iceweasel
-    apt-get -y -t testing install xul-ext-pentadactyl
+    apt-get -y -t jessie-backports install xul-ext-pentadactyl
     apt-get -y install vim-gtk
     su plom -c 'mkdir -p /home/plom/downloads/'