diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6feccd5c9..b561698f7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -100,6 +100,7 @@ jobs:
       - uses: cachix/install-nix-action@v31
       - uses: DeterminateSystems/magic-nix-cache-action@v13
       - uses: actions/checkout@v6
+      - run: grep -qF '# den.outPath' templates/noflake/default.nix
       - run: sed -i 's@# den.outPath@den.outPath@' templates/noflake/default.nix
       - run: |
           cat <<-EOF > templates/noflake/modules/ci-runtime.nix
diff --git a/docs/src/content/docs/tutorials/noflake.mdx b/docs/src/content/docs/tutorials/noflake.mdx
index ed83912c3..fe860edad 100644
--- a/docs/src/content/docs/tutorials/noflake.mdx
+++ b/docs/src/content/docs/tutorials/noflake.mdx
@@ -48,8 +48,9 @@ modules/
 let
   sources = import ./npins;
   with-inputs = import sources.with-inputs sources {
-    # uncomment for local checkout on CI
-    den.outPath = ./../..;
+    # Uncomment for local checkout on CI.
+    # Do NOT commit this line uncommented, or it will break the template for new users.
+    # den.outPath = ./../..;
   };
 
   outputs =
@@ -163,10 +164,10 @@ The template exposes runnable apps under `den.sh` (one per host/home). The defau
 
 ```console
 # build the igloo host
-nix-run . -A den.sh --run igloo
+nix-shell -A den.sh --run igloo
 
 # or pass any nh action: switch, repl, build, --help
-nix-run . -A den.sh --run 'igloo build'
+nix-shell -A den.sh --run 'igloo build'
 ```
 
 You can also build with plain `nixos-rebuild` or `nix-build`:
diff --git a/templates/noflake/README.md b/templates/noflake/README.md
index cc2d1dcd0..eaabed7d8 100644
--- a/templates/noflake/README.md
+++ b/templates/noflake/README.md
@@ -16,10 +16,10 @@ This template provides runnable apps for each host/home (see modules/nh.nix)
 
 ```shell
 # default action is `build`
-nix-run . -A den.sh --run igloo
+nix-shell -A den.sh --run igloo
 
 # you can specify any other action like `switch`, `repl`, `build`, `--help`
-nix-run . -A den.sh --run 'igloo build'
+nix-shell -A den.sh --run 'igloo build'
 ```
 
 or
diff --git a/templates/noflake/default.nix b/templates/noflake/default.nix
index 239b99899..a60bf9026 100644
--- a/templates/noflake/default.nix
+++ b/templates/noflake/default.nix
@@ -1,8 +1,9 @@
 let
   sources = import ./npins;
   with-inputs = import sources.with-inputs sources {
-    # uncomment for local checkout on CI
-    den.outPath = ./../..;
+    # Uncomment for local checkout on CI.
+    # Do NOT commit this line uncommented, or it will break the template for new users.
+    # den.outPath = ./../..;
   };
 
   outputs =
diff --git a/templates/noflake/npins/sources.json b/templates/noflake/npins/sources.json
index d7c056b84..6ad81fe49 100644
--- a/templates/noflake/npins/sources.json
+++ b/templates/noflake/npins/sources.json
@@ -9,9 +9,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fba67817bd16955e10ff158c9758874031af089c",
-      "url": "https://github.com/denful/den/archive/fba67817bd16955e10ff158c9758874031af089c.tar.gz",
-      "hash": "sha256-eo2Snm2hoYAq8MA7bfjnn8p36riLcpJDA74Fzx9gcsY="
+      "revision": "e8e8de1e32646456cfc613f152175a7a548508ec",
+      "url": "https://github.com/denful/den/archive/e8e8de1e32646456cfc613f152175a7a548508ec.tar.gz",
+      "hash": "sha256-gp7Q7rMEjsqAyW4Uwz+sms8j+XegD5P/lzRCuMW2fNI="
     },
     "hjem": {
       "type": "Git",
@@ -65,11 +65,11 @@
         "owner": "feel-co",
         "repo": "smfh"
       },
-      "branch": "master",
+      "branch": "main",
       "submodules": false,
-      "revision": "dcc9937332ad77426fa2e8d6c5d8fed037689c69",
-      "url": "https://github.com/feel-co/smfh/archive/dcc9937332ad77426fa2e8d6c5d8fed037689c69.tar.gz",
-      "hash": "sha256-s75rkkrfle2g0/DTE0XaU9q+yTvrQHTQSrhMEPLGkIc="
+      "revision": "d4636e2adbfff58f0e2cc25e795d9844e7208f65",
+      "url": "https://github.com/feel-co/smfh/archive/d4636e2adbfff58f0e2cc25e795d9844e7208f65.tar.gz",
+      "hash": "sha256-+Gw0vFNMq8xLNyAiVOAIokFSMAoMpTcBcgq65EgRRW4="
     },
     "with-inputs": {
       "type": "Git",