os/common.nix

@@ -27,9 +27,6 @@
     kexec-tools
     openvpn
 
-    # android tools
-    android-udev-rules
-
     # Needed for all the fetchFromGit in this repo on nixos-rebuild
     git
   ];
@@ -37,6 +34,7 @@
   nixpkgs.config.allowUnfree = true;
 
   programs = {
+    adb.enable = true;
     # Enable compilation cache
     ccache.enable = true;
     # TODO Not enough, see https://nixos.wiki/wiki/CCache.

os/geoffrey.nix

@@ -6,7 +6,7 @@
 
   users.users.geoffrey = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [ "adbusers" "wheel" ];
     shell = pkgs.zsh;
 
     initialHashedPassword = "$y$j9T$e64bjL7iyVlniEKwKbM9g0$cCn74za0r6L9QMO20Fdxz3/SX0yvhz3Xd6.2BhtbRL1"; # Not a real password