From 0c1d6f88116bc6f7048c7e73389a413354e0ca64 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Sat, 30 May 2015 12:44:09 +0200
Subject: [PATCH] more comprehensive optimus installer for ubuntu

---
 ubuntu/bumblebee.conf  | 63 ++++++++++++++++++++++++++++++++++++++++++
 ubuntu/install_optimus |  8 ++++--
 ubuntu/nouveau.conf    |  2 ++
 3 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 ubuntu/bumblebee.conf
 create mode 100644 ubuntu/nouveau.conf

diff --git a/ubuntu/bumblebee.conf b/ubuntu/bumblebee.conf
new file mode 100644
index 00000000..e4fc3a8c
--- /dev/null
+++ b/ubuntu/bumblebee.conf
@@ -0,0 +1,63 @@
+# Configuration file for Bumblebee. Values should **not** be put between quotes
+
+## Server options. Any change made in this section will need a server restart
+# to take effect.
+[bumblebeed]
+# The secondary Xorg server DISPLAY number
+VirtualDisplay=:8
+# Should the unused Xorg server be kept running? Set this to true if waiting
+# for X to be ready is too long and don't need power management at all.
+KeepUnusedXServer=false
+# The name of the Bumbleblee server group name (GID name)
+ServerGroup=bumblebee
+# Card power state at exit. Set to false if the card shoud be ON when Bumblebee
+# server exits.
+TurnCardOffAtExit=false
+# The default behavior of '-f' option on optirun. If set to "true", '-f' will
+# be ignored.
+NoEcoModeOverride=false
+# The Driver used by Bumblebee server. If this value is not set (or empty),
+# auto-detection is performed. The available drivers are nvidia and nouveau
+# (See also the driver-specific sections below)
+Driver=nvidia
+# Directory with a dummy config file to pass as a -configdir to secondary X
+XorgConfDir=/etc/bumblebee/xorg.conf.d
+
+## Client options. Will take effect on the next optirun executed.
+[optirun]
+# Acceleration/ rendering bridge, possible values are auto, virtualgl and
+# primus.
+Bridge=auto
+# The method used for VirtualGL to transport frames between X servers.
+# Possible values are proxy, jpeg, rgb, xv and yuv.
+VGLTransport=proxy
+# List of paths which are searched for the primus libGL.so.1 when using
+# the primus bridge
+PrimusLibraryPath=/usr/lib/x86_64-linux-gnu/primus:/usr/lib/i386-linux-gnu/primus
+# Should the program run under optirun even if Bumblebee server or nvidia card
+# is not available?
+AllowFallbackToIGC=false
+
+
+# Driver-specific settings are grouped under [driver-NAME]. The sections are
+# parsed if the Driver setting in [bumblebeed] is set to NAME (or if auto-
+# detection resolves to NAME).
+# PMMethod: method to use for saving power by disabling the nvidia card, valid
+# values are: auto - automatically detect which PM method to use
+#         bbswitch - new in BB 3, recommended if available
+#       switcheroo - vga_switcheroo method, use at your own risk
+#             none - disable PM completely
+# https://github.com/Bumblebee-Project/Bumblebee/wiki/Comparison-of-PM-methods
+
+## Section with nvidia driver specific options, only parsed if Driver=nvidia
+[driver-nvidia]
+# Module name to load, defaults to Driver if empty or unset
+KernelDriver=nvidia_346
+PMMethod=auto
+# colon-separated path to the nvidia libraries
+LibraryPath=/usr/lib/nvidia-346:/usr/lib32/nvidia-346
+# comma-separated path of the directory containing nvidia_drv.so and the
+# default Xorg modules path
+XorgModulePath=/usr/lib/nvidia-346/xorg,/usr/lib/xorg/modules
+XorgConfFile=/etc/bumblebee/xorg.conf.nvidia
+
diff --git a/ubuntu/install_optimus b/ubuntu/install_optimus
index 7c6fbb74..ada9c54c 100755
--- a/ubuntu/install_optimus
+++ b/ubuntu/install_optimus
@@ -1,6 +1,8 @@
 #!/bin/bash
+set -e
+set -v
 sudo aptitude install -y bumblebee
-sudo aptitude install -y nvidia-331-updates
+sudo aptitude install -y nvidia-346
 sudo aptitude install -y bumblebee-nvidia
-
-
+sudo cp -v bumblebee.conf /etc/bumblebee/bumblebee.conf
+sudo cp -v nouveau.conf /etc/modprobe.d/nouveau.conf
diff --git a/ubuntu/nouveau.conf b/ubuntu/nouveau.conf
new file mode 100644
index 00000000..c7f1a88a
--- /dev/null
+++ b/ubuntu/nouveau.conf
@@ -0,0 +1,2 @@
+blacklist nouveau
+