From 723eacbecd4483640ec73e196049a5f32e908f0c Mon Sep 17 00:00:00 2001
From: Zuckerberg <zuckerberg@neet.dev>
Date: Sat, 2 Dec 2023 17:35:31 -0700
Subject: [PATCH] Revert dynamic user. And restart on failure

---
 server/service.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/server/service.nix b/server/service.nix
index 2cf213b..311efc7 100644
--- a/server/service.nix
+++ b/server/service.nix
@@ -13,11 +13,11 @@ in
         Directory of images that the server will serve
       '';
     };
-    imgDirGroup = lib.mkOption {
+    group = lib.mkOption {
       type = lib.types.str;
+      default = "picture-frame-server";
       description = ''
-        The group the server will run as a member of.
-        So the server can have read access to `imgDir`.
+        The group the server should run as
       '';
     };
     port = lib.mkOption {
@@ -31,16 +31,20 @@ in
 
   config = lib.mkIf cfg.enable {
     nixpkgs.overlays = [ overlay ];
+    users.users.${cfg.user} = {
+      isSystemUser = true;
+      group = cfg.group;
+    };
+    users.groups.${cfg.group} = { };
     systemd.services.picture-frame-server = {
       enable = true;
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.picture-frame.server}/bin/server ${toString cfg.port} ${cfg.imgDir}";
-        DynamicUser = true;
-        PrivateTmp = true;
-        User = "picture-frame-server";
-        SupplementaryGroups = [ cfg.imgDirGroup ];
+        User = cfg.user;
+        Group = cfg.group;
+        Restart = "on-failure";
       };
     };
   };