pkgs/topiary-nu: rewrite, simplify

flake.lock

···
         "sops-nix": "sops-nix",
         "ssh-keys": "ssh-keys",
         "starship-jj": "starship-jj",
-        "topiary-nushell": "topiary-nushell",
-        "tree-sitter-nu": "tree-sitter-nu",
         "zjstatus": "zjstatus"
       }
     },
···
       "original": {
         "owner": "nix-systems",
         "repo": "default",
-        "type": "github"
-      }
-    },
-    "topiary-nushell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1764637932,
-        "narHash": "sha256-2DOqs/zIDIS/Fdy36txfncwpetrXxXY6RcQ0v+09cIc=",
-        "owner": "blindFS",
-        "repo": "topiary-nushell",
-        "rev": "71460ddb383a83286437ea951f946131ccca7e3f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "blindFS",
-        "repo": "topiary-nushell",
-        "type": "github"
-      }
-    },
-    "tree-sitter-nu": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1765660476,
-        "narHash": "sha256-h02kb3VxSK/fxQENtj2yaRmAQ5I8rt5s5R8VrWOQWeo=",
-        "owner": "nushell",
-        "repo": "tree-sitter-nu",
-        "rev": "4c149627cc592560f77ead1c384e27ec85926407",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nushell",
-        "repo": "tree-sitter-nu",
         "type": "github"
       }
     },

flake.nix

···
       url = "github:karitham/knixpkgs";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    tree-sitter-nu = {
-      url = "github:nushell/tree-sitter-nu";
-      flake = false;
-    };
-    topiary-nushell = {
-      url = "github:blindFS/topiary-nushell";
-      flake = false;
-    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";

modules/default.nix

···
       packages = {
         pokego = pkgs.callPackage ./pkgs/pokego.nix { };
         http-nu = pkgs.callPackage ./pkgs/http-nu.nix { };
-        topiary-nu = pkgs.callPackage ./pkgs/topiary-nu.nix { inherit (inputs) tree-sitter-nu topiary-nushell; };
+        topiary-nu = pkgs.callPackage ./pkgs/topiary-nu.nix { };
         atproto-lastfm-importer = pkgs.callPackage ./pkgs/atproto-lastfm-importer.nix { };
         multi-scrobbler = pkgs.callPackage ./pkgs/multi-scrobbler.nix { };
 

modules/pkgs/topiary-nu.nix

···
 {
   lib,
-  stdenv,
-  tree-sitter,
+  writeShellApplication,
   topiary,
-  makeWrapper,
-  runCommand,
-  nodejs,
-  tree-sitter-nu,
-  topiary-nushell,
+  nushell,
+  tree-sitter-grammars,
+  writeText,
+  linkFarm,
+  pkgs, # otherwise lint issue because `fetchurl` is a builtin
 }:
 let
-  treeSitterNu = stdenv.mkDerivation {
-    name = "tree-sitter-nu";
-    src = tree-sitter-nu;
-    buildInputs = [
-      tree-sitter
-      nodejs
-    ];
-    buildPhase = ''
-      tree-sitter generate
-      gcc -o parser.so -Isrc src/parser.c src/scanner.c -shared -fPIC -O2
-    '';
-    installPhase = ''
-      mkdir -p $out
-      cp parser.so $out/parser
-    '';
-  };
-
-  configDir = stdenv.mkDerivation {
-    name = "topiary-nu-config";
-    src = topiary-nushell;
-
-    buildPhase = ''
-      mkdir -p $out
-      cat <<EOF > $out/languages.ncl
-      {
-        languages = {
-          nu = {
-            extensions = ["nu"],
-            grammar.source.path = "${treeSitterNu}/parser"
-          },
-        },
-      }
-      EOF
-    '';
-
-    installPhase = ''
-      cp -r $src/languages $out
-    '';
+  langDir = linkFarm "topiary-nu-languages" [
+    {
+      name = "nu.scm";
+      path = pkgs.fetchurl {
+        url = "https://raw.githubusercontent.com/blindFS/topiary-nushell/main/languages/nu.scm";
+        hash = "sha256-2o7oIFkxuy8u8HNkiEzNnoKekmwaxClCWQnQg3rgVeU=";
+      };
+    }
+  ];
+  configFile = writeText "languages.json" (
+    builtins.toJSON {
+      languages = {
+        nu = {
+          extensions = [ "nu" ];
+          grammar.source.path = "${tree-sitter-grammars.tree-sitter-nu}/parser";
+        };
+      };
+    }
+  );
+in
+writeShellApplication {
+  name = "topiary-nu";
+  runtimeInputs = [
+    nushell
+    topiary
+  ];
+  runtimeEnv = {
+    TOPIARY_CONFIG_FILE = configFile;
+    TOPIARY_LANGUAGE_DIR = langDir;
   };
-in
-runCommand "topiary-nu"
-  {
-    buildInputs = [ makeWrapper ];
-    meta = {
-      mainProgram = "topiary-nu";
-    };
-  }
-  ''
-    mkdir -p $out/bin
-    makeWrapper ${lib.getExe topiary} $out/bin/topiary-nu \
-      --set TOPIARY_LANGUAGE_DIR "${configDir}/languages" \
-      --set TOPIARY_CONFIG_FILE "${configDir}/languages.ncl"
-  ''
+  text = ''
+    ${lib.getExe topiary} "$@"
+  '';
+}