From c5b4ea0e92b4767f2ceed20087b4be7ce0be4b41 Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 19 Dec 2024 15:57:35 -0500 Subject: [PATCH] Apps: hacky fix for group error --- modules/nixos/apps/recording/default.nix | 5 ----- modules/nixos/users/aires/default.nix | 5 +++-- modules/nixos/users/gremlin/default.nix | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/nixos/apps/recording/default.nix b/modules/nixos/apps/recording/default.nix index 2e54f67..149660e 100644 --- a/modules/nixos/apps/recording/default.nix +++ b/modules/nixos/apps/recording/default.nix @@ -34,11 +34,6 @@ in # For details, see https://github.com/Genymobile/scrcpy/blob/master/doc/v4l2.md programs.adb.enable = true; - users.users = { - aires.extraGroups = lib.mkIf config.${namespace}.users.aires.enable [ "adbusers" ]; - gremlin.extraGroups = lib.mkIf config.${namespace}.users.gremlin.enable [ "adbusers" ]; - }; - # Add a virtual camera to use with Droidcam boot = { extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback.out ]; diff --git a/modules/nixos/users/aires/default.nix b/modules/nixos/users/aires/default.nix index 1109625..5e40ef9 100644 --- a/modules/nixos/users/aires/default.nix +++ b/modules/nixos/users/aires/default.nix @@ -29,10 +29,11 @@ in "input" "networkmanager" "plugdev" - "tss" + "tss" # For access to TPM devices "wheel" "users" - ]; # tss group has access to TPM devices + (lib.mkIf config.programs.adb.enable "adbusers") + ]; # Allow systemd services to run even while aires is logged out linger = true; diff --git a/modules/nixos/users/gremlin/default.nix b/modules/nixos/users/gremlin/default.nix index d0e8d3d..b7bfe09 100644 --- a/modules/nixos/users/gremlin/default.nix +++ b/modules/nixos/users/gremlin/default.nix @@ -29,6 +29,7 @@ in "networkmanager" "input" "users" + (lib.mkIf config.programs.adb.enable "adbusers") ]; # Allow systemd services to keep running even while gremlin is logged out