deploy: 95c6ee0368

doc/start/index.html

@@ -167,7 +167,9 @@
 <p>The only dependency is nix, so make sure you have it <a href="https://nixos.org/manual/nix/stable/#sect-multi-user-installation">installed</a>.</p>
 <h2><a class="header" href="#get-the-template" id="get-the-template">Get the Template</a></h2>
 <p>Here is a snippet that will get you the template without the git history:</p>
-<pre><code class="language-sh">nix-shell https://github.com/nrdxp/nixflk/archive/core.tar.gz -A shell \
+<pre><code class="language-sh">nix-shell -p cachix --run cachix use nrdxp
+
+nix-shell https://github.com/nrdxp/nixflk/archive/core.tar.gz -A shell \
   --run &quot;flk get core&quot;
 
 cd flk
@@ -177,8 +179,6 @@ nix-shell
 git init
 git add .
 git commit -m init
-
-cachix use nrdxp
 </code></pre>
 <p>This will place you in a new folder named <code>flk</code> with git initialized, and a
 nix-shell that provides all the dependencies, including the unstable nix
@@ -191,6 +191,8 @@ version required.</p>
 in the call to <code>flk get</code></li>
 <li>Flakes ignore files that have not been added to git, so be sure to stage new
 files before building the system.</li>
+<li>You can choose to simply clone the repo with git if you want to follow
+upstream changes.</li>
 </ul>
 </blockquote>
 <h2><a class="header" href="#next-steps" id="next-steps">Next Steps:</a></h2>

overlays/nixFlakes.nix

@@ -1,8 +1,12 @@
 final: prev: {
   nixFlakes = prev.nixFlakes.overrideAttrs
-    (self: {
-      patches = [
-        ../pkgs/tools/package-management/nix/0001-nix-command-and-flakes-by-default.patch
-      ];
-    });
+    (self:
+      let
+        oldPatches = self.patches or [ ];
+      in
+      {
+        patches = oldPatches ++ [
+          ../pkgs/tools/package-management/nix/0001-nix-command-and-flakes-by-default.patch
+        ];
+      });
 }

overrides/default.nix

@@ -14,6 +14,7 @@
       element-desktop
       manix
       nixpkgs-fmt
+      nixFlakes
       qutebrowser
       signal-desktop
       starship;

print.html

@@ -213,7 +213,9 @@ considered unstable.</p>
 <p>The only dependency is nix, so make sure you have it <a href="https://nixos.org/manual/nix/stable/#sect-multi-user-installation">installed</a>.</p>
 <h2><a class="header" href="#get-the-template" id="get-the-template">Get the Template</a></h2>
 <p>Here is a snippet that will get you the template without the git history:</p>
-<pre><code class="language-sh">nix-shell https://github.com/nrdxp/nixflk/archive/core.tar.gz -A shell \
+<pre><code class="language-sh">nix-shell -p cachix --run cachix use nrdxp
+
+nix-shell https://github.com/nrdxp/nixflk/archive/core.tar.gz -A shell \
   --run &quot;flk get core&quot;
 
 cd flk
@@ -223,8 +225,6 @@ nix-shell
 git init
 git add .
 git commit -m init
-
-cachix use nrdxp
 </code></pre>
 <p>This will place you in a new folder named <code>flk</code> with git initialized, and a
 nix-shell that provides all the dependencies, including the unstable nix
@@ -237,6 +237,8 @@ version required.</p>
 in the call to <code>flk get</code></li>
 <li>Flakes ignore files that have not been added to git, so be sure to stage new
 files before building the system.</li>
+<li>You can choose to simply clone the repo with git if you want to follow
+upstream changes.</li>
 </ul>
 </blockquote>
 <h2><a class="header" href="#next-steps" id="next-steps">Next Steps:</a></h2>