From d5297c68f9673323ab548dcdce6aa068046f8950 Mon Sep 17 00:00:00 2001
From: Emmet <emmet@librephoenix.com>
Date: Mon, 24 Jun 2024 09:38:05 -0500
Subject: [PATCH] Fixes for nix-on-droid profile

---
 flake.nix                               | 13 +++++++++++--
 profiles/nix-on-droid/configuration.nix | 11 ++++++++++-
 profiles/nix-on-droid/home.nix          |  5 -----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0ffed1e..73817bc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -153,8 +153,17 @@
         };
       };
       nixOnDroidConfigurations = {
-        default = nix-on-droid.lib.nixOnDroidConfiguration {
-          modules = [ ./nix-on-droid.nix ];
+        inherit pkgs;
+        default = inputs.nix-on-droid.lib.nixOnDroidConfiguration {
+          modules = [ ./profiles/nix-on-droid/configuration.nix ];
+        };
+        extraSpecialArgs = {
+          # pass config variables from above
+          inherit pkgs-stable;
+          inherit pkgs-emacs;
+          inherit systemSettings;
+          inherit userSettings;
+          inherit inputs;
         };
       };
 
diff --git a/profiles/nix-on-droid/configuration.nix b/profiles/nix-on-droid/configuration.nix
index d8f9d2d..9ca3597 100644
--- a/profiles/nix-on-droid/configuration.nix
+++ b/profiles/nix-on-droid/configuration.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, pkgs-stable, pkgs-emacs, systemSettings, userSettings, inputs, ... }:
 
 {
   # Simply install just the packages
@@ -47,5 +47,14 @@
     useGlobalPkgs = true;
 
     config = ./home.nix;
+
+    extraSpecialArgs = {
+      # pass config variables from above
+      inherit pkgs-stable;
+      inherit pkgs-emacs;
+      inherit systemSettings;
+      inherit userSettings;
+      inherit inputs;
+    };
   };
 }
diff --git a/profiles/nix-on-droid/home.nix b/profiles/nix-on-droid/home.nix
index 1727d9f..65aea7a 100644
--- a/profiles/nix-on-droid/home.nix
+++ b/profiles/nix-on-droid/home.nix
@@ -1,11 +1,6 @@
 { config, pkgs, userSettings, ... }:
 
 {
-  # Home Manager needs a bit of information about you and the paths it should
-  # manage.
-  home.username = userSettings.username;
-  home.homeDirectory = "/data/data/com.termux.nix/files/home";
-
   programs.home-manager.enable = true;
 
   imports = [