diff --git a/modules/config/users.nix b/modules/config/users.nix
index 52fe24c..5f386b5 100644
--- a/modules/config/users.nix
+++ b/modules/config/users.nix
@@ -25,6 +25,9 @@
     systemd-coredump = uidGid 301;
     patrick = uidGid 1000;
     smb = uidGid 2000;
-    ggr = uidGid 2001;
+    david = uidGid 2004;
+    helen = uidGid 2001;
+    ggr = uidGid 2002;
+    family = uidGid 2003;
   };
 }
diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix
index e1abc97..30a96a4 100644
--- a/modules/services/nextcloud.nix
+++ b/modules/services/nextcloud.nix
@@ -70,7 +70,6 @@ in {
         extraApps = with config.services.nextcloud.package.packages.apps; {
           inherit contacts calendar tasks notes maps;
         };
-        # TODO increase outer nginx upload size as well
         maxUploadSize = "2G";
         extraAppsEnable = true;
         database.createLocally = true;
diff --git a/modules/services/samba.nix b/modules/services/samba.nix
index e772997..4d0e197 100644
--- a/modules/services/samba.nix
+++ b/modules/services/samba.nix
@@ -25,7 +25,7 @@
       # and next to the IPC connection in net view.
       "server string = patricks-tolles-nas"
       # Set the NetBIOS name by which the Samba server is known.
-      "netbios name = my-nas"
+      "netbios name = patricks-tolles-nas"
       # Disable netbios support. We don't need to support browsing since all
       # clients hardcode the host and share names.
       "disable netbios = yes"
@@ -86,14 +86,29 @@
           user = "patrick";
           group = "patrick";
         } {})
+        (mkShare {
+          name = "helen-data";
+          user = "helen";
+          group = "helen";
+        } {})
+        (mkShare {
+          name = "david-data";
+          user = "david";
+          group = "david";
+        } {})
+        (mkShare {
+          name = "family-data";
+          user = "family";
+          group = "family";
+        } {})
         ((mkShare {name = "media";})
           {
             "read only" = "yes";
-            "write list" = "smb";
+            "write list" = "@family";
           })
       ];
   };
-  # to get this file start a smbd add users using 'smbpasswd -a <user>'
+  # to get this file start a smbd, add users using 'smbpasswd -a <user>'
   # then export the database using 'pdbedit -e tdbsam:<location>'
   age.secrets.smbpassdb = {
     rekeyFile = ../../secrets/smbpassdb.tdb.age;
@@ -120,6 +135,12 @@
           ggr.extraGroups = [
             "family"
           ];
+          david.extraGroups = [
+            "family"
+          ];
+          helen.extraGroups = [
+            "family"
+          ];
         }
       ]);
     groups = lib.mkMerge (lib.flip map groups (group: {
diff --git a/nix/devshell.nix b/nix/devshell.nix
index 42b276a..865712c 100644
--- a/nix/devshell.nix
+++ b/nix/devshell.nix
@@ -1,6 +1,5 @@
 {
   self,
-  nixpkgs,
   devshell,
   agenix-rekey,
   ...
@@ -69,10 +68,6 @@ in
     env = [
       {
         name = "NIX_CONFIG";
-        # Nix plugins braucht nix version 2.16
-        # Nixpkgs hat aber aktuell 2.15 also main version
-        # Daher der folgenda hack um zu verhindern das mein NixOS mit einer anderen nix version gebaut wird
-        # als der intendeten
         value = ''
           plugin-files = ${pkgs.nix-plugins}/lib/nix/plugins
           extra-builtins-file = ${../nix}/extra-builtins.nix
diff --git a/users/common/graphical/default.nix b/users/common/graphical/default.nix
index 2e72ae4..73c69d6 100644
--- a/users/common/graphical/default.nix
+++ b/users/common/graphical/default.nix
@@ -11,7 +11,7 @@
   home = {
     packages = with pkgs; [
       zathura
-      pinentry
+      pinentry-gnome
       feh
       mpv
     ];
diff --git a/users/common/programs/obs.nix b/users/common/programs/obs.nix
index 5003945..df29f54 100644
--- a/users/common/programs/obs.nix
+++ b/users/common/programs/obs.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   programs.obs-studio = {
-    enable = false;
+    enable = true;
     plugins = with pkgs.obs-studio-plugins; [
       obs-backgroundremoval
       obs-pipewire-audio-capture