From 6d50920a4c3588be71acc4960d9949e0e59795f8 Mon Sep 17 00:00:00 2001
From: Evan Stoll <evanjsx@gmail.com>
Date: Mon, 22 Jun 2020 12:39:21 -0400
Subject: [PATCH] Migrate android module to new-modules format

- Update usages of android module to use new-modules format
---
 config/machines/rig/default.nix      |  2 +-
 config/machines/wdesk/default.nix    |  3 ++-
 config/machines/work/default.nix     |  1 -
 config/machines/work/default.nix.bak |  1 -
 modules/android.nix                  | 13 -------------
 5 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 modules/android.nix

diff --git a/config/machines/rig/default.nix b/config/machines/rig/default.nix
index 500a25187..18a9820b7 100644
--- a/config/machines/rig/default.nix
+++ b/config/machines/rig/default.nix
@@ -9,7 +9,6 @@ in
 
     ../../../config
 
-    ../../../modules/android.nix
     ../../../modules/development.nix
 
     # media
@@ -39,6 +38,7 @@ in
   };
 
   nix.distributedBuilds = true;
+  mine.android.enable = true;
   mine.enableUser = true;
   mine.profiles.desktop.enable = true;
   mine.gaming.enable = true;
diff --git a/config/machines/wdesk/default.nix b/config/machines/wdesk/default.nix
index 19743a011..fbcea02d3 100644
--- a/config/machines/wdesk/default.nix
+++ b/config/machines/wdesk/default.nix
@@ -8,7 +8,6 @@
     
     ../../../modules/development.nix
 
-    ../../../modules/android.nix
     ../../../modules/db/postgresql.nix
     ../../../modules/samba/client/work.nix
   ];
@@ -29,6 +28,8 @@
   mine.enableUser = true;
   mine.profiles.desktop.enable = true;
 
+  mind.android.enable = true;
+
   # enable after rocm packages are locked to stable channel
   mine.rocm.enable = false;
 
diff --git a/config/machines/work/default.nix b/config/machines/work/default.nix
index 66469044c..63f609a25 100644
--- a/config/machines/work/default.nix
+++ b/config/machines/work/default.nix
@@ -9,7 +9,6 @@
     
     ../../../modules/development.nix
 
-    ../../../modules/android.nix
     ../../../modules/db/postgresql.nix
     ../../../modules/samba/client/work.nix
   ];
diff --git a/config/machines/work/default.nix.bak b/config/machines/work/default.nix.bak
index bfec042c9..a950771c1 100644
--- a/config/machines/work/default.nix.bak
+++ b/config/machines/work/default.nix.bak
@@ -5,7 +5,6 @@
     ../../new-modules/profiles/desktop.nix
     ./custom-hardware.nix
 
-    ../../../modules/android.nix
     ../../../modules/db/postgresql.nix
     ../../../modules/development.nix
     ../../../modules/linux_latest.nix
diff --git a/modules/android.nix b/modules/android.nix
deleted file mode 100644
index 96f3e8568..000000000
--- a/modules/android.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, pkgs, ... }:
-{
-  nixpkgs.config = {
-    android_sdk.accept_license = true;
-  };
-
-  programs.adb.enable = true;
-
-  environment.systemPackages = with pkgs; [
-    androidStudioPackages.stable
-    androidStudioPackages.beta
-  ];
-}