diff --git a/group_vars/all/all b/group_vars/all/all
index 8d1c1bc..59e0590 100644
--- a/group_vars/all/all
+++ b/group_vars/all/all
@@ -1,2 +1,4 @@
 ##ansible_python_interpreter: /usr/bin/python2
-username: 'vincent'
\ No newline at end of file
+user:
+    name: vincent
+    uid: 1024
\ No newline at end of file
diff --git a/group_vars/server b/group_vars/server
index c148262..c02f1fe 100644
--- a/group_vars/server
+++ b/group_vars/server
@@ -9,7 +9,7 @@ systemd_mounts:
     backup_disk:
         share: /dev/sda1
         mount: /mnt/backup
-        type: nfs
+        type: ntfs-3g
         options:
             - uid=1024
             - guid=100
@@ -20,5 +20,5 @@ systemd_mounts_enabled:
     - backup_disk  
 
 syncthing_address: "{{inventory_hostname}}:8384"    
-syncthing_gui_user: "{{username}}"
+syncthing_gui_user: "{{user.name}}"
 syncthing_gui_password: $2a$10$nJZ8YN/1mB84Cbi79BKka.6SFMAKF.CBwyCNJDA9qUgXdkcuBilx2
\ No newline at end of file
diff --git a/host_vars/fixe-pc b/host_vars/fixe-pc
index 487e2bd..3da5910 100644
--- a/host_vars/fixe-pc
+++ b/host_vars/fixe-pc
@@ -1,2 +1,6 @@
 ##ansible_python_interpreter: /usr/bin/python2
-music_directory: '/mnt/diskstation/music'
\ No newline at end of file
+music_directory: '/mnt/diskstation/music'
+
+gpu:
+    nvidia: true
+    bumblebee: false
\ No newline at end of file
diff --git a/host_vars/pi2 b/host_vars/pi2
index 385f3a8..e69de29 100644
--- a/host_vars/pi2
+++ b/host_vars/pi2
@@ -1,6 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61393533323364663463346439613732316134373930616464613930383831653263633831303261
-6162336166663662373062653038643136376137303336390a616231396334333137313065323635
-31616164393831373838376532616532316136306639383832666234666565336330313336313163
-3836626539323630620a343036373533306635373032626466333132326635633937343562323461
-37343534386430313439356432366134353666633865383838373234373437653965
diff --git a/host_vars/zen-pc b/host_vars/zen-pc
index e69de29..29de1c8 100644
--- a/host_vars/zen-pc
+++ b/host_vars/zen-pc
@@ -0,0 +1,3 @@
+gpu:
+    nvidia: true
+    bumblebee: true
\ No newline at end of file
diff --git a/workstation.yml b/workstation.yml
index a4a7eb6..e8dbaf2 100644
--- a/workstation.yml
+++ b/workstation.yml
@@ -8,7 +8,10 @@
   - workstation
   - cups
   - grub_themes
+  - nvidia
 - hosts: laptop
   roles:
+  - laptop
+  - bluetooth
 
 #  - Windows_manager