diff --git a/flake.lock b/flake.lock index ce5e0080..c946e3bb 100644 --- a/flake.lock +++ b/flake.lock @@ -608,17 +608,17 @@ "zet": { "flake": false, "locked": { - "lastModified": 1758576585, - "narHash": "sha256-hWQE45nFaSN8agYMP8xt5kaUMfBXVj5k9zInZNs/xAI=", + "lastModified": 1758885848, + "narHash": "sha256-2RqWy1s4O8eoPNfx6t6SCBGqb1Z5JIPFXQFpfvfbsVI=", "ref": "refs/heads/main", - "rev": "23505f6c31c7cc903e63621b52b5f92eea1facc5", - "revCount": 35, + "rev": "06167c4b67bb6146819ff4bb0e4a1ecdde9882bf", + "revCount": 51, "type": "git", - "url": "https://code.oliverdavies.uk/opdavies/zet" + "url": "https://code.oliverdavies.uk/opdavies/cmd-zet" }, "original": { "type": "git", - "url": "https://code.oliverdavies.uk/opdavies/zet" + "url": "https://code.oliverdavies.uk/opdavies/cmd-zet" } } }, diff --git a/flake.nix b/flake.nix index 25b1bf65..49ca8b78 100644 --- a/flake.nix +++ b/flake.nix @@ -90,7 +90,7 @@ zet = { flake = false; - url = "git+https://code.oliverdavies.uk/opdavies/zet"; + url = "git+https://code.oliverdavies.uk/opdavies/cmd-zet"; }; }; diff --git a/modules/scripts/zet.nix b/modules/scripts/zet.nix index 4630d2fb..d8fb54d2 100644 --- a/modules/scripts/zet.nix +++ b/modules/scripts/zet.nix @@ -7,19 +7,20 @@ in perSystem = { pkgs, ... }: { - packages.${name} = pkgs.writeShellApplication { + packages.${name} = pkgs.buildGoModule { inherit name; - bashOptions = [ "pipefail" ]; - runtimeInputs = with pkgs; [ - bashInteractive - coreutils - fzf git ]; - text = builtins.readFile "${inputs.zet}/${name}"; + src = inputs.zet; + + vendorHash = "sha256-pprnK2JKmPuR3Q+F8+vMDEdowlb3oX4BOOzW8NGOqgs="; + + postInstall = '' + mv $out/bin/cmd-zet $out/bin/zet + ''; }; };