blog/we-have-go-2: fix indent

Signed-off-by: Xe Iaso <me@christine.website>

Cargo.lock

@@ -141,9 +141,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.5.5"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f1e8a972137fad81e2a1a60b86ff17ce0338f8017264e45a9723d0083c39a1"
+checksum = "f4af7447fc1214c1f3a1ace861d0216a6c8bb13965b64bbad9650f375b67689a"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -172,9 +172,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.2.4"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da31c0ed7b4690e2c78fe4b880d21cd7db04a346ebc658b4270251b695437f17"
+checksum = "3bdc19781b16e32f8a7200368a336fa4509d4b72ef15dd4e41df5290855ee1e6"
 dependencies = [
  "async-trait",
  "bytes",
@@ -186,9 +186,9 @@ dependencies = [
 
 [[package]]
 name = "axum-extra"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f77e63453d67cf14576bad0f395ad1541f0b92949a6a53b548f40b77158fc095"
+checksum = "a00a7085c512df12d4e07a862b23a3b3bfe5326ecfc4185b49fb15c8850ba406"
 dependencies = [
  "axum",
  "bytes",
@@ -203,9 +203,9 @@ dependencies = [
 
 [[package]]
 name = "axum-macros"
-version = "0.2.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dc20c9d065f7232b92740f99001addacef62697ed3a030369ef193140d7621c"
+checksum = "63bcb0d395bc5dd286e61aada9fc48201eb70e232f006f9d6c330c9db2f256f5"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -2635,9 +2635,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d342c6d58709c0a6d48d48dabbb62d4ef955cf5f0f3bbfd845838e7ae88dbae"
+checksum = "e980386f06883cf4d0578d6c9178c81f68b45d77d00f2c2c1bc034b3439c2c56"
 dependencies = [
  "async-compression",
  "base64",
@@ -2660,7 +2660,6 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "uuid 1.0.0",
 ]
 
 [[package]]
@@ -2858,15 +2857,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "uuid"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0"
-dependencies = [
- "getrandom 0.2.5",
-]
-
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -3147,7 +3137,7 @@ dependencies = [
  "tracing-futures",
  "tracing-subscriber",
  "url",
- "uuid 0.8.2",
+ "uuid",
  "xml-rs",
 ]
 

blog/nix-flakes-1-2022-02-21.markdown

@@ -207,12 +207,12 @@ Let's take a closer look at the higher level things in the flake:
 your `flake.nix`. Ditto with "flake input" referring to the `inputs` attribute
 of your `flake.nix`.](conversation://Cadey/enby)
 
-When you ran `nix build` earlier, it defaulted to building the `default` entry
+When you ran `nix build` earlier, it defaulted to building the package in
-in `packages`. You can also build the `default` package by running this
+`defaultPackage`. You can also build the `go-hello` package by running this
 command:
 
 ```console
-$ nix build .#default
+$ nix build .#go-hello
 ```
 
 And if you want to build the copy I made for this post:
@@ -234,13 +234,11 @@ simplify that above `nix build` and `./result/bin/go-hello` cycle into a single
 `go-hello` to be the default app:
 
 ```nix
-# below packages
+# below defaultPackage
 
-apps = forAllSystems (system: {
+defaultApp = forAllSystems (system: {
-  default = {
+  type = "app";
-      type = "app";
+  program = "${self.packages.${system}.go-hello}/bin/go-hello";
-      program = "${self.packages.${system}.default}/bin/go-hello";
-  };
 });
 ```
 
@@ -283,10 +281,8 @@ can add it to your `flake.nix` using this:
 
 devShell = forAllSystems (system:
   let pkgs = nixpkgsFor.${system};
-  in {
+  in pkgs.mkShell {
-    default = pkgs.mkShell {
+    buildInputs = with pkgs; [ go gopls goimports go-tools ];
-      buildInputs = with pkgs; [ go gopls gotools go-tools ];
-    };
   });
 ```
 

templates/blogpost.rs.html

@@ -68,16 +68,12 @@
 <div class="warning">
     @:mara("hacker", "Mara", Html(format!(r#"Hey, this post is set to go live to the public on {}. Right now you are reading a pre-publication version of this post. Please do not share this on social media. This post will automatically go live for everyone on the intended publication date. If you want access to these posts, please join the <a href="https://patreon.com/cadey">Patreon</a>. It helps me afford the copyeditor that I contract for the technical content I write."#, post.detri())))
 </div>
-} else {
-<script async src="https://media.ethicalads.io/media/client/ethicalads.min.js"></script>
 }
 
 <small>A @post.read_time_estimate_minutes minute read.</small>
 
 @body
 
-<div class="adaptive" data-ea-publisher="christinewebsite" data-ea-type="image" data-ea-style="stickybox"></div>
-
 <hr />
 
 @if post.front_matter.vod.is_some() {

templates/talkpost.rs.html

@@ -1,6 +1,5 @@
-@use super::{header_html, footer_html, mara};
+@use super::{header_html, footer_html};
 @use crate::post::Post;
-@use chrono::prelude::*;
 
 @(post: Post, body: impl ToHtml)
 
@@ -48,20 +47,10 @@
      @}
 </script>
 
-@if Utc::today().num_days_from_ce() < post.date.num_days_from_ce() {
-<div class="warning">
-    @:mara("hacker", "Mara", Html(format!(r#"Hey, this post is set to go live to the public on {}. Right now you are reading a pre-publication version of this post. Please do not share this on social media. This post will automatically go live for everyone on the intended publication date. If you want access to these posts, please join the <a href="https://patreon.com/cadey">Patreon</a>. It helps me afford the copyeditor that I contract for the technical content I write."#, post.detri())))
-</div>
-} else {
-<script async src="https://media.ethicalads.io/media/client/ethicalads.min.js"></script>
-}
-
 @body
 
 <a href="@post.front_matter.slides_link.as_ref().unwrap()">Link to the slides</a>
 
-<div data-ea-publisher="christinewebsite" data-ea-type="text"></div>
-
 <hr />
 
 <!-- The button that should be clicked. -->