From 187a61871a5976e8100f10d9a8aa171afd8dcf19 Mon Sep 17 00:00:00 2001 From: Nate Meyer <672246+notnmeyer@users.noreply.github.com> Date: Sat, 20 Jun 2026 19:29:24 -0700 Subject: [PATCH] swap nix for mise --- .envrc | 1 - .gitignore | 1 - mise.toml | 11 +++++++++++ shell.nix | 17 ----------------- tasks.toml | 2 +- 5 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 .envrc create mode 100644 mise.toml delete mode 100644 shell.nix diff --git a/.envrc b/.envrc deleted file mode 100644 index 1d953f4..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use nix diff --git a/.gitignore b/.gitignore index 558634e..7ce83e5 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,4 @@ go.work dist/ .env -.direnv .DS_Store diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..6d3ca41 --- /dev/null +++ b/mise.toml @@ -0,0 +1,11 @@ +[tools] +go = "1.24" +goreleaser = "latest" +"go:github.com/go-delve/delve/cmd/dlv" = "latest" +"go:golang.org/x/tools/gopls" = "latest" +"go:github.com/spf13/cobra-cli" = "latest" + +# used by the `build:demo` task. ttyd has no prebuilt macOS binary, so on +# macOS install it separately: `brew install ttyd` +ffmpeg = "latest" +vhs = "latest" diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 2e037e7..0000000 --- a/shell.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs ? import (fetchTarball "channel:nixos-unstable") {} }: - -pkgs.mkShell { - packages = with pkgs; [ - delve - go_1_24 - gopls - goreleaser - ]; - - shellHook = '' - go install github.com/spf13/cobra-cli@latest - ''; - - nativeBuildInputs = [ pkgs.gcc pkgs.pkg-config ]; - buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.xorg.libX11 ]; -} diff --git a/tasks.toml b/tasks.toml index 7b6a6c9..dc8066e 100644 --- a/tasks.toml +++ b/tasks.toml @@ -6,7 +6,7 @@ deps = [["deps"]] cmds = ["go build -o dist/daylog ./main.go {{.CLI_ARGS}}"] [tasks."build:demo"] -cmds = ["nix-shell -p ffmpeg ttyd vhs --run \"vhs demo/demo.tape\""] +cmds = ["vhs demo/demo.tape"] [tasks.run] cmds = ["go run main.go {{.CLI_ARGS}}"]