diff --git a/.gitmodules b/.gitmodules
index d6fbe9b..7ad3d7a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "modules/stdlib"]
 	path = modules/stdlib
 	url = https://github.com/puppetlabs/puppetlabs-stdlib
+[submodule "modules/kmod"]
+	path = modules/kmod
+	url = https://github.com/camptocamp/puppet-kmod
diff --git a/modules/devices/manifests/laptop.pp b/modules/devices/manifests/laptop.pp
index 9771908..6d6d6ff 100644
--- a/modules/devices/manifests/laptop.pp
+++ b/modules/devices/manifests/laptop.pp
@@ -2,13 +2,30 @@ class devices::laptop {
   package {[
     'ethtool',
     'smartmontools',
-    'tlp'
+    'tlp',
+    'nvidia',
+    'nvidia-settings',
+    'bumblebee',
+    'bbswitch'
   ]:
     ensure => installed
   }
   -> service {'tlp':
     enable => true
   }
+  -> user { 'Update user groups':
+    name => 'jake',
+    groups => [
+      'input',
+      'users',
+      'wheel',
+      'bumblebee'
+    ]
+  }
+  -> service { 'bumblebeed':
+    enable => true
+  }
+  -> kmod::load { 'nvidia': }
 
   file { 'TLP config':
     ensure => file,
diff --git a/modules/kmod b/modules/kmod
new file mode 160000
index 0000000..ad51300
--- /dev/null
+++ b/modules/kmod
@@ -0,0 +1 @@
+Subproject commit ad513009a503842bece35953943ce12a0e1503ee