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
+    self.nixosModules.base-droid
-    ../../common/modules/global.nix
+    {
-    ../../common/packages.nix
+      roles.base = {
+        enable = true;
+        user = "nix-on-droid";
+      };
+    }
 
     self.nixosModules.tmux
     {programs.tmux.enableCustomConf = true;}

nixosModules/base/default-droid.nix

@@ -0,0 +1,22 @@
+self: {lib, ...}: let
+  inherit (lib) mkOption types;
+in {
+  imports = [
+    (import ./common-nix self)
+    (import ./packages self)
+  ];
+
+  options.roles.base = {
+    enable = mkOption {
+      type = types.bool;
+      default = true;
+    };
+
+    user = mkOption {
+      type = types.str;
+    };
+  };
+
+  # For accurate stack trace
+  _file = ./default.nix;
+}

nixosModules/base/default.nix

@@ -33,7 +33,7 @@ in {
     };
   };
 
-  config = mkIf (cfg.enable) {
+  config = mkIf cfg.enable {
     environment.variables.FLAKE = mkDefault "/home/${cfg.user}/.nix";
 
     programs.tmux.enableCustomConf = true;

nixosModules/base/locale/default.nix

@@ -1,4 +1,14 @@
-{pkgs, ...}: {
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) attrValues mkIf;
+
+  cfg = config.roles.base;
+in
+  mkIf cfg.enable {
     fonts = {
       fontconfig = {
         enable = true;
@@ -24,7 +34,7 @@
             ];
           })
         ]
-      ++ (builtins.attrValues {
+        ++ (attrValues {
           inherit
             (pkgs)
             noto-fonts
@@ -42,4 +52,4 @@
     # Select internationalisation properties.
     i18n.defaultLocale = "en_CA.UTF-8";
     console.useXkbConfig = true;
-}
+  }

nixosModules/base/locate/default.nix

@@ -4,7 +4,7 @@
   lib,
   ...
 }: let
-  inherit (lib) concatStringsSep getName;
+  inherit (lib) concatStringsSep getName mkIf;
 
   baseCfg = config.roles.base;
   cfg = config.services.locate;
@@ -23,7 +23,8 @@
     ${updatedb} -o ${database} --prunefs "${pruneFS}" \
       --prunepaths "${prunePaths}" --prunenames "${pruneNames}"
   '';
-in {
+in
+  mkIf (baseCfg.enable) {
     users.users.${baseCfg.user}.extraGroups = [
       locateGroup
     ];
@@ -78,4 +79,4 @@ in {
         ".svn"
       ];
     };
-}
+  }

nixosModules/base/substituters/default.nix

@@ -4,7 +4,9 @@
   pkgs,
   ...
 }: let
-  inherit (lib) foldl isList mergeAttrsWithFunc optionals unique;
+  inherit (lib) foldl isList mergeAttrsWithFunc mkIf optionals unique;
+
+  cfg = config.roles.base;
 
   mergeAttrsList = list:
     foldl (mergeAttrsWithFunc (a: b:
@@ -12,7 +14,8 @@
       then unique (a ++ b)
       else b)) {}
     list;
-in {
+in
+  mkIf cfg.enable {
     environment.systemPackages = [
       (pkgs.writeShellApplication {
         name = "rebuild-no-cache";
@@ -43,4 +46,4 @@ in {
             (mkSubstituterConf "https://cache.nelim.org" "cache.nelim.org:JmFqkUdH11EA9EZOFAGVHuRYp7EbsdJDHvTQzG2pPyY=")
           ]);
     };
-}
+  }

nixosModules/default.nix

@@ -1,5 +1,6 @@
 self: {
   base = import ./base self;
+  base-droid = import ./base/default-droid.nix self;
   borgbackup = import ./borgbackup;
   desktop = import ./desktop self;
   docker = import ./docker self.inputs.khepri;