Update to Nix setup and remove SoFurry links

.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -24,3 +24,7 @@ pnpm-debug.log*
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/settings.json
+
+# Nix files
+.direnv/
+result/

README.md

@@ -17,15 +17,16 @@ For attributions, see [`licenses.toml`](src/data/licenses.toml).
 ```bash
 git clone https://git.badmanners.xyz/badmanners/gallery.badmanners.xyz
 cd gallery.badmanners.xyz
-npm install
+direnv allow
+bun install
 ```
 
 ### Local development
 
 ```bash
-npm run dev       # Start development server (quit with Ctrl-C)
+bun dev       # Start development server (quit with Ctrl-C)
-npm run sync      # Rebuild types from Astro config and src/content/ files
+bun sync      # Rebuild types from Astro config and src/content/ files
-npm run prettier  # Prettier formatting
+bun prettier  # Prettier formatting
 ```
 
 ### Configuration
@@ -42,13 +43,13 @@ The following optional environment variables can be set within a `.env` file:
 Requires `libreoffice` to be installed and in your path.
 
 ```bash
-npm run export-story -- -o ~/Documents/TO_UPLOAD slug-for-story-to-export
+bun export-story -- -o ~/Documents/TO_UPLOAD slug-for-story-to-export
 ```
 
 ### Build and deploy to remote
 
 ```bash
-npm run build
+bun run build
 ```
 
 Then, if you're using rsync, after configuring the `gallerybm` host (or the name of your choosing) in `~/.ssh/config`, you can use a command like:

flake.lock

@@ -0,0 +1,60 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1768032153,
+        "narHash": "sha256-6kD1MdY9fsE6FgSwdnx29hdH2UcBKs3/+JJleMShuJg=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3146c6aa9995e7351a398e17470e15305e6e18ff",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixpkgs-unstable",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,30 @@
+{
+  description = "gallery.badmanners.xyz";
+
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs =
+    {
+      nixpkgs,
+      flake-utils,
+      ...
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        flakedPkgs = pkgs;
+        devShells.default = pkgs.mkShell {
+          packages = [
+            pkgs.bun
+            pkgs.rsync
+          ];
+        };
+      }
+    );
+}

package.json

@@ -46,9 +46,9 @@
     "@types/sanitize-html": "^2.13.0",
     "commander": "^12.1.0",
     "fetch-retry": "^6.0.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.7.4",
     "prettier-plugin-astro": "^0.14.1",
-    "prettier-plugin-tailwindcss": "^0.6.8",
+    "prettier-plugin-tailwindcss": "^0.6.14",
     "sirv": "^3.0.0",
     "tsx": "^4.19.1"
   }

src/components/ExternalPosts.astro

@@ -1,7 +1,7 @@
 ---
 import type { Posts } from "src/content.config";
 import { t, type Lang } from "@i18n";
-import { IconEkasPortal, IconFurAffinity, IconInkbunny, IconSoFurry, IconWeasyl } from "./icons/brands";
+import { IconEkasPortal, IconFurAffinity, IconInkbunny, IconWeasyl } from "./icons/brands";
 
 type Props = {
   lang: Lang;
@@ -45,14 +45,14 @@ const isVisible = eka || furaffinity || inkbunny || sofurry || weasyl;
               </a>
             </li>
           ) : null}
-          {sofurry ? (
+          <!-- {sofurry ? (
             <li class="min-w-12 grow">
               <a class="u-syndication text-link flex w-full flex-col" href={sofurry.link} target="_blank">
                 <IconSoFurry class="mx-auto" width="2rem" height="2rem" />
                 <span class="text-center text-xs">{t(lang, "published_content/syndication_sofurry")}</span>
               </a>
             </li>
-          ) : null}
+          ) : null} -->
           {weasyl ? (
             <li class="min-w-12 grow">
               <a class="u-syndication text-link flex w-full flex-col" href={weasyl.link} target="_blank">

src/data/blog/taken-in-breakdown.mdx

@@ -53,7 +53,8 @@ If you're up for this non-linear read, then I hope you enjoy this sneak-peek int
   id={getCount()}
   title="I actually had to rewrite most of the intro from scratch, it got too wordy and just boring to read. For a PoV segment, I thought something less detailed and to-the-point was more fun."
   text="Clank! Shuffle! Crunch!"
-/> The sounds outside are too loud to be stopped by the walls in your room, and you jolt awake.
+/>
+The sounds outside are too loud to be stopped by the walls in your room, and you jolt awake.
 
 Ugh, and you were finally in deep sleep...
 
@@ -61,7 +62,8 @@ Ugh, and you were finally in deep sleep...
   id={getCount()}
   title="With PoV stuff, even details like 'when you wake up in the middle of the night' are better left ambiguous."
   text="You check the time, and it's still too early to be out of bed."
-/> The sun hasn't even risen yet. But the commotion continues outside, forcing you to get up and investigate.
+/>
+The sun hasn't even risen yet. But the commotion continues outside, forcing you to get up and investigate.
 
 It's probably some wild animal messing with the trash, you think to yourself. <NoteTooltip id={getCount()} title="Again, leaving 'what the place is' ambiguous so it could be a house, an apartment, etc." text="You navigate through your place in the dark and out the door" />, too tired to worry about your own safety. You don't even bother to lock it behind you as you leave.
 
@@ -185,7 +187,8 @@ Nevertheless, the creepy-looking canid starts walking – it's easy to tell when
   id={getCount()}
   title="As is revealed later, after voring the PoV, Sam walks through their half-open door and lies on their bed."
   text="Suddenly, the movement stops, and you are flipped against your side. The whole place shifts as the ravenous animal lies down on his side, keeping his extremely bulged out stomach against a soft surface."
-/> You can hear when he starts purring like a cat, rumbling the walls around you in his pleased state.
+/>
+You can hear when he starts purring like a cat, rumbling the walls around you in his pleased state.
 
 As if all of this already isn't demeaning enough, something outside of his stomach starts pressing and rubbing the wall against you. It's too small and long to be one of his paws, and it makes a subtle 'shlick... shlick...' noise each time that it presses into his fur... <NoteTooltip id={getCount()} title="Also another self-indulgent image I wanted to include. I love the mix of possessiveness and affection when a pred licks their prey-filled belly." text="Is he licking his own belly?" /> Why would he do such a thing? Is he trying to comfort you...?
 
@@ -225,7 +228,8 @@ Knowing that you aren't being digested is a huge relief but it doesn't change yo
   id={getCount()}
   title="I haven't really done a lot of research into the gastrointestinal system for this story, so the descriptions might not be accurate. But since I was committed to the full tour part, I wanted to make each part different visually to show the progress throughout the story."
   text="More and more of these new walls, taut and smooth, replace the cushy folds from before."
-/> Since your predator is about your size, there isn't much physical space in here for you. It feels less like you're
+/>
+Since your predator is about your size, there isn't much physical space in here for you. It feels less like you're
 actually slipping deeper, and more like his whole body is expanding and contracting, readjusting itself around you.
 
 Like the rest of his anatomy so far, the snug spot is stretched way beyond an ordinary creature's capacity. The walls of the duodenum, much tighter and more uniform, are coated in that same pervasive slime from before. Overshadowed by the myriad sounds of his gastrointestinal system, you hear something akin to a purr. Your captor is surely having pleasant dreams with the large mass hidden within him, adding even more insult to injury.
@@ -242,7 +246,8 @@ It's still a cramped and uncomfortable fit. More of the sluices slobber you up,
   id={getCount()}
   title="I pictured that it wouldn't be the first time feral!Sam has passed a large prey through his body - which explains his actions after he wakes up, later on."
   text="The tunnel groans, likely from being filled past its any reasonable limit with something that shouldn't be there – a living being, big and squirmy."
-/> The fact that you are even conscious to experience all of this is a tragic miracle.
+/>
+The fact that you are even conscious to experience all of this is a tragic miracle.
 
 With enough back and forth, the texture changes around your feet. Instead of smooth, it's bumpy and soft, like a bunch of squishy buds. Fidgeting like this is a tiring process, but you don't imagine yourself getting any rest as long as you're surrounded by the hostile creature. You slip into the small intestines, and instead of muscles lined with gooey mucus, there are many villi brushing against your limbs.
 
@@ -274,8 +279,9 @@ Your surroundings move again, and then the phone goes silent. What?! Did he–?
   id={getCount()}
   title="Feral or no, he does enjoy having the prey in his intestines. As he wakes up to find his prey deeper than before, he decides to enjoy himself with this nice morning surprise, not really minding that things didn't go to plan."
   text="The feral doesn't reply, except by slumping his weight onto you. It makes things harder and more flustering. He simultaneously pants like a dog and purrs like a cat, seemingly enjoying your mass lodged deep in his intestines."
-/> Thankfully, the walls continue to gently squeeze you further out rather than in, and with the promise of freedom
+/>
-lurking so closely, you keep squirming against his tight flesh.
+Thankfully, the walls continue to gently squeeze you further out rather than in, and with the promise of freedom lurking
+so closely, you keep squirming against his tight flesh.
 
 Finally, you feel your ankles brush against another sphincter. It's gotta be the bend leading to his large intestines! Unfortunately, it seems closed off, thanks to the tunnel being pinched by him lying on his belly. No matter how much you struggle, there's no way you can make any headway without his cooperation.
 

src/data/tags.yaml

@@ -59,11 +59,7 @@
       description: Scenarios where at least one of the predators is a woman and/or female-presenting.
     - name: non-binary predator
       description: Scenarios where at least one of the predators has a non-binary gender expression, be they genderless/agender, intersex, androgynous, gender-fluid, non-binary and/or non-binary-presenting, et cetera, regardless of undergoing or having undergone gender transition or not.
-    - name:
+    - name: { en: ambiguous gender predator, tok: jan pi wawa mute li meli anu mije }
-        {
-          en: ambiguous gender predator,
-          tok: jan pi wawa mute li meli anu mije,
-        }
       description:
         en: Scenarios where the gender of at least one of the predators is left ambiguous.
         tok: jan pi moku musi pi wawa mute la toki tan meli anu mije anu tonsi li lon ala.
@@ -79,8 +75,7 @@
         - female prey
     - name: non-binary prey
       description: Scenarios where at least one of the predators has a non-binary gender expression, be they genderless/agender, intersex, androgynous, gender-fluid, non-binary and/or non-binary-presenting, et cetera, regardless of undergoing or having undergone gender transition or not.
-    - name:
+    - name: { en: ambiguous gender prey, tok: jan pi wawa lili li meli anu mije }
-        { en: ambiguous gender prey, tok: jan pi wawa lili li meli anu mije }
       description:
         en: Scenarios where the gender of at least one of the prey is left ambiguous.
         tok: jan pi moku musi pi wawa lili la toki tan meli anu mije anu tonsi li lon ala.
@@ -118,8 +113,7 @@
       description: Scenarios where at least one of the prey participates in vore willingly.
     - name: semi-willing prey
       description: Scenarios where the willingness of at least one of the prey might be partial, oscillating between willing and unwilling, somewhere in-between, or ambiguous.
-    - name:
+    - name: { en: unwilling prey, tok: jan pi wawa lili li wile ala e moku musi }
-        { en: unwilling prey, tok: jan pi wawa lili li wile ala e moku musi }
       description:
         en: Scenarios where at least one of the prey participates in vore unwillingly.
         tok: jan pi moku musi pi wawa lili la jan li wile ala e moku musi.

src/styles/fonts.css

@@ -5,7 +5,8 @@
   font-display: block;
   font-weight: 100 900;
   src: url(/fonts/noto-sans-latin-ext-wght-normal.woff2) format("woff2-variations");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
+  unicode-range:
+    U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
     U+2C60-2C7F, U+A720-A7FF;
 }
 /* noto-sans-latin-wght-normal */
@@ -15,8 +16,9 @@
   font-display: block;
   font-weight: 100 900;
   src: url(/fonts/noto-sans-latin-wght-normal.woff2) format("woff2-variations");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
+  unicode-range:
-    U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074,
+    U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* noto-sans-latin-ext-wght-italic */
 @font-face {
@@ -25,7 +27,8 @@
   font-display: block;
   font-weight: 100 900;
   src: url(/fonts/noto-sans-latin-ext-wght-italic.woff2) format("woff2-variations");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
+  unicode-range:
+    U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
     U+2C60-2C7F, U+A720-A7FF;
 }
 /* noto-sans-latin-wght-italic */
@@ -35,8 +38,9 @@
   font-display: block;
   font-weight: 100 900;
   src: url(/fonts/noto-sans-latin-wght-italic.woff2) format("woff2-variations");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
+  unicode-range:
-    U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074,
+    U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 
 /* noto-serif-latin-ext-wght-normal */
@@ -46,7 +50,8 @@
   font-display: block;
   font-weight: 100 900;
   src: url(/fonts/noto-serif-latin-ext-wght-normal.woff2) format("woff2-variations");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
+  unicode-range:
+    U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
     U+2C60-2C7F, U+A720-A7FF;
 }
 /* noto-serif-latin-wght-normal */
@@ -56,8 +61,9 @@
   font-display: block;
   font-weight: 100 900;
   src: url(/fonts/noto-serif-latin-wght-normal.woff2) format("woff2-variations");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
+  unicode-range:
-    U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074,
+    U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* noto-serif-latin-ext-wght-italic */
 @font-face {
@@ -66,7 +72,8 @@
   font-display: block;
   font-weight: 100 900;
   src: url(/fonts/noto-serif-latin-ext-wght-italic.woff2) format("woff2-variations");
-  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
+  unicode-range:
+    U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113,
     U+2C60-2C7F, U+A720-A7FF;
 }
 /* noto-serif-latin-wght-italic */
@@ -76,6 +83,7 @@
   font-display: block;
   font-weight: 100 900;
   src: url(/fonts/noto-serif-latin-wght-italic.woff2) format("woff2-variations");
-  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329,
+  unicode-range:
-    U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074,
+    U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }