From 1b4f5090cf317a62c50f22092b94fcc44407c9ef Mon Sep 17 00:00:00 2001
From: soraefir <soraefir+git@pm.me>
Date: Fri, 19 Jan 2024 12:20:21 +0100
Subject: [PATCH] [m] Migrated android to host

---
 modules/home/gui/apps/develop/default.nix | 16 ++--------------
 modules/nixos/tools/default.nix           |  2 +-
 modules/nixos/tools/devel/default.nix     |  4 ----
 modules/nixos/tools/develop/default.nix   | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 modules/nixos/tools/devel/default.nix
 create mode 100644 modules/nixos/tools/develop/default.nix

diff --git a/modules/home/gui/apps/develop/default.nix b/modules/home/gui/apps/develop/default.nix
index 8b31d6e..0a96e96 100644
--- a/modules/home/gui/apps/develop/default.nix
+++ b/modules/home/gui/apps/develop/default.nix
@@ -1,19 +1,7 @@
-{ lib, config, pkgs, ... }:
-let
-  android_env = pkgs.androidenv.composeAndroidPackages {
-    platformVersions = [ "34" ];
-    abiVersions = [ "x86" "x86_64" ];
-    includeEmulator = false;
-  };
-in {
+{ lib, config, pkgs, ... }: {
   imports = [ ./vscodium ];
 
   config = lib.mkIf (config.homecfg.make.develop) {
-    home.packages = with pkgs; [
-      blender
-      godot_4
-      android-tools
-      androidStudioPackages.canary
-    ];
+    home.packages = with pkgs; [ blender godot_4 ];
   };
 }
diff --git a/modules/nixos/tools/default.nix b/modules/nixos/tools/default.nix
index e2024ae..007f34f 100644
--- a/modules/nixos/tools/default.nix
+++ b/modules/nixos/tools/default.nix
@@ -1 +1 @@
-{ ... }: { imports = [ ./debug ./devel ]; }
+{ ... }: { imports = [ ./debug ./develop ]; }
diff --git a/modules/nixos/tools/devel/default.nix b/modules/nixos/tools/devel/default.nix
deleted file mode 100644
index facb35d..0000000
--- a/modules/nixos/tools/devel/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-
-}
diff --git a/modules/nixos/tools/develop/default.nix b/modules/nixos/tools/develop/default.nix
new file mode 100644
index 0000000..256e3e6
--- /dev/null
+++ b/modules/nixos/tools/develop/default.nix
@@ -0,0 +1,17 @@
+{ lib, config, pkgs, ... }:
+let
+  android_env = pkgs.androidenv.composeAndroidPackages {
+    platformVersions = [ "34" ];
+    abiVersions = [ "x86" "x86_64" ];
+    includeEmulator = false;
+  };
+in {
+  imports = [ ./vscodium ];
+
+  config = lib.mkIf (config.homecfg.make.develop) {
+    environment.systemPackages = with pkgs; [
+      android-tools
+      androidStudioPackages.canary
+    ];
+  };
+}