From b3177f21a5a3b7aed35ca0011251e6ff7267414a Mon Sep 17 00:00:00 2001
From: DrymarchonShaun <40149778+DrymarchonShaun@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:34:18 -0800
Subject: [PATCH] feat: add adb / fastboot

---
 hosts/common/optional/android.nix   | 8 ++++++++
 hosts/common/optional/wireshark.nix | 9 +++++++--
 hosts/corais/default.nix            | 1 +
 hosts/natrix/default.nix            | 1 +
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 hosts/common/optional/android.nix

diff --git a/hosts/common/optional/android.nix b/hosts/common/optional/android.nix
new file mode 100644
index 00000000..b3e956d8
--- /dev/null
+++ b/hosts/common/optional/android.nix
@@ -0,0 +1,8 @@
+{ configVars, ... }:
+{
+  users.users.${configVars.username}.extraGroups = [
+    "adbusers"
+  ];
+  programs.adb.enable = true;
+
+}
diff --git a/hosts/common/optional/wireshark.nix b/hosts/common/optional/wireshark.nix
index 7913a693..493577d5 100644
--- a/hosts/common/optional/wireshark.nix
+++ b/hosts/common/optional/wireshark.nix
@@ -1,6 +1,11 @@
-{ lib, pkgs, ... }:
 {
-  users.users.shaun.extraGroups = [
+  lib,
+  configVars,
+  pkgs,
+  ...
+}:
+{
+  users.users.${configVars.username}.extraGroups = [
     "wireshark"
   ];
   programs.wireshark = {
diff --git a/hosts/corais/default.nix b/hosts/corais/default.nix
index a7ae648a..c89d9c0d 100644
--- a/hosts/corais/default.nix
+++ b/hosts/corais/default.nix
@@ -56,6 +56,7 @@ in
       "hosts/common/optional/services/syncthing.nix"
       "hosts/common/optional/services/ydotool.nix"
       "hosts/common/optional/audio.nix" # pipewire and cli controls
+      "hosts/common/optional/android.nix" # sudoless adb / fastboot
       "hosts/common/optional/wireshark.nix"
       "hosts/common/optional/unbound.nix"
       "hosts/common/optional/recording.nix"
diff --git a/hosts/natrix/default.nix b/hosts/natrix/default.nix
index defa2771..292063c9 100644
--- a/hosts/natrix/default.nix
+++ b/hosts/natrix/default.nix
@@ -62,6 +62,7 @@ in
       "hosts/common/optional/services/syncthing.nix"
       "hosts/common/optional/services/ydotool.nix"
       "hosts/common/optional/audio.nix" # pipewire and cli controls
+      "hosts/common/optional/android.nix" # sudoless adb / fastboot
       "hosts/common/optional/wireshark.nix"
       "hosts/common/optional/unbound.nix"
       "hosts/common/optional/distbuild"