diff --git a/home-manager/common/programs/devel.nix b/home-manager/common/programs/devel.nix
index 2888ab0..dddc263 100644
--- a/home-manager/common/programs/devel.nix
+++ b/home-manager/common/programs/devel.nix
@@ -68,17 +68,6 @@ with lib; with nLib; {
         sccache
       ];
     })
-    # JVM Development
-    (mkIf devel.jvm {
-      home.packages = with unstable; [
-        inputs.java.packages."${pkgs.system}".semeru-stable
-        gradle
-        kotlin
-        kotlin-native
-        kotlin-language-server
-        ktlint
-      ];
-    })
     # Python Development
     (mkIf devel.python {
       home.packages = with pkgs; [
diff --git a/home-manager/linux/default.nix b/home-manager/linux/default.nix
index 21fb462..7e6680d 100644
--- a/home-manager/linux/default.nix
+++ b/home-manager/linux/default.nix
@@ -9,6 +9,7 @@ with lib; with nLib; {
     ../common/programs/core.nix
     ./programs/communications.nix
     ../common/programs/devel.nix
+    ./programs/devel.nix
     ./programs/emacs.nix
     ./programs/image-editing.nix
     ./programs/media.nix
@@ -36,6 +37,9 @@ with lib; with nLib; {
           # Wine support, disabled by default
           wine = mkEnableOption "wine";
         };
+        devel = {
+          jvm = mkDefaultOption "JVM Development Utilites" config.nathan.config.isDesktop;
+        };
         # Swaywm and supoorting application configuration
         swaywm = {
           enable = mkDefaultOption "swaywm" config.nathan.config.isDesktop;
diff --git a/home-manager/linux/programs/devel.nix b/home-manager/linux/programs/devel.nix
new file mode 100644
index 0000000..2ac95ba
--- /dev/null
+++ b/home-manager/linux/programs/devel.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, inputs, ... }:
+let
+  devel = config.nathan.programs.devel;
+  unstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}";
+  inherit (import ../../../modules/lib.nix { inherit lib; inherit pkgs; }) nLib;
+in
+
+with lib; with nLib; {
+  config = mkMerge [
+    # JVM Development
+    (mkIf devel.jvm {
+      home.packages = with unstable; [
+        inputs.java.packages."${pkgs.system}".semeru-stable
+        gradle
+        kotlin
+        kotlin-native
+        kotlin-language-server
+        ktlint
+      ];
+    })
+  ];
+}
diff --git a/home-manager/nix-on-droid/default.nix b/home-manager/nix-on-droid/default.nix
new file mode 100644
index 0000000..d92b259
--- /dev/null
+++ b/home-manager/nix-on-droid/default.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, inputs, ... }:
+let
+  inherit (import ../../modules/lib.nix { inherit lib; inherit pkgs; }) nLib;
+in
+with lib; with nLib; {
+  imports = [
+    ../options.nix
+    ../common/programs/core.nix
+    ../common/programs/devel.nix
+  ];
+
+  options = { };
+
+  config = {
+    home.stateVersion = "22.05";
+    programs.home-manager.enable = true;
+    nathan.programs.emacs.package = lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsNativeComp.override {
+      withNS = false;
+      withX = false;
+      withGTK2 = false;
+      withGTK3 = false;
+    };
+  };
+}
diff --git a/home-manager/options.nix b/home-manager/options.nix
index 0c8a951..5d15def 100644
--- a/home-manager/options.nix
+++ b/home-manager/options.nix
@@ -30,7 +30,6 @@ with lib; with nLib;
         devel = {
           core = mkDefaultOption "Core Development Utilites" config.nathan.config.isDesktop;
           rust = mkDefaultOption "Rust Development Utilites" config.nathan.config.isDesktop;
-          jvm = mkDefaultOption "JVM Development Utilites" config.nathan.config.isDesktop;
           python = mkDefaultOption "Python Development Utilites" config.nathan.config.isDesktop;
           js = mkDefaultOption "JavaScript/TypeScript Development Utilites" config.nathan.config.isDesktop;
           raku = mkDefaultOption "Raku Development Utilites" config.nathan.config.isDesktop;