From bb36a1b63d7d202bfb09fa5b5e191a6f4c7f35f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= <msyds@deertopia.net>
Date: Tue, 19 May 2026 20:04:53 -0600
Subject: [PATCH] one flake }:)

---
 flake.nix           |  3 ++
 runtime/default.nix |  2 +-
 runtime/flake.lock  | 87 ---------------------------------------------
 runtime/flake.nix   | 67 ----------------------------------
 4 files changed, 4 insertions(+), 155 deletions(-)
 delete mode 100644 runtime/flake.lock
 delete mode 100644 runtime/flake.nix

diff --git a/flake.nix b/flake.nix
index 3876323..e36c155 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,6 +28,9 @@
             compiler-nix-name = "ghc912";
             shell = {
               withHoogle = true;
+              inputsFrom = [
+                self.packages.${final.stdenv.hostPlatform.system}.runtime
+              ];
               tools = {
                 cabal = {};
                 haskell-language-server = {};
diff --git a/runtime/default.nix b/runtime/default.nix
index aa34d69..d89519b 100644
--- a/runtime/default.nix
+++ b/runtime/default.nix
@@ -6,7 +6,7 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "gyehoek";
+  pname = "gyehoek-runtime";
   version = "0.0.1";
   src = ./.;
   cargoLock = {
diff --git a/runtime/flake.lock b/runtime/flake.lock
deleted file mode 100644
index 6b27ddd..0000000
--- a/runtime/flake.lock
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "nodes": {
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1779185128,
-        "narHash": "sha256-Kl2bkmwZJD3n2KWDxuIlturZ7emqRK+anpD1LmDwpmY=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "b7bd9323fe26a3b4f4bddbb2c2a1dacabced2f88",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "fenix": "fenix",
-        "nixpkgs": "nixpkgs",
-        "sydpkgs": "sydpkgs"
-      }
-    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1779074864,
-        "narHash": "sha256-0M3WqsWmtXmv9Ev/vnFfCHosWvISDwiuuhQ104UO3CI=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "cdfe408d4b436e806ff525cb3e67588a6a009ed1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
-    "sydpkgs": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1778962331,
-        "narHash": "sha256-qMokSV7hsWYiDCkkBGyG0aD4Ds3JLzJzJ0Cp9f/spJU=",
-        "ref": "refs/heads/main",
-        "rev": "59d3a471cd960f9d1f6c645a4fe578a670848e9d",
-        "revCount": 41,
-        "type": "git",
-        "url": "https://git.deertopia.net/msyds/sydpkgs"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.deertopia.net/msyds/sydpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/runtime/flake.nix b/runtime/flake.nix
deleted file mode 100644
index bd96b49..0000000
--- a/runtime/flake.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    fenix = {
-      url = "github:nix-community/fenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    sydpkgs = {
-      url = "git+https://git.deertopia.net/msyds/sydpkgs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = { self, nixpkgs, fenix, sydpkgs, ... }:
-  let
-    supportedSystems = [
-      "aarch64-darwin" "aarch64-linux"
-      "x86_64-darwin" "x86_64-linux"
-    ];
-
-    each-system = f: nixpkgs.lib.genAttrs supportedSystems (system: f rec {
-      pkgs = import nixpkgs {
-        inherit system overlays;
-      };
-      inherit (pkgs) lib;
-      inherit system;
-    });
-
-    overlays = [
-      (final: prev: {
-        inherit (sydpkgs.packages.${final.stdenv.hostPlatform.system})
-          bdwgc;
-      })
-      fenix.overlays.default
-    ];
-
-  in {
-    _pkgs = each-system ({ pkgs, ... }: pkgs);
-
-    packages = each-system ({ pkgs, ... }: {
-      default = pkgs.callPackage ./. {};
-    });
-
-    devShells = each-system ({ pkgs, lib, ... }: {
-      default = pkgs.mkShell {
-        packages = [
-          pkgs.pkg-config
-          pkgs.bdwgc
-          (pkgs.fenix.complete.withComponents [
-            "cargo" "clippy" "rust-src" "rustc" "rustfmt"
-          ])
-          pkgs.rust-analyzer-nightly
-          pkgs.cmake
-        ];
-      };
-    });
-  };
-
-  nixConfig = {
-    extra-substituters = [
-      "https://fenix.cachix.org"
-    ];
-    extra-trusted-public-keys = [
-      "fenix.cachix.org-1:ecJhr+RdYEdcVgUkjruiYhjbBloIEGov7bos90cZi0Q="
-    ];
-  };
-}