sagittarius: fix storage-box mount permissions (hopefully)

2 files changed, 13 insertions, 8 deletions

diff --git a/hosts/sagittarius/default.nix b/hosts/sagittarius/default.nix
index 9cfb84b..44a72b7 100644
--- a/hosts/sagittarius/default.nix
+++ b/hosts/sagittarius/default.nix
@@ -30,6 +30,7 @@
           "x-systemd.device-timeout=5s"
           "x-systemd.mount-timeout=5s"
           "credentials=${config.sops.secrets.samba-creds.path}"
+          "gid=${toString config.users.groups.storage-box.gid}"
         ];
       in
       # No clue whether doing it like this is neccessary, but the wiki does it
@@ -77,14 +78,17 @@
     enableSSHSupport = true;
   };
 
-  users.users = {
-    ascella = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" ];
-      openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiDCf9LMx9diW5BveEju9w2Xv2kk7qKCyLESLyymzih ihp@ihp-laptop"
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM4aG8NI25TgjcDevjsY/Y6d3iYsQxSEtIpsqprMHmad osiris@underworld"
-      ];
+  users = {
+    groups.storage-box = { };
+    users = {
+      ascella = {
+        isNormalUser = true;
+        extraGroups = [ "wheel" ];
+        openssh.authorizedKeys.keys = [
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiDCf9LMx9diW5BveEju9w2Xv2kk7qKCyLESLyymzih ihp@ihp-laptop"
+          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM4aG8NI25TgjcDevjsY/Y6d3iYsQxSEtIpsqprMHmad osiris@underworld"
+        ];
+      };
     };
   };
 
diff --git a/hosts/sagittarius/web/git.nix b/hosts/sagittarius/web/git.nix
index d3d0044..4a70232 100644
--- a/hosts/sagittarius/web/git.nix
+++ b/hosts/sagittarius/web/git.nix
@@ -16,6 +16,7 @@ in
     };
   };
 
+  users.users.${cfg.user}.extraGroups = [ config.users.groups.storage-box.name ];
   services.forgejo = {
     enable = true;
     package = pkgs.forgejo-lts;