From 0a36bfc2033d7ffe7397056ee58e20bd022bb12f Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Mon, 4 Dec 2023 12:20:48 +0100
Subject: [PATCH] Fix smb cifs mount permissions & update flake deps

---
 flake.lock                      | 24 +++++++++---------
 systems/nixos-pulse/default.nix | 43 ++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/flake.lock b/flake.lock
index 43d2e6b..20373f6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -69,11 +69,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701334333,
-        "narHash": "sha256-rsJ11xznoc2JSmM57bstxyas8xq8ZaEqNhQuQWyoQ/A=",
+        "lastModified": 1701680013,
+        "narHash": "sha256-H8uAiSr//UhEdTTRDJwP6LCTq7d1sXF1IKpe8GDW3PA=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "913e44a13636fd111139ee683a6741ccb4c28672",
+        "rev": "1ff5471880b6e48f63ec5fa668486ab1268c2b22",
         "type": "github"
       },
       "original": {
@@ -318,11 +318,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1701432845,
-        "narHash": "sha256-06sd2rQ+DPMSueh+hW4MiXbpMSdhQHJOi/sw0vuwqvs=",
+        "lastModified": 1701626906,
+        "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "77da99a144cd341408308e0a37622f5edcc6c5ba",
+        "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361",
         "type": "github"
       },
       "original": {
@@ -334,11 +334,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1701389149,
-        "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
+        "lastModified": 1701539137,
+        "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c",
+        "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
         "type": "github"
       },
       "original": {
@@ -350,11 +350,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1701623572,
-        "narHash": "sha256-NBxGAGL+NqUON+2g9SjPJzcBIgov0gCM8WT8mZM83Xg=",
+        "lastModified": 1701679481,
+        "narHash": "sha256-mwcnWs3hi6t2yf1xDAvQyN4p94B2AIK5tkXqgPm8/vk=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "805f936f3ce5589d53c2a2c5eeab4019a233e10d",
+        "rev": "946611806d877569dbcee22f39a92a59a137c7b1",
         "type": "github"
       },
       "original": {
diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix
index 264b7a9..c6e431b 100644
--- a/systems/nixos-pulse/default.nix
+++ b/systems/nixos-pulse/default.nix
@@ -97,28 +97,27 @@
     };
   };
 
-  fileSystems."/mnt/ServerF" = {
-    # device = "//srv-nas-01.local/Server_F";
-    device = "//192.168.0.1/Server_F";
-    fsType = "cifs";
-    options =
-      let
-        # this line prevents hanging on network split
-        automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-      in
-      [ "${automount_opts},vers=2.0,credentials=/home/tristand/.smb-secrets" ];
-  };
-  fileSystems."/mnt/Scans" = {
-    # device = "//srv-nas-01.local/Server_F";
-    device = "//192.168.0.1/Scans";
-    fsType = "cifs";
-    options =
-      let
-        # this line prevents hanging on network split
-        automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
-      in
-      [ "${automount_opts},vers=2.0,credentials=/home/tristand/.smb-secrets" ];
-  };
+  fileSystems =
+    let
+      automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
+      perm_opts = "uid=1000,gid=100";
+      cifs_opts = "vers=2.0,credentials=/home/tristand/.smb-secrets";
+      mount_opts = "${automount_opts},${perm_opts},${cifs_opts}";
+    in
+    {
+      "/mnt/ServerF" = {
+        # device = "//srv-nas-01.local/Server_F";
+        device = "//192.168.0.1/Server_F";
+        fsType = "cifs";
+        options = [ mount_opts ];
+      };
+      "/mnt/Scans" = {
+        # device = "//srv-nas-01.local/Server_F";
+        device = "//192.168.0.1/Scans";
+        fsType = "cifs";
+        options = [ mount_opts ];
+      };
+    };
 
   systemd = {
     services = {