diff --git a/hosts/default.nix b/hosts/default.nix
index cf2246b..79175b0 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -127,9 +127,13 @@ rec {
 
   # https://github.com/nix-community/nix-on-droid
   nixOnDroidConfigurations = {
-    zenfone = input-views.inputs-edge.nix-on-droid-edge.lib.nixOnDroidConfiguration {
+    default = input-views.inputs-edge.nix-on-droid-edge.lib.nixOnDroidConfiguration {
       pkgs = import input-views.inputs-edge.nixpkgs-edge { system = "aarch64-linux"; };
-      modules = [ ./nix-on-droid/zenfone/droid-configuration.nix ];
+      modules = [ ./nix-on-droid/default/droid-configuration.nix ];
+    };
+    test = input-views.inputs-edge.nix-on-droid-edge.lib.nixOnDroidConfiguration {
+      pkgs = import input-views.inputs-edge.nixpkgs-edge { system = "x86_64-linux"; };
+      modules = [ ./nix-on-droid/default/droid-configuration.nix ];
     };
   };
 
diff --git a/hosts/nix-on-droid/default/droid-configuration.nix b/hosts/nix-on-droid/default/droid-configuration.nix
new file mode 100644
index 0000000..90ecb9c
--- /dev/null
+++ b/hosts/nix-on-droid/default/droid-configuration.nix
@@ -0,0 +1,34 @@
+{ pkgs, ... }:
+
+{
+  system.stateVersion = "24.05";
+
+  environment.packages = [
+    pkgs.micro
+    pkgs.git
+    pkgs.openssh
+
+    pkgs.hostname
+    pkgs.gnugrep
+    pkgs.findutils
+    pkgs.fd
+    pkgs.sd
+    pkgs.xe
+    pkgs.gnupg
+    pkgs.gnused
+  ];
+
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+
+  # Backup etc files instead of failing to activate generation if a file already exists in /etc
+  # environment.etcBackupExtension = ".bak";
+
+  # # Configure home-manager
+  # home-manager = {
+  #   config = ./home.nix;
+  #   backupFileExtension = "hm-bak";
+  #   useGlobalPkgs = true;
+  # };
+}
diff --git a/hosts/nix-on-droid/zenfone/droid-configuration.nix b/hosts/nix-on-droid/zenfone/droid-configuration.nix
deleted file mode 100644
index 120cbec..0000000
--- a/hosts/nix-on-droid/zenfone/droid-configuration.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.packages = [
-    pkgs.micro
-    pkgs.git
-    pkgs.openssh
-  ];
-  system.stateVersion = "24.05";
-}