Move nix-on-droid stateVersion into host-specific definitions

rake5k · Oct 15, 2023 · db77236 · db77236
1 parent bea32b8
commit db77236
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/hosts/nix-on-droid/default.nix 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
@@ -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
@@ -0,0 +1 @@
+"23.05"
diff --git 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
@@ -22,9 +22,6 @@
 
   nix.package = pkgs.nix;
 
-  # FIXME: update when released
-  system.stateVersion = "22.11";
-
   terminal.font =
     let
       fontPackage = pkgs.nerdfonts.override {