From 98812731b65b9f3ff6b24196307e79cac45c4758 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 6 Mar 2019 15:57:20 +0100
Subject: [PATCH] nix/devices/graphical: re-enable adb for steveej

---
 nix/home-manager/configuration/graphical-fullblown.nix | 4 +---
 nix/os/lib/default.nix                                 | 1 +
 nix/os/profiles/graphical/system.nix                   | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix
index f3f13b1..3498b45 100644
--- a/nix/home-manager/configuration/graphical-fullblown.nix
+++ b/nix/home-manager/configuration/graphical-fullblown.nix
@@ -27,8 +27,6 @@ in {
       gnutls = true;
     };
 
-    android_sdk.accept_license = true;
-
     packageOverrides = pkgs: with pkgs; {
       myPython36 = python36Full.withPackages (ps: with ps; [
         pep8 yapf flake8
@@ -324,7 +322,7 @@ in {
       bazel
 
       ## Android
-      # 2019-03-05: missing on 19.03 androidsdk
+      androidenv.androidPkgs_9_0.platform-tools
 
       ## Java
       # jre
diff --git a/nix/os/lib/default.nix b/nix/os/lib/default.nix
index 48aeb39..566ccb9 100644
--- a/nix/os/lib/default.nix
+++ b/nix/os/lib/default.nix
@@ -22,6 +22,7 @@
       "audio"
       "video"
       "cdrom"
+      "adbusers"
     ];
     openssh.authorizedKeys.keys = keys.users.steveej.openssh;
   } // args;
diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix
index 5a23113..ee322df 100644
--- a/nix/os/profiles/graphical/system.nix
+++ b/nix/os/profiles/graphical/system.nix
@@ -91,6 +91,7 @@
   services.udev.packages = [
     pkgs.libu2f-host
     pkgs.yubikey-personalization
+    pkgs.android-udev-rules
   ];
   services.udev.extraRules = ''
     # OnePlusOne