From 04a27c8e475c084b7dc94b00f57d7fd77201ee57 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Sat, 11 Oct 2025 13:42:54 +0900
Subject: [PATCH] hst: use plausible overlay template

The current value is copied from a test case, and does not resemble its intended use case.

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 cmd/hakurei/print_test.go | 22 +++++++++++-----------
 hst/config.go             |  4 ++--
 hst/hst.go                |  6 +++---
 hst/hst_test.go           |  6 +++---
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go
index dcdc0d0..8189cfc 100644
--- a/cmd/hakurei/print_test.go
+++ b/cmd/hakurei/print_test.go
@@ -49,7 +49,7 @@ Filesystem
  autoroot:w:/var/lib/hakurei/base/org.debian
  autoetc:/etc/
  w+ephemeral(-rwxr-xr-x):/tmp/
- w*/nix/store:/mnt-root/nix/.rw-store/upper:/mnt-root/nix/.rw-store/work:/mnt-root/nix/.ro-store
+ w*/nix/store:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work:/var/lib/hakurei/base/org.nixos/ro-store
  */nix/store
  /run/current-system@
  /run/opengl-driver@
@@ -130,7 +130,7 @@ Filesystem
  autoroot:w:/var/lib/hakurei/base/org.debian
  autoetc:/etc/
  w+ephemeral(-rwxr-xr-x):/tmp/
- w*/nix/store:/mnt-root/nix/.rw-store/upper:/mnt-root/nix/.rw-store/work:/mnt-root/nix/.ro-store
+ w*/nix/store:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper:/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work:/var/lib/hakurei/base/org.nixos/ro-store
  */nix/store
  /run/current-system@
  /run/opengl-driver@
@@ -290,10 +290,10 @@ App
           "type": "overlay",
           "dst": "/nix/store",
           "lower": [
-            "/mnt-root/nix/.ro-store"
+            "/var/lib/hakurei/base/org.nixos/ro-store"
           ],
-          "upper": "/mnt-root/nix/.rw-store/upper",
-          "work": "/mnt-root/nix/.rw-store/work"
+          "upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper",
+          "work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work"
         },
         {
           "type": "bind",
@@ -444,10 +444,10 @@ App
         "type": "overlay",
         "dst": "/nix/store",
         "lower": [
-          "/mnt-root/nix/.ro-store"
+          "/var/lib/hakurei/base/org.nixos/ro-store"
         ],
-        "upper": "/mnt-root/nix/.rw-store/upper",
-        "work": "/mnt-root/nix/.rw-store/work"
+        "upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper",
+        "work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work"
       },
       {
         "type": "bind",
@@ -654,10 +654,10 @@ func TestPrintPs(t *testing.T) {
             "type": "overlay",
             "dst": "/nix/store",
             "lower": [
-              "/mnt-root/nix/.ro-store"
+              "/var/lib/hakurei/base/org.nixos/ro-store"
             ],
-            "upper": "/mnt-root/nix/.rw-store/upper",
-            "work": "/mnt-root/nix/.rw-store/work"
+            "upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper",
+            "work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work"
           },
           {
             "type": "bind",
diff --git a/hst/config.go b/hst/config.go
index a0843ae..9d0ef67 100644
--- a/hst/config.go
+++ b/hst/config.go
@@ -57,11 +57,11 @@ type (
 		// Init user namespace supplementary groups inherited by all container processes.
 		Groups []string `json:"groups"`
 
-		// High level configuration applied to the underlying [container.Params].
+		// High level configuration applied to the underlying [container].
 		Container *ContainerConfig `json:"container"`
 	}
 
-	// ContainerConfig describes the container configuration to be applied to an underlying [container.Params].
+	// ContainerConfig describes the container configuration to be applied to an underlying [container].
 	ContainerConfig struct {
 		// Container UTS namespace hostname.
 		Hostname string `json:"hostname,omitempty"`
diff --git a/hst/hst.go b/hst/hst.go
index fa94956..575869e 100644
--- a/hst/hst.go
+++ b/hst/hst.go
@@ -117,9 +117,9 @@ func Template() *Config {
 				{&FSEphemeral{Target: fhs.AbsTmp, Write: true, Perm: 0755}},
 				{&FSOverlay{
 					Target: check.MustAbs("/nix/store"),
-					Lower:  []*check.Absolute{check.MustAbs("/mnt-root/nix/.ro-store")},
-					Upper:  check.MustAbs("/mnt-root/nix/.rw-store/upper"),
-					Work:   check.MustAbs("/mnt-root/nix/.rw-store/work"),
+					Lower:  []*check.Absolute{fhs.AbsVarLib.Append("hakurei/base/org.nixos/ro-store")},
+					Upper:  fhs.AbsVarLib.Append("hakurei/nix/u0/org.chromium.Chromium/rw-store/upper"),
+					Work:   fhs.AbsVarLib.Append("hakurei/nix/u0/org.chromium.Chromium/rw-store/work"),
 				}},
 				{&FSBind{Source: check.MustAbs("/nix/store")}},
 				{&FSLink{Target: fhs.AbsRun.Append("current-system"), Linkname: "/run/current-system", Dereference: true}},
diff --git a/hst/hst_test.go b/hst/hst_test.go
index 0bd6c2b..301704b 100644
--- a/hst/hst_test.go
+++ b/hst/hst_test.go
@@ -193,10 +193,10 @@ func TestTemplate(t *testing.T) {
 				"type": "overlay",
 				"dst": "/nix/store",
 				"lower": [
-					"/mnt-root/nix/.ro-store"
+					"/var/lib/hakurei/base/org.nixos/ro-store"
 				],
-				"upper": "/mnt-root/nix/.rw-store/upper",
-				"work": "/mnt-root/nix/.rw-store/work"
+				"upper": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/upper",
+				"work": "/var/lib/hakurei/nix/u0/org.chromium.Chromium/rw-store/work"
 			},
 			{
 				"type": "bind",