From 8874aaf81b6d8028bd4dc3d4a1f09bf16b349085 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 11 Oct 2025 13:59:10 +0900 Subject: [PATCH] hst: remove template bind nix store This does not add anything meaningful to the template, since there are already prior examples showing src-only bind ops. Remove this since it causes confusion by covering the previous mount point targeting /nix/store. Signed-off-by: Ophestra --- cmd/hakurei/print_test.go | 14 -------------- hst/hst.go | 1 - hst/hst_test.go | 4 ---- 3 files changed, 19 deletions(-) diff --git a/cmd/hakurei/print_test.go b/cmd/hakurei/print_test.go index 8189cfc..c38b731 100644 --- a/cmd/hakurei/print_test.go +++ b/cmd/hakurei/print_test.go @@ -50,7 +50,6 @@ Filesystem autoetc:/etc/ w+ephemeral(-rwxr-xr-x):/tmp/ 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@ w-/var/lib/hakurei/u0/org.chromium.Chromium:/data/data/org.chromium.Chromium @@ -131,7 +130,6 @@ Filesystem autoetc:/etc/ w+ephemeral(-rwxr-xr-x):/tmp/ 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@ w-/var/lib/hakurei/u0/org.chromium.Chromium:/data/data/org.chromium.Chromium @@ -295,10 +293,6 @@ App "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", - "src": "/nix/store" - }, { "type": "link", "dst": "/run/current-system", @@ -449,10 +443,6 @@ App "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", - "src": "/nix/store" - }, { "type": "link", "dst": "/run/current-system", @@ -659,10 +649,6 @@ func TestPrintPs(t *testing.T) { "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", - "src": "/nix/store" - }, { "type": "link", "dst": "/run/current-system", diff --git a/hst/hst.go b/hst/hst.go index 575869e..208b395 100644 --- a/hst/hst.go +++ b/hst/hst.go @@ -121,7 +121,6 @@ func Template() *Config { 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}}, {&FSLink{Target: fhs.AbsRun.Append("opengl-driver"), Linkname: "/run/opengl-driver", Dereference: true}}, {&FSBind{Source: fhs.AbsVarLib.Append("hakurei/u0/org.chromium.Chromium"), diff --git a/hst/hst_test.go b/hst/hst_test.go index 301704b..247df2c 100644 --- a/hst/hst_test.go +++ b/hst/hst_test.go @@ -198,10 +198,6 @@ func TestTemplate(t *testing.T) { "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", - "src": "/nix/store" - }, { "type": "link", "dst": "/run/current-system",