Swap to my more modern nixified setups

Author: mattrobenolt

.github/workflows/main.yml

@@ -11,37 +11,35 @@ jobs:
   test:
     strategy:
       matrix:
-        go: ['1.24', '1.25']
+        go: ['go124', 'go125']
         os: [ubuntu, macos]
     runs-on: ${{ matrix.os }}-latest
-    name: test (go${{ matrix.go }}-${{ matrix.os }})
+    name: test (${{ matrix.go }}-${{ matrix.os }})
     steps:
       - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version: ${{ matrix.go }}
-      - run: go mod download
-      - run: go build -v
-      - run: make test
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - run: nix develop .#${{ matrix.go }} --command go mod download
+      - run: nix develop .#${{ matrix.go }} --command go build -v
+      - run: nix develop .#${{ matrix.go }} --command just test
 
   test-race:
     strategy:
       matrix:
-        go: ['1.24', '1.25']
+        go: ['go124', 'go125']
         os: [ubuntu, macos]
     runs-on: ${{ matrix.os }}-latest
-    name: test-race (go${{ matrix.go }}-${{ matrix.os }})
+    name: test-race (${{ matrix.go }}-${{ matrix.os }})
     steps:
       - uses: actions/checkout@v6
-      - uses: actions/setup-go@v6
-        with:
-          go-version: ${{ matrix.go }}
-      - run: make test-race
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - run: nix develop .#${{ matrix.go }} --command just test-race
 
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
-      - uses: golangci/golangci-lint-action@v7
-        with:
-          version: v2.0.2
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - run: nix develop .#go125 --command just lint

Justfile

@@ -0,0 +1,39 @@
+TEST_FLAGS := "--rerun-fails=5 --packages=./... --format testname"
+
+default:
+    @just --list
+
+# Format Go code
+fmt: fmt-go
+
+# Format Go code with golangci-lint
+fmt-go:
+    golangci-lint fmt
+
+# Run linter
+lint:
+    golangci-lint run --show-stats
+
+# Start documentation server
+docs:
+    go doc -http
+
+# Run tests
+test:
+    GOEXPERIMENT=synctest gotestsum {{ TEST_FLAGS }}
+
+# Run tests with race detector
+test-race:
+    GOEXPERIMENT=synctest gotestsum {{ TEST_FLAGS }} -- -race
+
+# Run tests in watch mode
+test-watch:
+    GOEXPERIMENT=synctest gotestsum --watch {{ TEST_FLAGS }}
+
+# Update benchmark results
+update-benchmarks:
+    go -C benchmarks/ test -v -bench=. -count=10 | tee compare.txt
+    go run golang.org/x/perf/cmd/benchstat@latest -col /mod compare.txt | tee benchmarks.txt
+    echo >> benchmarks.txt
+    go test -v . -run=xxx -bench=. | tee -a benchmarks.txt
+    rm compare.txt

Makefile

@@ -9,28 +9,41 @@
   };
 
   outputs =
-    { nixpkgs, flake-utils, matt, ... }:
+    {
+      nixpkgs,
+      flake-utils,
+      matt,
+      ...
+    }:
     flake-utils.lib.eachDefaultSystem (
       system:
       let
         pkgs = import nixpkgs {
           inherit system;
           overlays = [ matt.overlays.default ];
         };
+
+        # Common dev tools for all shells
+        devTools = with pkgs; [
+          just
+          gopls
+          golangci-lint
+          gotestsum
+        ];
+
+        mkGoShell =
+          goPackage:
+          pkgs.mkShell {
+            packages = [ goPackage ] ++ devTools;
+          };
       in
       {
-        devShells.default = pkgs.mkShell {
-          packages = with pkgs; [
-            go-bin_1_25
-            gopls
-            just
-            gnumake
-          ];
+        # Default shell uses Go 1.25
+        devShells.default = mkGoShell pkgs.go-bin_1_25;
 
-          shellHook = ''
-            export PATH="$PWD/bin:$PATH"
-          '';
-        };
+        # Explicit shells for each Go version
+        devShells.go124 = mkGoShell pkgs.go_1_24;
+        devShells.go125 = mkGoShell pkgs.go-bin_1_25;
       }
     );
 }