From db7723614439bf39a44be543f82e668a393c1dc4 Mon Sep 17 00:00:00 2001
From: Christian Harke <christian@harke.ch>
Date: Sun, 15 Oct 2023 14:20:50 +0200
Subject: [PATCH] Move nix-on-droid stateVersion into host-specific definitions

---
 hosts/nix-on-droid/default.nix           | 5 +++++
 hosts/nix-on-droid/home-nix-on-droid.nix | 2 +-
 hosts/nix-on-droid/state-version.nix     | 1 +
 lib/builders/mkNixOnDroid.nix            | 5 ++++-
 nix-on-droid/default.nix                 | 3 ---
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 hosts/nix-on-droid/default.nix
 create mode 100644 hosts/nix-on-droid/state-version.nix

diff --git a/hosts/nix-on-droid/default.nix b/hosts/nix-on-droid/default.nix
new file mode 100644
index 00000000..314702ea
--- /dev/null
+++ b/hosts/nix-on-droid/default.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  system.stateVersion = import ./state-version.nix;
+}
diff --git a/hosts/nix-on-droid/home-nix-on-droid.nix b/hosts/nix-on-droid/home-nix-on-droid.nix
index d86d25dc..76d1cc42 100644
--- a/hosts/nix-on-droid/home-nix-on-droid.nix
+++ b/hosts/nix-on-droid/home-nix-on-droid.nix
@@ -4,5 +4,5 @@
     mobile.enable = true;
   };
 
-  home.stateVersion = "23.05";
+  home.stateVersion = import ./state-version.nix;
 }
diff --git a/hosts/nix-on-droid/state-version.nix b/hosts/nix-on-droid/state-version.nix
new file mode 100644
index 00000000..861e8611
--- /dev/null
+++ b/hosts/nix-on-droid/state-version.nix
@@ -0,0 +1 @@
+"23.05"
diff --git a/lib/builders/mkNixOnDroid.nix b/lib/builders/mkNixOnDroid.nix
index 75b56a07..8fbf02b4 100644
--- a/lib/builders/mkNixOnDroid.nix
+++ b/lib/builders/mkNixOnDroid.nix
@@ -9,6 +9,8 @@ in
 
 inputs.nix-on-droid.lib.nixOnDroidConfiguration {
   modules = [
+    "${inputs.self}/hosts/${name}"
+
     {
       _file = ./mkNixOnDroid.nix;
 
@@ -24,7 +26,8 @@ inputs.nix-on-droid.lib.nixOnDroidConfiguration {
       config.lib.custom = customLib;
     }
   ]
-  ++ customLib.getRecursiveDefaultNixFileList ../../nix-on-droid;
+  ++ customLib.getRecursiveDefaultNixFileList ../../nix-on-droid
+  ++ customLib.getRecursiveDefaultNixFileList "${inputs.self}/nix-on-droid";
 
   extraSpecialArgs = {
     inherit inputs pkgs homeModules;
diff --git a/nix-on-droid/default.nix b/nix-on-droid/default.nix
index f624e30d..18b21926 100644
--- a/nix-on-droid/default.nix
+++ b/nix-on-droid/default.nix
@@ -22,9 +22,6 @@
 
   nix.package = pkgs.nix;
 
-  # FIXME: update when released
-  system.stateVersion = "22.11";
-
   terminal.font =
     let
       fontPackage = pkgs.nerdfonts.override {