From 93252ea70dc2d64f55808d5a56a713239ba77e10 Mon Sep 17 00:00:00 2001
From: DerGrumpf <phil.keier@hotmail.com>
Date: Tue, 21 Apr 2026 22:44:02 +0200
Subject: [PATCH] Fixed SMB share and enabled encrypt

---
 hosts/cyper-controller/smb.nix                |  1 +
 .../cyper-desktop/hardware-configuration.nix  | 25 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/hosts/cyper-controller/smb.nix b/hosts/cyper-controller/smb.nix
index b802aee..71ab463 100644
--- a/hosts/cyper-controller/smb.nix
+++ b/hosts/cyper-controller/smb.nix
@@ -22,6 +22,7 @@
         "map to guest" = "Never";
         "invalid users" = [ "root" ];
         "socket options" = "TCP_NODELAY IPTOS_LOWDELAY";
+        "smb encrypt" = "required";
         "use sendfile" = "yes";
         "log level" = "1";
         "log file" = "/var/log/samba/log.%m";
diff --git a/hosts/cyper-desktop/hardware-configuration.nix b/hosts/cyper-desktop/hardware-configuration.nix
index a5db559..a69f267 100644
--- a/hosts/cyper-desktop/hardware-configuration.nix
+++ b/hosts/cyper-desktop/hardware-configuration.nix
@@ -69,28 +69,35 @@
       (share: {
         name = "/shares/${share}";
         value = {
-          device = "//127.0.0.1/${share}";
+          device = "//192.168.2.2/${share}";
           fsType = "cifs";
           options = [
             "credentials=${config.sops.templates.smb_credentials.path}"
             "iocharset=utf8"
             "_netdev"
-            "auto"
             "nofail"
-            "x-systemd.requires=samba-smbd.service"
-            "x-systemd.after=samba-smbd.service"
-            "x-systemd.requires=sops-install-secrets.service"
-            "x-systemd.after=sops-install-secrets.service"
+            "uid=${toString config.users.users.${primaryUser}.uid}"
+            "gid=${toString config.users.users.${primaryUser}.group}"
+            "file_mode=0664"
+            "dir_mode=0775"
+            "x-systemd.automount"
+            "x-systemd.idle-timeout=60"
           ];
         };
       })
       [
-        "internal"
-        "fast"
-        "backup"
+        "storage-internal"
+        "storage-fast"
+        "storage-backup"
       ]
   );
 
+  systemd.tmpfiles.rules = [
+    "d /shares/storage-internal 0775 ${primaryUser} users -"
+    "d /shares/storage-fast 0775 ${primaryUser} users -"
+    "d /shares/storage-backup 0775 ${primaryUser} users -"
+  ];
+
   swapDevices = [ ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";