fix(droid): get build to work again

devices/android/default.nix

@@ -3,11 +3,11 @@
   lib,
   pkgs,
   ...
-}: {
+}: let
+  inherit (lib) attrValues concatStringsSep;
+in {
   imports = [./nix-on-droid.nix];
 
-  vars.mainUser = "nix-on-droid";
-
   environment.variables.FLAKE = "/data/data/com.termux.nix/files/home/.nix";
 
   terminal.font = "${(pkgs.nerdfonts.override {
@@ -19,7 +19,8 @@
   environment.packages = [
     (pkgs.writeShellApplication {
       name = "switch";
-      runtimeInputs = builtins.attrValues {
+
+      runtimeInputs = attrValues {
         inherit
           (pkgs)
           coreutils
@@ -27,10 +28,11 @@
           nvd
           ;
       };
+
       text = ''
         oldProfile=$(realpath /nix/var/nix/profiles/per-user/nix-on-droid/profile)
 
-        nix-on-droid ${lib.concatStringsSep " " [
+        nix-on-droid ${concatStringsSep " " [
           "switch"
           "--flake ${config.environment.variables.FLAKE}"
           "--builders ssh-ng://matt@100.64.0.7"

devices/android/nix-on-droid.nix

@@ -1,13 +1,16 @@
-# FIXME: eval is broken
 {
   config,
   self,
   ...
 }: {
   imports = [
-    ../../common/vars
-    ../../common/modules/global.nix
-    ../../common/packages.nix
+    self.nixosModules.base-droid
+    {
+      roles.base = {
+        enable = true;
+        user = "nix-on-droid";
+      };
+    }
 
     self.nixosModules.tmux
     {programs.tmux.enableCustomConf = true;}