Reorganize imports

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/common/configs/user/console/android/default.nix

@@ -0,0 +1,26 @@
+{
+  user ? throw "user argument is required",
+  home ? throw "home argument is required",
+}:
+{ config, pkgs, ... }:
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      android-tools = prev.android-tools.overrideAttrs (oldAttrs: {
+        patches = oldAttrs.patches or [ ] ++ [ ./env-var-user-home.patch ];
+      });
+    })
+  ];
+
+  programs.adb.enable = true;
+  services.gvfs.enable = true;
+
+  users.users.${user}.extraGroups = [ "adbusers" ];
+
+  environment.persistence."/persist" = {
+    "${home}/.local/share/android/adbkey" = { };
+    "${home}/.local/share/android/adbkey.pub" = { };
+  };
+
+  home-manager.users.${user}.home.sessionVariables.ANDROID_USER_HOME = "${home}/.local/share/android";
+}

hosts/common/configs/user/console/android/env-var-user-home.patch

@@ -0,0 +1,21 @@
+--- a/vendor/adb/adb_utils.cpp
++++ b/vendor/adb/adb_utils.cpp
+@@ -308,8 +308,16 @@
+ }
+
+ std::string adb_get_android_dir_path() {
+-    std::string user_dir = adb_get_homedir_path();
+-    std::string android_dir = user_dir + OS_PATH_SEPARATOR + ".android";
++    const char* android_user_home = getenv("ANDROID_USER_HOME");
++    std::string android_dir;
++
++    if (android_user_home) {
++        android_dir = std::string(android_user_home);
++    } else {
++        std::string user_dir = adb_get_homedir_path();
++        android_dir = user_dir + OS_PATH_SEPARATOR + ".android";
++    }
++
+     struct stat buf;
+     if (stat(android_dir.c_str(), &buf) == -1) {
+         if (adb_mkdir(android_dir, 0750) == -1) {