Update curtain saga

Reviewed-on: #3

.astro/types.d.ts

@@ -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"] };
 };
 
 	};

.gitignore

@@ -4,6 +4,7 @@ dist/
 
 # dependencies
 node_modules/
+.yarn/install-state.gz
 
 # logs
 npm-debug.log*
@@ -18,3 +19,14 @@ pnpm-debug.log*
 
 # macOS-specific files
 .DS_Store
+
+# Devenv
+.devenv*
+devenv.local.nix
+devenv.local.yaml
+
+# direnv
+.direnv
+
+# pre-commit
+.pre-commit-config.yaml

.yarnrc.yml

@@ -1 +1,4 @@
+
+enableScripts: true
+
 nodeLinker: node-modules

Dockerfile

@@ -1,9 +1,11 @@
-FROM node:18 as build
+FROM node:22 as build
 WORKDIR /app
 COPY package.json package.json
+COPY .yarnrc.yml .yarnrc.yml
 COPY yarn.lock yarn.lock
 COPY tsconfig.json tsconfig.json
 
+RUN corepack enable
 RUN yarn install
 
 COPY src ./src

README.md

@@ -2,13 +2,23 @@
 
 This website is built using [Astro](https://astro.build)
 
+## CI
+
+For building the image on the server, the command to use is
+
+```bash
+devenv tasks run news:build
+```
+
+After that, a Caddy image will serve the files generated in the `dist` directory
+
 ## 🧞 Commands
 
 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/`            |
@@ -40,7 +50,6 @@ There's nothing special about `src/components/`, but that's where we like to put
 
 Any static assets, like images, can be placed in the `public/` directory.
 
-
 ## 👀 Want to learn more?
 
 Feel free to check [our documentation](https://docs.astro.build) or jump into our [Discord server](https://astro.build/chat).

build.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+if command -v yarn >/dev/null 2>&1; then
+    echo "yarn is available"
+else
+    echo "yarn is not installed" >&2
+    exit 1
+fi
+
+yarn install
+
+yarn build

devenv.lock

@@ -0,0 +1,65 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1787952362,
+        "narHash": "sha256-2vxVcc2CO7ihRRqg1OuqsVnOAoQ+kaRu7829hN44xLs=",
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "eeced8155ca9d573f5f3e22cbe925e7fbe4e761b",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "inputs": {
+        "nixpkgs-src": "nixpkgs-src"
+      },
+      "locked": {
+        "lastModified": 1787753358,
+        "narHash": "sha256-Tl77VbWyAKrOfRNQhL6JbQtb/MLzbYa/1RG1gWWfICk=",
+        "owner": "cachix",
+        "repo": "devenv-nixpkgs",
+        "rev": "256551e45f6303e142ab4a98be1bf243feb77dc0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "ref": "rolling",
+        "repo": "devenv-nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1787394516,
+        "narHash": "sha256-pRGOQSClnXNI2iLUG6DYpsGvYcuw0drOutVZFTJNw90=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c8f90650c15282fa8656a041bfbbd2403997a9a7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

devenv.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }: {
+  languages = {
+    javascript = {
+      enable = true;
+      package = pkgs.nodejs_22;
+      yarn = {
+        enable = true;
+        package = pkgs.yarn-berry;
+      };
+    };
+  };
+  tasks."news:install" = {
+    exec = ''yarn install'';
+    before = ["news:build"];
+  };
+  tasks."news:build" = {
+    exec = ''yarn build'';
+  };
+}

devenv.yaml

@@ -0,0 +1,18 @@
+# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
+inputs:
+  nixpkgs:
+    url: github:cachix/devenv-nixpkgs/rolling
+
+# If you're using non-OSS software, you can set allow_unfree to true.
+# allow_unfree: true
+
+# If you're not willing to allow unsupported packages:
+# allow_unsupported_system: false
+
+# If you're willing to use a package that's vulnerable
+# permitted_insecure_packages:
+#  - "openssl-1.1.1w"
+
+# If you have more than one devenv you can merge them
+#imports:
+# - ./backend

src/content/blog/year2022-1.mdx

@@ -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!
 

src/content/blog/year2022-end.mdx

@@ -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).

src/content/blog/year2022-w1.mdx

@@ -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
 

src/content/blog/year2024.mdx

@@ -1,10 +1,10 @@
 ---
 layout: ../../layouts/LayoutMdx.astro
 title: "2024"
-date: 2024-11-04
+date: 2024-12-13
 dir: year2024
 image: garden-furniture
-description: jobs jobs jobs
+description: we look to the outside
 ---
 
 import { generateImageHyrdationFunction } from "../../utils";
@@ -20,7 +20,7 @@ import Quote from "../../components/Quote.astro";
 
 It's been quite a while since we've done one of these! We've got to the point where each individual job isn't very big, so we haven't bothered documenting them.
 
-The theme for this year's works is _outside_.  We're running out of large-scale things to do inside, but there was plenty of scope outside for improvement.
+The theme for this year's works is 🌤️*outside*🌤️. We're running out of large-scale things to do inside, but there was plenty of scope outside for improvement.
 
 However, we've still accumulated quite a few other small jobs since the last update! Bim bim bam let's go
 
@@ -28,28 +28,32 @@ However, we've still accumulated quite a few other small jobs since the last upd
 
 Even since we arrived in Bath we struggled to fully enjoy our patio. It was a bit of an awkward shape and the floor was <sup>all</sup> _over_ <sub>the</sub> place. We also had issues with the drain, which would fill up with a big puddle in the lightest of rains.
 
-<Solocard title="Still a huge improvement on what we had in Harrow..." src={s("patio-before")}/>
+<Solocard
+  title="Still a huge improvement on what we had in Harrow..."
+  src={s("patio-before")}
+/>
 
-Well, we decided that it could be so much better and got some people in to come and built us a new one.  As always, Ozzy was astonished at the speed at which demolition happens, and after a couple of days in early June we were left with a big mess in the back garden where we used to have a patio.
+Well, we decided that it could be so much better and got some people in to come and build us a new one. As always, Ozzy was astonished at the speed at which demolition happens, and after a couple of days in early June we were left with a big mess in the back garden where we used to have a patio.
 
-<Cards images={[
-    {title: "A big mess", src: s('patio-mess')},
-    {title: "Trying to imagine what it would look like", src: s('patio-thinking')},
-]} />
+<Cards
+  images={[
+    { title: "A big mess", src: s("patio-mess") },
+    {
+      title: "Trying to imagine what it would look like",
+      src: s("patio-thinking"),
+    },
+  ]}
+/>
 
 Work tends to go fast when you're using the right tools, and given that 🎉🎉🎉 tools are our favourite things 🎉🎉🎉, we couldn't pass up giving you a quick overview.
 
-<Solocard title="Power-Wheelbarrow and MiniDigger" src={s("patio-progress")}/>
+<Solocard title="Power-Wheelbarrow and MiniDigger" src={s("patio-progress")} />
 
 The **Power-Wheelbarrow** has a weight capacity of half a ton, and can lift and tilt its bucket into a skip. Super useful when you're having to take all the spoil down the full length of our garden. The tank-style tracks have an amazing capacity for churning up lawns, and it churned up ours with gusto.
 
-The **MiniDigger** is just pretty cute.  It can tuck in its treads so that it can be driven straight through a house - we didn't feel the need for a demonstation.  They also didn't let us have a go as its quite a bit more tippy than a standard digger.
+The **MiniDigger** is just pretty cute. It can tuck in its treads so that it can be driven straight through a house - we didn't feel the need for a demonstration. They also didn't let us have a go as its quite a bit more tippy than a standard digger.
 
-Between them they made very quick work on removing our old patio.
-
-Despite having these excellent tools, they didn't manage to completely remove some of the slabs of original pennant stone - They dropped them halfway down the garden.  Fortunately in a very neat way that happened to expand our mid-garden patio by the 'orchard'. 😁
-
-*Todo: Midgarden patio pic
+Between them they made very quick work on removing our old patio slabs of pennant stone. They dropped them halfway down the garden, in a very neat way, that happened to expand our mid-garden patio by the 'orchard'. 😁
 
 Whilst the demolition was quick, it wasn't entirely smooth. We'd decided to have the treads of the stairs match the patio, and when they came to remove the old concrete treads, a fair part of the rest of the stairs came with them turning them into a bit of a slide.
 
@@ -60,24 +64,32 @@ Whilst the demolition was quick, it wasn't entirely smooth.  We'd decided to hav
 
 ]} />
 
-We had a big ol' conversation about various options on how to proceed, but we didn't really like any of the options presented.  In the end, we decided to get our stonemasonry friends back to come and fix things.  Of course this adds more time as we need to organise more people, but we thought that it would be worth it.
+We had a big ol' conversation about various options on how to proceed, but we didn't really like any of the options presented. We could see that there had been several attempts at bodging this staircase previously with assorted bits of wire and cement. The lowest stair was half missing, and was instead made of soil and plant roots. In the end, we decided to get some stonemasonry people to come and fix things properly. Of course this adds more time as we need to organise more people, but we thought that it would be worth it.
 
-In the meantime, work continued on the main patio, and by the end of June it was done*.  We chose a porcelain tile as these would be very hardwearing, but most of all, they would be flat (a feature we were _looking_ <sub>forward</sub> to). We would have relain the pennant stone if there was enough, but half of it was missing and replaced with concrete or broken.
+In the meantime, work continued on the main patio, and by the end of June it was done\*. We chose a porcelain tile as these would be very hardwearing, but mainly: flat (a feature we <sup>were</sup> _looking_ <sub>forward</sub> to). We would have relain the pennant stone if there was enough, but half of it was missing and replaced with concrete or broken.
 
-<Solocard title="Done*  (Carefully framed photo)" src={s('patio-done')}/>
+<Solocard title="Done*  (Carefully framed photo)" src={s("patio-done")} />
 
 We were so pleased with finally having a _flat patio_ that we decided to cash in a wedding present from Ozzy's parents - a garden furniture voucher. We couldn't see any expiry date, which is good considering we were over ten years late redeeming it 😀
 
-<Solocard title="The voucher gained interest too" src={s("garden-furniture")} />
+<Solocard
+  title="The voucher gained interest, hehe"
+  src={s("garden-furniture")}
+/>
 
-You can see the start of the work that the stonemasons were doing to the stairs here.  The were so unsure about what might need to be done that they refused to give us a quote and instead agreed a day-rate.  Watching them work was an education in stairbuilding technique.  
+You can see the start of the work that the stonemasons were doing to the stairs here. They were so unsure about what might need to be done that they refused to give us a quote and instead agreed a day-rate. Watching them work was an education in stairbuilding technique.
 
-We found out that each stair is almost entirely supported by the large wall and the stair beneath - the smaller wall beneath the stairs was a much later addition.  This ruled out replacing any of the stairs because we _really_ didn't want to do anything with the shared garden wall, so instead we opted to extend each step along a bit - increasing the overlap between each step. 
+We found out that each stair is almost entirely supported by the large party wall and the stair beneath - the smaller wall beneath the stairs was a much later addition. This ruled out replacing any of the stairs because we _really_ didn't want to do anything with the shared garden wall, so instead we opted to extend each step forward a bit - increasing the overlap between each step.
 
-<Cards images={[
-    {title: "You can see the diagonal line that would have been unsupported", src: s("stair-construction")},
-    {title: "Adding a new face and backfilling", src: s("stair-rebuild")}
-]} />
+<Cards
+  images={[
+    {
+      title: "You can see the diagonal line that would have been unsupported",
+      src: s("stair-construction"),
+    },
+    { title: "Adding a new face and backfilling", src: s("stair-rebuild") },
+  ]}
+/>
 
 By the time the masons had finished it was already late July. Now we just had to organise a time to get the original bloke back to place the stair treads.
 
@@ -93,19 +105,17 @@ Lastly we just needed to tackle sanding and repainting the railing.  I feel that
 
 ]} />
 
-Now we just need to wait until spring for the plants to grow back in and it'll be done! We've planted rosemary, some lavender, a peony and a rudbeckia so far. We've ordered some climbing roses. Bets are on for how many will survive the winter.
+Now we just need to wait until spring for the plants to grow back in and it'll be done! We've planted rosemary, some lavender, a peony, a rudbeckia, lots of bulbs and two climbing roses. Bets are on for how many will survive the winter. We'll share some more photos when everything's grown in a bit.
 
 DONE DONE DONE! It only took 7 months - no wonder our updates are slowing down!
 
-**TODO:** Pic of done-ness
-
 ## The Front
 
 Whilst all this was going on, we were having some work done at the front as well. Our front garden wall has been looking a bit fally-downy ever since we got here - another similarity to Harrow 🙂 Given what Bath is like, and the visibility of this change, we decided to take our first dip into the wonderful world of planning permission and listed building consent - Yay.
 
-Fortunately, it was far easier than we expected it to be.  We knew that numbers 4-7 of our house block had got their front walls repaired and re-railed a few years before we moved in.  What we didn't know was that their consent forms included our house too!  And because their work was done within 5 years of the permission being granted, planning for ours hadn't lapsed so we didn't need to do a thing!  Nice!
+Fortunately, it was far easier than we expected it to be. We knew that numbers 4-7 of our house block had got their front walls repaired and re-railed a few years before we moved in. What we didn't know was that their consent forms included our house too! And because their work was started within 5 years of the permission being granted, planning for ours hadn't lapsed so we didn't need to do anything! Nice!
 
-Full steam ahead then!  We had our stonemasons come round and take the unoriginal bits off, stabilise the lower course, then add a few courses of Bath stone.
+Full steam ahead then! We had our favourite stonemason friends come round and take the unoriginal bits off, stabilise the lower course, then add a few courses of Bath stone.
 
 <Cards images={[
 
@@ -115,35 +125,36 @@ Full steam ahead then!  We had our stonemasons come round and take the unorigina
 
 ]} />
 
-Our local ironmongers came round (after a 12 week lead time) to install a new set of railings and a gate to complete the look.
+Our favourite ironmonger friends came back to add in the railings. They have a massive lead time so we had to wait a while before the railings could be installed. They drilled holes in our nice new wall, then the railings were stuck in with lead.
 
 <Cards images={[
 
-    {title: "Railings are attached with lead (massive lead time)", src: s("wall-lead")},
+    {title: "Massive lead time", src: s("wall-lead")},
     {title: "Front with railings", src: s("front-wall-donedone")}
 
 ]} />
 
-Time for another done*
+Time for another done\*
 
 It all looks great, but the surface of the garden path is so uneven that it's not possible to close the front gate 🤦 We're choosing to think about how this shows how welcoming we are, rather than anything else.
 
 ## The Others
 
-Time for the bim bim bam section!
+Time for the bim bim bam section of all the other small jobs!
 
-## Lounge
+### Lounge
 
 We moved the mirror to the other side of the room, and painted the walls and bookshelves a bit. We also replaced the radiators as the old ones stopped working. We don't have a huge number of 'before' photos because we forgot.
 
 <Solocard title="In progress" src={s("lounge.MP")} />
 
-We got a footstool which has a bed in it - we had a bit of a mixup with the delivery where we received a completely different colour in a mislabeled box.
+We also forgot to take 'after' photos, and we've got our Christmas decorations up now so you'll have to wait.
 
-It's really cosy now.
+We got a footstool which has a bed in it - we had a bit of a mixup with the delivery where we received a completely different colour in a mislabeled box - fun fun fun
 
-## Shelves
+It's really cosy now, but it's still far from done.
 
+### Shelves
 
 <Cards images={[
 
@@ -152,14 +163,13 @@ It's really cosy now.
 
 ]} />
 
+### Basement
 
-## Basement
+The basement continues to be pretty uninspiring compared to the rest of the house. We are mainly using it for storage, though now we've moved the sofa bed down there. We bought some moving straps (😭) which are rated for very heavy things, and spent about an hour carrying the sofa to the basement. 💪 We had to go out of the front door, all around the side road and up the garden, as the sofa doesn't fit down our stairs. When we were halfway down the road, we got an offer from our next-door-neighbour to throw the sofa over the garden fence if it would help... (It wouldn't)
 
-The basement continues to be pretty uninspiring compared to the rest of the house. We are mainly using it for storage, though now we've moved the sofa bed down there. It was intended for the cinema or for guests, but it came in very handy to sleep in when there was a heatwave!
+The sofabed was intended for watching films in the cinema and as accommodation for guests, but it came in very handy for us to sleep in when there was a heatwave!
 
-<Cards images={[
-    {title: "Handy", src: s("basement-sofa")},
-]} />
+<Cards images={[{ title: "Handy", src: s("basement-sofa") }]} />
 
 Ozzy's second love in life is big plastic storage boxes, and we've reworked a lot of our shelves to accommodate these. They aren't the prettiest, but it's useful to have contained areas for storing stuff, and it's easier to see what's in them than in cardboard boxes.
 
@@ -167,66 +177,47 @@ Which means we can now return to the .....
 
 <Progress value={67} max={67} />
 
-WHAT'S THAT?? We've unpacked every box!! This means we've now officially moved in. Well done us.
+WHAT'S THAT?? We've unpacked every box!! This means we've now officially moved in. Well done us! 🎉
 
 Or rather, we've just transferred things from cardboard boxes into plastic boxes.
 
+<Cards
+  images={[
+    {
+      title: "Clutter library - but now you can see what we're storing",
+      src: s("basement-storage"),
+    },
+  ]}
+/>
 
-<Solocard title="Clutter library - but now you can see what we're storing" src={s("basement-storage")} />
+We've also done a couple of jobs in the basement bathroom - replacing the old loud extractor fan with a quieter one, replacing the light with one that wasn't falling out of the ceiling, and repainting and covering the louvre doors with burlap to help a little with privacy. We also "repaired" the slightly leaky shower by turning it off at the stopcock. This bathroom is likely to be a future project - either ripping it out or replacing it in some way. Stay tuned to find out!
 
-We've also done a couple of jobs in the bathroom - replacing the old loud extractor fan with a quieter one, replacing the light with one that wasn't falling out of the ceiling, and repainting and covering the louvre doors with burlap to help a little with privacy.
+## Excuses
 
-##  Utility
+That's pretty much it for this year. As always, we've been ~distracted~ busy with other things as well. 😄
 
-We still haven't fully installed the worktop, but we did install the tap. This removes the motivation to finish the worktop as we can now fully use the sink.
+<Cards images={[
 
-You may remember, back in ancient history when we were installing the cupboards, we mentioned that we were able to use every available centimetre on that wall. 
-Whilst it is great for maximising storage, it also makes it difficult to get the washing machine and tumble dryer out to access the tap behind, especially when it's on a wonky tiling job.
-We bought a set of wheels to put the machines on, to wheel them in and out. 
+    {title: "Being a Disney Princess in Madeira", src: s("madeira")},
+    {title: "Visiting Bath in Belgium", src: s("belgium")},
+    {title: "Sailing ourselves around the Norfolk Broads (RIP hat 😢, lost at sea)", src: s("norfolk")},
+    {title: "Kayaking in France after a weekend of playing for Contra dancing", src: s("ande")},
+    {title: "Camping with friends in Devon", src: s("devon")},
+    {title: "More sailing on the Solent (and saw this pretty boat)", src: s("sailing")},
+    {title: "Enjoying art at Giverny", src: s("giverny")},
+    {title: "Something something Cheddar Gorge", src: s("cheddar")},
+    {title: "Awesome LVGO concert", src: s("lvgo")},
 
+]} />
 
+This LVGO concert deserves a special mention as Nikki arranged one of the pieces for it. It was used as the finale and encore and everyone loved it 🥳😮‍💨. Afterwards the composer gave Nikki two limited edition copies of the original game as a thank you. Massive sigh of relief, and definitely worth all the trouble taken!
 
+We also got a drone! Please enjoy some quick shots from our last couple of trips away in Wales and Weston-super-Mare. The unnecessarily epic music is a requirement for drone footage.
 
+<YTVideo src="Hsj6rON1nO4" />
 
+Let us know if you want any gutters inspected 😄
 
+See you all next year!
 
-
-## lounge
-- New paint on walls and inside bookshelves
-- moved big mirror to other side of room
-- new sofa and footstool with bed in it
-- curtains
-- pictures on walls
-- new radiator install (bedroom too)
-## basement
-- replaced a light
-- replaced the extractor fan for one much much quieter
-- painted louvred doors and put fabric on bathroom doors to block out visibility
-- curtains
-- considered replacing the shower, but 'fixed' it instead
-## dining room
-- nozzy wall hanging with interesting plasterboard fixings
-## hallway
-- dimmer switches (one needed big repairs)
-- shelf
-
-## utility
-* Installed the tap
-* washing machine wheels
-
-## bedroom
-- new curtain rail because the old one fell apart
-- new radiators
-
-
-## other things
-- Nikki ran the bath half in ~2 1/2 hours and raised £820 and got a massive ice cream after
-- Ozzy has bought enough IKEA boxes to live in
-
-
-
-
-
-
-
-<NextPrev prev="year2023-1" />
+<NextPrev prev="year2023-1" next="year2025" />

src/content/blog/year2025.mdx

@@ -0,0 +1,265 @@
+---
+layout: ../../layouts/LayoutMdx.astro
+title: "2025"
+date: 2026-08-29
+dir: year2025
+image: spare-done2
+description: we forgot to write the blog on time
+---
+
+import { generateImageHyrdationFunction } from "../../utils";
+export const s = generateImageHyrdationFunction("year2025");
+
+import Cards from "../../components/Cards.astro";
+import Callout from "../../components/Callout.astro";
+import NextPrev from "../../components/NextPrev.astro";
+import Quote from "../../components/Quote.astro";
+
+Oops. Don't look at the publish date
+
+We forgot to write the blog.
+
+Here is the latest installment of the house news blog, only a little bit backdated.
+
+
+# Blob or tube
+
+Previously when doing up our guest bathroom, we cunningly didn't draw attention to the dodgy looking ceiling wires in our photos.
+
+<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 likes saying no. (bad taste)/(a better joke). 
+
+Our shortlist was between 'Blob' and 'Tube'. 
+
+<Cards
+  images={[
+    { title: "Blob", src: s("blob") },
+    { title: "Tube", src: s("tube"), },
+  ]}
+/>
+
+Blob or tube? Blob? Or tube?? A tricky decision.
+
+What then followed was a philosophical debate as to whether all objects 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.
+
+Where is the cut off point for a long potato to be tube rather than blob?
+
+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?
+
+What about Mike Oldfield's wonderful album: Tubular Blobs? 
+
+<Cards
+  images={[
+    { title: "Blob or tube?", src: s("bathroom-light2") },
+  ]}
+/>
+
+We ended up going with blob.
+
+<Cards
+  images={[
+    { title: "Blob", src: s("bathroom1") },
+    { title: "Blob", src: s("bathroom2"), },
+  ]}
+/>
+
+✅ Done done!
+
+# Bits and bobs (blobs?)
+
+We also got some smaller jobs done. In no particular order with no particular fanfare: 
+
+One of our floorboards was doing a pretty good impression of a springy diving board.  Previously we'd 'fixed' this by hiding it under a sofa, but a bit of lounge rearrangement called for a better solution, so we added an extra block to support it.
+
+<Cards
+  images={[
+    { title: "Bit less wobbly to stand on", src: s("floorboard-block") }
+  ]}
+/>
+
+We added a doorknob to the back door to the garden to stop us scraping our knuckles when trying to close it, and added some brass doorknobs to replace the plastic ones on the top floor.
+
+<Cards
+  images={[
+    { title: "Plastic knob 👎", src: s("knob-old") },
+    { title: "Brass 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 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={[
+    { title: "Nice and cosy", src: s("fireplace") }
+  ]}
+/>
+
+
+# Curtain poles
+
+Argh, curtain poles!
+
+In general, we haven't had the best experience with attaching heavy things to our walls. No matter what we tried, the wall plugs would steadily be pulled out of the wall. We tried [little plaster cloths](https://www.wickes.co.uk/Rawlplug-Wet-n-Fix-Repair-Pads---Pack-of-10/p/300747) (useless), we tried matchsticks (slightly better). It worked okayyy, but our main approach was to just not have heavy things on the walls.
+
+But one day we realised our bedroom curtains weren't quite as attached as we would have hoped when they fell off the wall, while we were trying to get to sleep. Argh!
+
+<Cards
+  images={[
+    { title: "Argh!", src: s("curtains-argh1") }
+  ]}
+/>
+
+And, of course, once one plug is pulled out the rest of them all follow suit in fairly short order.
+
+The short term solution was to decamp to the spare room while we tried some heavier duty ways to affix the poles. 
+
+The longer term solution was several weeks of trying out various different combinations of filler and plugs.  Each time waiting, sanding, adding another layer, waiting, testing, sighing/swearing, and trying again.  After much back and forth, we eventually found a more hardcore filler that seemed to work well for us, but we'd also run out of patience with the whole process. So we decided to make extra double sure they wouldn't fall off again we also added metal brackets to share the load among more wall plugs. Finally success. It doesn't look the nicest but at least it has not budged since. 
+
+(pictures of the new curtain pole installation)
+
+Then we found out the spare room curtains were coming off the wall as well. 😡 We used the same heavy-duty filler with those and again, no budging since. Phew!
+
+# Spare Room
+
+Our main progress since our last update was to improve the rest of 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](week1#what-a-week) and [painted it contract white](/week2#the-guest-bedroom-5f) and said ['good enough for now'](/week4#guest-room), with the intention of decorating properly at a later date. 
+
+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.
+
+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, so manual painting it is.
+
+<Cards
+  images={[
+    { title: "Painty painty - with curtain repairs", src: s("spare-paint1") },
+    { title: "Painty painty", src: s("spare-paint1andabit") },
+    { title: "Painty painty", src: s("spare-paint2") },
+    { title: "Painty painty", src: s("spare-paint3") },
+  ]}
+/>
+
+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 the TRV was horizontal rather than vertical. A modern replacement TRV wouldn't line up with the existing pipes, so 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 after was a lot of practising to solder pipe together without leaks. We had also remembered our tips from Simon on 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 stuff supplied in the Baby's First Soldering kit that we'd bought was absolute rubbish. Maybe it's a ruse by Big Solder to get you to hire actual plumbers.
+
+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: "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. 
+
+<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... and there weren't any! We were pretty unnerved 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 with the walls, so Nikki decided to plump for some fancier ones. These are made by the same people as our 'invisible' kitchen island sockets which, whilst lacking invisibility, are really very nice to use. The toggle light switch in particular is very fun to fiddle with.
+
+<Cards
+  images={[
+    { title: "fiddle fiddle fiddle", src: s("spare-sockets") },
+  ]}
+/>
+
+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 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: "Furniture back in", src: s("spare-done1") },
+  ]}
+/>
+
+The new carpet is great and so soft to walk on.
+
+They had to trim a little off the bottoms of the doors to account for the increased carpet thickness so we now have 50% more openable doors! Not that we needed the door between the spare room and office to actually open, but it's nice to have the option. We have a door wedge to keep it shut again.  (It helps people de-clench)
+
+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 in the alcove, extra shelves, mouldings, 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 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. 
+
+See you next time, when we remember.
+
+<NextPrev prev="year2024" />

things.md

@@ -0,0 +1,41 @@
+### Utility
+
+We still haven't fully installed the worktop, but we did install the tap. This removes the motivation to finish the worktop as we can now fully use the sink.
+
+You may remember, back in ancient history when we were installing the cupboards, we mentioned that we were able to use every available centimetre on that wall.
+Whilst it is great for maximising storage, it also makes it difficult to get the washing machine and tumble dryer out to access the tap behind, especially when it's on a wonky tiling job.
+We bought a set of wheels to put the machines on, to wheel them in and out.
+
+## lounge
+
+- moved big mirror to other side of room
+- curtains
+- pictures on walls
+- new radiator install (bedroom too)
+
+## basement
+
+- curtains
+
+## dining room
+
+- nozzy wall hanging with interesting plasterboard fixings
+
+## hallway
+
+- dimmer switches (one needed big repairs)
+
+## utility
+
+- Installed the tap
+- washing machine wheels
+
+## bedroom
+
+- new curtain rail because the old one fell apart
+- new radiators
+
+## other things
+
+- Nikki ran the bath half in ~2 1/2 hours and raised £820 and got a massive ice cream after
+- Cool lights for Nozzy?

yarn.lock

@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 8
+  version: 9
   cacheKey: 10c0
 
 "@ampproject/remapping@npm:^2.2.0":