From 88f082f1c00f3864368f7bab8719d20bbb0b3467 Mon Sep 17 00:00:00 2001
From: alexion <contact@alexion.dev>
Date: Wed, 9 Sep 2026 21:32:16 -0400
Subject: [PATCH] fix(nixos): run Valheim with storage group

---
 configs/nixos/hosts/pikachu/default.nix     | 12 ++----------
 configs/nixos/modules/services/steamcmd.nix |  7 ++++---
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/configs/nixos/hosts/pikachu/default.nix b/configs/nixos/hosts/pikachu/default.nix
index 3a254e4..ef3d6ba 100644
--- a/configs/nixos/hosts/pikachu/default.nix
+++ b/configs/nixos/hosts/pikachu/default.nix
@@ -7,15 +7,6 @@
 # pikachu — AZW ME Pro server.
 # Disk layout is in ./disk.nix.
 # `fileSystems` for the root disk are derived from it.
-let
-  valheimSteamRun = pkgs.steam-run.override {
-    extraBwrapArgs = [
-      "--bind"
-      "/pikachu"
-      "/pikachu"
-    ];
-  };
-in
 {
   imports = [
     ./hardware-configuration.nix
@@ -83,8 +74,9 @@ in
       appId = 896660;
       installDir = "/pikachu/data/servers/valheim/main";
       workingDirectory = "/pikachu/data/servers/valheim/main";
+      group = "storage";
       dataDirs = [ "/pikachu/media/games/servers/valheim/main" ];
-      packages = [ valheimSteamRun ];
+      packages = [ pkgs.steam-run ];
       environment = {
         SteamAppId = "892970";
         SERVER_PASSWORD = "foobarbaz";
diff --git a/configs/nixos/modules/services/steamcmd.nix b/configs/nixos/modules/services/steamcmd.nix
index 3f17288..355f554 100644
--- a/configs/nixos/modules/services/steamcmd.nix
+++ b/configs/nixos/modules/services/steamcmd.nix
@@ -245,9 +245,10 @@ in
         ]
         ++ lib.flatten (
           lib.mapAttrsToList (_: app: [
-            "d ${app.installDir} 0770 ${cfg.user} ${cfg.group} - -"
-            "z ${app.installDir} 0770 ${cfg.user} ${cfg.group} - -"
-          ]) enabledApps
+            "d ${app.installDir} 0770 ${app.user} ${app.group} - -"
+            "z ${app.installDir} 0770 ${app.user} ${app.group} - -"
+          ] ++ map (dataDir: "d ${dataDir} 0770 ${app.user} ${app.group} - -") app.dataDirs
+            ++ map (dataDir: "z ${dataDir} 0770 ${app.user} ${app.group} - -") app.dataDirs) enabledApps
         );
 
       systemd.services = lib.mkMerge (