From abf8178c13045e6b076af28960d4a6d3499cbb28 Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <alukard.develop@gmail.com>
Date: Tue, 28 Sep 2021 01:39:21 +0300
Subject: [PATCH] update samba settings

---
 profiles/filesystems.nix  |  6 +++---
 profiles/samba.nix        | 13 +++++++------
 profiles/sound/mopidy.nix |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/profiles/filesystems.nix b/profiles/filesystems.nix
index 23b9e8d..3ac13a3 100644
--- a/profiles/filesystems.nix
+++ b/profiles/filesystems.nix
@@ -20,7 +20,7 @@ with deviceSpecific;
         "dmode=0755"
         "fmode=0644"
         "uid=${toString config.users.users.alukard.uid}"
-        "gid=${toString config.users.groups.smbgrp.gid}"
+        "gid=${toString config.users.groups.smbuser.gid}"
       ];
     };
     "/media/data" = if (device == "AMD-Workstation") then {
@@ -31,7 +31,7 @@ with deviceSpecific;
         # "noatime"
         "nofail"
         "uid=${toString config.users.users.alukard.uid}"
-        "gid=${toString config.users.groups.smbgrp.gid}"
+        "gid=${toString config.users.groups.smbuser.gid}"
       ];
     } else {
       # Linux samba
@@ -57,7 +57,7 @@ with deviceSpecific;
         # "noatime"
         "nofail"
         "uid=${toString config.users.users.alukard.uid}"
-        "gid=${toString config.users.groups.smbgrp.gid}"
+        "gid=${toString config.users.groups.smbuser.gid}"
       ];
     } else {
       # Linux samba
diff --git a/profiles/samba.nix b/profiles/samba.nix
index 74f50a7..e709410 100644
--- a/profiles/samba.nix
+++ b/profiles/samba.nix
@@ -1,15 +1,16 @@
 { config, lib, pkgs, ... }:
 
 with config.deviceSpecific; {
-  users.groups.smbgrp.gid = 2001;
+  users.groups.smbuser.gid = 2001;
   # TODO: add nologin shell to this user
   users.users.smbuser =
   lib.mkIf isHost {
     # isNormalUser = false;
     isSystemUser = true;
-    extraGroups = [
-      "smbgrp"
-    ];
+    group = "smbuser";
+    # extraGroups = [
+    #   "smbuser"
+    # ];
     description = "User for samba sharing";
   };
   services.samba =
@@ -34,7 +35,7 @@ with config.deviceSpecific; {
       read only = no
       force create mode = 0660
       force directory mode = 2770
-      valid users = @smbgrp
+      valid users = @smbuser
 
       [files]
       path = /media/files
@@ -42,7 +43,7 @@ with config.deviceSpecific; {
       read only = no
       force create mode = 0660
       force directory mode = 2770
-      valid users = @smbgrp
+      valid users = @smbuser
     '';
   };
   environment.systemPackages = [
diff --git a/profiles/sound/mopidy.nix b/profiles/sound/mopidy.nix
index 6ef63ef..804ec81 100644
--- a/profiles/sound/mopidy.nix
+++ b/profiles/sound/mopidy.nix
@@ -25,7 +25,7 @@
   # users.users.mopidy = {
   #   isNormalUser = false;
   #   extraGroups = [
-  #     "smbgrp"
+  #     "smbuser"
   #   ];
   # };
   # services.mopidy = {