nix

default.nix

@@ -1,27 +1,9 @@
-{ mkCljBin
+{ rustPlatform
-, fake-git
-, lib
-, mkGraalBin
 }:
 
-let
+rustPlatform.buildRustPackage (finalAttrs: {
-  # mkCljBin sans fake-git. We don't need it, and I don't want it in
+  pname = "wiktlarp-tf2";
-  # my dev shell.
-  mkCljBin' = args: (mkCljBin args).overrideAttrs (final: prev: {
-    nativeBuildInputs =
-      builtins.filter
-        # A possibly-sketchy predicate, lol.
-        (x: x != fake-git)
-        prev.nativeBuildInputs;
-  });
-
-  # bin-path = lib.makeBinPath [
-  #   sqlite3
-  # ];
-in mkCljBin' {
-  name = "wiktlarp";
   version = "0.1.0";
-  projectSrc = lib.cleanSource ./.;
+  src = ./.;
-  lockfile = ./deps-lock.json;
+  cargoLock.lockFile = ./Cargo.lock;
-  main-ns = "wiktlarp.main";
+})
-}

flake.lock

@@ -1,115 +1,6 @@
 {
   "nodes": {
-    "clj-nix": {
-      "inputs": {
-        "devshell": "devshell",
-        "nix-fetcher-data": "nix-fetcher-data",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1773151887,
-        "narHash": "sha256-YUiehwe2iTlwYSrnJ1pcw7KDNX+U42xlTx/2k/mo0P8=",
-        "owner": "jlesquembre",
-        "repo": "clj-nix",
-        "rev": "27dac4466c9d3939f6a4925bc09e0cb1d8f32d9c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jlesquembre",
-        "repo": "clj-nix",
-        "type": "github"
-      }
-    },
-    "devshell": {
-      "inputs": {
-        "nixpkgs": [
-          "clj-nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768818222,
-        "narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1719745305,
-        "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "nix-fetcher-data": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "clj-nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1755022803,
-        "narHash": "sha256-/QtBdVfZlrRJW5enUoWlBE2wrLXJBMJ45X0rZh0jiaU=",
-        "owner": "jlesquembre",
-        "repo": "nix-fetcher-data",
-        "rev": "9da3926b1459d6ff15268072d1c51351b82811b9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jlesquembre",
-        "repo": "nix-fetcher-data",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1772773019,
-        "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1717284937,
-        "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1775095191,
         "narHash": "sha256-CsqRiYbgQyv01LS0NlC7shwzhDhjNDQSrhBX8VuD3nM=",
@@ -127,29 +18,7 @@
     },
     "root": {
       "inputs": {
-        "clj-nix": "clj-nix",
+        "nixpkgs": "nixpkgs"
-        "nixpkgs": "nixpkgs_2",
-        "sydpkgs": "sydpkgs"
-      }
-    },
-    "sydpkgs": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1775943619,
-        "narHash": "sha256-UwowTI+MSA4SD+Oebxnj02vAou8GNjvZYrCQBwKe5q0=",
-        "ref": "refs/heads/main",
-        "rev": "e44c957573baa6a196e8de107cfc5bba31caf29a",
-        "revCount": 39,
-        "type": "git",
-        "url": "https://git.deertopia.net/msyds/sydpkgs"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.deertopia.net/msyds/sydpkgs"
       }
     }
   },

flake.nix

@@ -1,14 +1,9 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    clj-nix.url = "github:jlesquembre/clj-nix";
-    sydpkgs = {
-      url = "git+https://git.deertopia.net/msyds/sydpkgs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
-  outputs = { self, nixpkgs, clj-nix, ... }@inputs:
+  outputs = { self, nixpkgs, ... }@inputs:
     let
       supportedSystems = [
         "aarch64-darwin"
@@ -20,9 +15,6 @@
       each-system = f: nixpkgs.lib.genAttrs supportedSystems (system: f rec {
 	pkgs = import nixpkgs {
 	  inherit system;
-	  overlays = [
-	    clj-nix.overlays.default
-	  ];
 	};
 	inherit (pkgs) lib;
         inherit system;
@@ -38,13 +30,12 @@
 
       devShells = each-system ({ pkgs, system, ... }: {
 	default = pkgs.mkShell {
-          inputsFrom = [ self.packages.${system}.db ];
+          inputsFrom = [
+            self.packages.${system}.db
+            self.packages.${system}.default
+          ];
           DATABASE_URL = "words.db";
 	  packages = with pkgs; [
-	    zprint
-	    clojure
-	    babashka
-            python3
             (sqlite.override { interactive = true; })
             python314Packages.wiktextract
             sqlite-web