11 changed files with 148 additions and 92 deletions
@@ -332,6 +332,13 @@ declare module 'astro:content' {
  collection: "blog";
  data: InferEntrySchema<"blog">
 } & { render(): Render[".mdx"] };
 "year2025.mdx": {
 	id: "year2025.mdx";
  slug: "year2025";
  body: string;
  collection: "blog";
  data: InferEntrySchema<"blog">
 } & { render(): Render[".mdx"] };
 };
 	};
@@ -7,8 +7,8 @@ This website is built using [Astro](https://astro.build)
 All commands are run from the root of the project, from a terminal:
 | Command                   | Action                                             |
-| :--------------------- | :------------------------------------------------- |
+| :------------------------ | :------------------------------------------------- |
-| `npm i -g yarn`        | Installs yarn (if needed)                          |
+| `npm install -g corepack` | Installs yarn (if needed)                          |
 | `yarn`                    | Installs dependencies                              |
 | `yarn dev`                | Starts local dev server at `localhost:3000`        |
 | `yarn build`              | Build your production site to `./dist/`            |
@@ -80,7 +80,7 @@ It is hard to paint a tube with a brush. It looks _okaayy_.
 ]} />
-If we knew what we knew now, we'd have either bought the legs already ✨bling✨ed, or been satisfied with the legs as they were. It wasn't really worth the amount of effort we had to put in to change them.
+If we knew what we know now, we'd have either bought the legs already ✨bling✨ed, or been satisfied with the legs as they were. It wasn't really worth the amount of effort we had to put in to change them.
 As of yet, we haven't seen the photos on their website, but we'll let you know when we have!
@@ -60,7 +60,7 @@ In the span of a day and a half, Simon and Will installed everything: our shower
 ]} />
-The silicon was still curing as we left to head off for Christmas, but when we get back we'll be able to have the first test shower! An excellent Christmas present to us 🎁
+The silicone was still curing as we left to head off for Christmas, but when we get back we'll be able to have the first test shower! An excellent Christmas present to us 🎁
 Of course, it's still only done\*. There are some bits of paint which need a touch up, we still need to find a light for above the sink, and we want to add some hooks and decorate a bit.
@@ -140,7 +140,7 @@ Well, we're basically plumbing experts now - why not break out the pex pipes and
 We asked Simon for his advice, and he suggested soldering some extra copper pipe on, with a collar to join over the gap. This was a bit more than we were prepared for (or had the tools for!), but Simon offered to do it for us. We were fortunate he was there!
 <Callout title="💡 Simon's Top Tip for Soldering 💡">
-  The important bit is not to set things on fire
+  The important bit is to not set things on fire
 </Callout>
 Not all of the pipes required extending. The ones that didn't, however, had a different challenge in the form of an olive. These are rings of copper or brass which compression fit when you tighten the bolts between the valve and the pipe. To get a new valve on, we had to take the old olives off without damaging the pipe. This involves sawing through part of the olive (but not the pipe), then turn a screwdriver in the resulting groove to ping it off (with suitable eye protection).
@@ -152,7 +152,7 @@ In the end I think we're going to end up with the same approach as everyone else
 ## Cat cat cat
-We were surprised one day to enter our kitchen and see a not-ours cat casually sat there. Argh. We really don't want territorial disputes inside our house thank you. As a result we have installed a microchip operated cat flap, and are in the process of trying to coax the cat to use it. The whirring of the catch has been putting her off, but we think she's slowly getting there.
+We were surprised one day to enter our kitchen and see a not-ours cat casually sat there. Argh. We really don't want territorial disputes inside our house thank you. As a result we have installed a microchip operated cat flap, and are in the process of trying to coax our cat to use it. The whirring of the catch has been putting her off, but we think she's slowly getting there.
 ## Outro
@@ -1,6 +1,6 @@
 ---
 layout: ../../layouts/LayoutMdx.astro
-title: "2025"
+title: "2025 - don't look at the publish date"
 date: 2026-08-29
 dir: year2025
 image: spare-done2
@@ -12,23 +12,35 @@ export const s = generateImageHyrdationFunction("year2025");
 import Cards from "../../components/Cards.astro";
 import Callout from "../../components/Callout.astro";
 import Solocard from "../../components/Solocard.astro";
 import NextPrev from "../../components/NextPrev.astro";
 import Progress from "../../components/Progress.astro";
 import YTVideo from "../../components/YTVideo.astro";
 import Quote from "../../components/Quote.astro";
 Oops.
-Here is the blog a little bit backdated.
+We forgot to write the blog.
 Here is the latest installment of the house news blog, only a little bit backdated.
 # Blob or tube
-While we previously said our top floor bathroom was done*, we cunningly didn't show the dodgy looking ceiling wires in our photos. This year, we can finally call this room actually done done! 
+Previously when doing up our guest bathroom, we cunningly didn't draw attention to the dodgy looking ceiling wires in our photos.
-We found it pretty difficult to find a light fitting we both liked. Nikki likes the more traditional and stylish options and Ozzy has (bad taste)/(a better joke). 
+<Cards
  images={[
    { title: "Dodgy looking wires cunningly omitted from previous photos", src: s("bathroom-wires") },
  ]}
 /> 
 We had said:
 <Quote person="Nikki and Ozzy" date="Dec 2022">
  Of course, it's still only done\*. ... we still need to find a light for above the sink
 </Quote>
 This year, right on time, we can finally call this room actually done done! 
 We found it pretty difficult to find a light fitting we both liked. Nikki likes the more traditional and stylish options and Ozzy has to lump it. (bad taste)/(a better joke). 
 Our shortlist was between 'Blob' and 'Tube'. 
@@ -41,8 +53,19 @@ Our shortlist was between 'Blob' and 'Tube'.
 Blob or tube? Blob? Or tube?? A tricky decision.
-What then followed was a philosophical debate as to whether all matter in the universe can be split into blob and tube. (Mention Chris Jones saying all colours are blue or brown?) (more examples of blobs and tubes) (is a bowl of spaghetti blob or tube) (can many tube be blob?)
+What then followed was a philosophical debate as to whether all matter in the universe can be split into blob and tube. (We were also reminded of Ozzy's friend Chris' opinion that the only real colours are blue and brown, and all other perceived colours are just a shade of blue or brown.)
 This however raised more questions than it answered.
 If a single spaghetto is a tube, is a bowl of spaghetti blob or just many tube? 
 Do tubes have to have a hole to be a tube or are they topologically just blob?
 Is a sponge a blob or a tube?
 Where is the cut off point for a long potato to be tube rather than blob?
 What about Mike Oldfield's Tubular Blobs? 
 <Cards
  images={[
@@ -54,15 +77,15 @@ We ended up going with blob.
 <Cards
  images={[
-    { title: "Done", src: s("bathroom-done1") },
+    { title: "Done", src: s("bathroom1") },
-    { title: "And done", src: s("bathroom-done2"), },
+    { title: "And done", src: s("bathroom2"), },
  ]}
 />
 Done done! 
-# Bits and bobs
+
 # Bits and bobs (or should we say blobs)
 We also got some smaller jobs done. In no particular order with no particular fanfare: 
@@ -78,14 +101,14 @@ We added a doorknob to the back door, and added some brass doorknobs to replace
 <Cards
  images={[
-    { title: "Plastic Knob", src: s("knob-old") },
+    { title: "Plastic knob 👎", src: s("knob-old") },
    { title: "Knob!", src: s("knob1") },
    { title: "Knob!", src: s("knob2") },
    { title: "Knob!", src: s("knob-kitchen") },
  ]}
 />
-We got our lounge fireplace swept so we can have occasional fires on cold nights, on which we could toast marshmallows. We haven't had many yet as the weather has been very mild for this time of year. Also Nikki misremembered marshmallows as being better than they are. Ozzy never liked them to begin with.
+We got our lounge fireplace swept so we can have occasional fires on cold nights, on which we could toast marshmallows. We haven't had many yet as the weather has been very mild over winter this year. Also Nikki misremembered marshmallows as being better than they are. Ozzy never liked them to begin with.
 <Cards
  images={[
@@ -117,63 +140,11 @@ Then we found out the spare room curtains were coming off the wall as well. We u
 Our main progress since our last update was to improve the spare room. When we moved in, our priority was to get it feeling more habitable as soon as we could. We steamed the wallpaper off and painted it contract white and said 'good enough for now', with the intention of decorating properly at a later date. 
-(Photos of room as was)
+[The Spare Room As Was](/week4#guest-room)
-What sped up our decision to redecorate was that the radiator stopped radiating, and we had guests booked to come over in the wintertime. The issue was that the TRV seized up and due to them being an old standard, it wouldn't be possible to just replace these like for like. We took the opportunity to get a nice new radiator with a standard radiator tail as well.
+What really sped up our decision to redecorate was that the radiator stopped radiating, and we had guests booked to come over in the wintertime.
-There's a nice smart-looking radiator shop just down the road from us, so we decided to go with them. Support local and all that. But when they quoted us £600 to plumb the new radiator in (radiator not included) we thought they were having a laugh and what's the worst that could happen if we did it ourselves.
+As it's a north facing bedroom, we are leaning into the cosy with a nice muted red-brown. No paint bombs have been invented yet, unfortunately.
 <Callout title="Did you know?">
  🤦
 </Callout>
 <Callout title="Did you know?">
 Nikki and Ozzy are VERY optimistic.
 </Callout>
 Armed with our new youtube expertise, we went to Screwfix to buy a big blowtorch. What followed was a lot of practice to solder pipe together without leaks. We had also remembered our tips from Simon as to how to solder pipe. In particular, don't set the skirting boards on fire, and why you don't vertically wire wool the pipe to clean the end in preparation for the solder. 
 (Diagram of why to not vertically wire wool a pipe)
 We practised so much that we had to go back to Screwfix to get more pipe and couplings, and to get better flux and solder. The Baby's First Flux and Solder supplied by the kit was absolute rubbish. Maybe it's a ruse by Big Solder to get you to hire actual plumbers.
 <Cards
  images={[
    { title: "Pracising", src: s("spare-plumbing1") },
    { title: "Making a very long practice pipe", src: s("spare-plumbing3") },
  ]}
 />
 Practice makes perfect! Or at the very least makes less terrible. 
 We also needed to bend the pipe to accommodate the slightly wider combined width of the radiator and new TRVs. We practised this too. The trick is to draw a line on the pipe bender so your second bend is the same angle as the first. It's also important to be sure you're bending in the same z axis.
 (Pipe bending)
 Putting our practice to the test.
 <Cards
  images={[
    { title: "Scary stuff!", src: s("spare-plumbing2") },
  ]}
 />
 [some description of the anticipation waiting for leaks to appear]
 <Cards
  images={[
    { title: "todo", src: s("spare-radiator1") },
    { title: "todo", src: s("spare-radiator2") },
    { title: "todo", src: s("spare-radiator3") },
    { title: "todo", src: s("spare-radiator4") },
  ]}
 />
 Quids in. Nice and toasty warm.
 As you can see, we also gave the room a new coat of paint. As it's a north facing bedroom, we are leaning into the cosy with a nice muted red-brown. 
 <Cards
  images={[
@@ -184,7 +155,68 @@ As you can see, we also gave the room a new coat of paint. As it's a north facin
  ]}
 />
-We also decided to switch out the switches and sockets for some new ones. We didn't want to go with the sockets we normally go for (cheap white Screwfix multipacks) as it wouldn't go, so Nikki decided to plump for some fancier ones. These are made by the same people as our 'invisible' kitchen island sockets, which, invisibility aside, are really very nice to use. The toggle light switch in particular is very fun to fiddle with.
+Next on the list was leaning into the cosy by fixing the heating.
 The issue with the radiator was that the TRV had seized up, and it wouldn't be possible to just replace it like for like. The old radiator had imperial tails, and a replacement TRV would be too far away from the existing pipes. We took the opportunity to get a nice new radiator with a standard radiator tail and standard TRVs.
 There's a nice-looking radiator shop just down the road from us, so we decided to go with them. Support local and all that. But when they quoted us £600 to plumb the new radiator in (radiator not included) we thought they were having a laugh and what's the worst that could happen if we just did it ourselves.
 <Callout title="Did you know?">
 Nikki and Ozzy are VERY optimistic. They have never yet had a fun plumbing experience.
 </Callout>
 First we mounted the new radiator on the wall. This was the easy bit.
 <Cards
  images={[
    { title: "Taking the old radiator off", src: s("spare-radiator1") },
    { title: "Painting behind, installing the brackets", src: s("spare-radiator2") },
    { title: "Hanging the new radiator not on the wonk", src: s("spare-radiator3") },
  ]}
 />
 What came next was a lot of plumbing research using the good old school of youtube.
 Armed with our new expertise, we went to Screwfix to buy a big blowtorch. What followed was a lot of practice to solder pipe together without leaks. We had also remembered our tips from Simon as to how to solder pipe.
 <Quote person="💡 Simon's Top Tip for Soldering 💡" date="Dec 2022">
  The important bit is to not set things on fire
 </Quote>
 In particular, we also recalled why you don't vertically wire wool the pipe to clean the end in preparation for the solder. 
 (Diagram of why to not vertically wire wool a pipe)
 We practised so much that we had to go back to Screwfix to get more pipe and couplings, and to get better flux and solder. The Baby's First Flux and Solder supplied by the kit was absolute rubbish. Maybe it's a ruse by Big Solder to get you to hire actual plumbers.
 <Cards
  images={[
    { title: "Practising", src: s("spare-plumbing1") },
    { title: "Making a very long practice pipe. Pipe bending practice in the background", src: s("spare-plumbing3") },
  ]}
 />
 Practice makes perfect! Or at the very least makes less terrible. 
 We also needed to bend the pipe to accommodate the slightly wider combined width of the radiator and new TRVs. We practised this too. The trick for a dogleg is to draw a line on the pipe bender so your second bend is the same angle as the first. It's also important to be sure you're bending in the same z axis.
 <Cards
  images={[
    { title: "Putting our practice to the test. Scary stuff!", src: s("spare-plumbing2") },
  ]}
 />
 We refilled the system and monitored our handiwork for leaks, but there weren't any, which felt a bit wrong considering how plumbing in our house usually seemed to go! Everything seemed to go just a bit too smoothly.
 <Cards
  images={[
    { title: "Done!", src: s("spare-radiator4") },
  ]}
 />
 Quids in. Nice and toasty warm.
 We also decided to switch out the switches and sockets for some new ones. We didn't want to go with the sockets we normally go for (cheap white Screwfix multipacks) as it wouldn't go, so Nikki decided to plump for some fancier ones. These are made by the same people as our 'invisible' kitchen island sockets, which, invisibility or lack thereof aside, are really very nice to use. The toggle light switch in particular is very fun to fiddle with.
 <Cards
  images={[
@@ -194,26 +226,34 @@ We also decided to switch out the switches and sockets for some new ones. We did
 The trouble with these fancier sockets and switches is that they require a deeper than standard backbox for a flush faceplate. Ozzy spent a lot of time hunched over the sockets with a brick bolster. Thanks Ozzy!! Would we do this again? Ozzy is less keen than Nikki, that's for sure.
-Last of all, we got our most favourite carpet shop back to replace our least favourite carpet. In preparation, we went around and nailed down all the squeakiest floorboards and did a final coat of paint around the bottom of the skirting.
+Last of all, we scheduled in our favourite carpet shop to replace our least favourite carpet. In preparation, we went around and nailed down all the squeakiest floorboards and did a final coat of paint around the bottom of the skirting.
 <Cards
  images={[
    { title: "Carpet installed", src: s("spare-carpet") },
-    { title: "Lovely", src: s("spare-done1") },
+    { title: "Furniture back in", src: s("spare-done1") },
    { title: "Good", src: s("spare-done2") },
    { title: "Nice", src: s("spare-done3") },
  ]}
 />
-It's so soft to walk on.
+The new carpet is so soft to walk on. 
-We also managed to find this perfect chair in a local shop which is nice and comfy for reading.
+They had to trim a little off the bottoms of the doors to account for the increased carpet thickness so we now have 100% more openable doors! Not that we needed to, but it's nice to have the option. We have a door wedge to keep it shut again.
-Done*.
+We also managed to find this armchair in a local shop which just happened to be on sale, down from ludicrously expensive to actually worth getting. The colour is a perfect match! It's great quality too, very comfy to sit in, perfect for relaxing and reading.
 <Cards
  images={[
    { title: "Armchair", src: s("spare-done2") },
    { title: "All done", src: s("spare-done3") },
  ]}
 />
 Done*. Asterisk of course. We had some other ideas for this room, maybe a desk or bureau and shelves, maybe a larger and comfier headboard, maybe a floor lamp for reading, but as always, other worse rooms are being bumped up the priority list for what we might tackle next.
 # Thoughts
-We were pretty pleased to finally have a nice plumbing experience in our house for once. 
+We were pretty pleased to finally have a nice uneventful plumbing experience in our house for once. 
 It's also really nice for us to have finally done a room ourselves to a higher standard. The nicest parts of our house are still the bits we got others in to do for us.