Merge pull request #430 from numtide/fix/miscellaneous

fix/miscellaneous

.envrc

@@ -1,11 +1,6 @@
 dotenv
 dotenv_if_exists .env.local
 
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
-fi
-
-watch_file flake.nix
 watch_file nix/devshell.nix
 
 use flake

.goreleaser.yaml

@@ -18,7 +18,7 @@ builds:
     - env:
           - CGO_ENABLED=0
       ldflags:
-          - -s -w -X git.numtide.com/numtide/treefmt/build.Version=v{{.Version}}
+          - -s -w -X github.com/numtide/treefmt/build.Version=v{{.Version}}
       goos:
           - linux
           - darwin

cache/cache.go

@@ -9,10 +9,10 @@ import (
 	"runtime"
 	"time"
 
-	"git.numtide.com/numtide/treefmt/stats"
+	"github.com/numtide/treefmt/stats"
 
-	"git.numtide.com/numtide/treefmt/format"
-	"git.numtide.com/numtide/treefmt/walk"
+	"github.com/numtide/treefmt/format"
+	"github.com/numtide/treefmt/walk"
 
 	"github.com/charmbracelet/log"
 

cli/cli.go

@@ -5,10 +5,10 @@ import (
 
 	"github.com/gobwas/glob"
 
-	"git.numtide.com/numtide/treefmt/format"
-	"git.numtide.com/numtide/treefmt/walk"
 	"github.com/alecthomas/kong"
 	"github.com/charmbracelet/log"
+	"github.com/numtide/treefmt/format"
+	"github.com/numtide/treefmt/walk"
 )
 
 func New() *Format {

cli/format.go

@@ -14,13 +14,13 @@ import (
 	"syscall"
 	"time"
 
-	"git.numtide.com/numtide/treefmt/format"
-	"git.numtide.com/numtide/treefmt/stats"
+	"github.com/numtide/treefmt/format"
+	"github.com/numtide/treefmt/stats"
 	"mvdan.cc/sh/v3/expand"
 
-	"git.numtide.com/numtide/treefmt/cache"
-	"git.numtide.com/numtide/treefmt/config"
-	"git.numtide.com/numtide/treefmt/walk"
+	"github.com/numtide/treefmt/cache"
+	"github.com/numtide/treefmt/config"
+	"github.com/numtide/treefmt/walk"
 
 	"github.com/charmbracelet/log"
 	"golang.org/x/sync/errgroup"

cli/format_test.go

@@ -11,9 +11,9 @@ import (
 	"testing"
 	"time"
 
-	"git.numtide.com/numtide/treefmt/config"
-	"git.numtide.com/numtide/treefmt/format"
-	"git.numtide.com/numtide/treefmt/test"
+	"github.com/numtide/treefmt/config"
+	"github.com/numtide/treefmt/format"
+	"github.com/numtide/treefmt/test"
 
 	"github.com/go-git/go-billy/v5/osfs"
 	"github.com/go-git/go-git/v5"

cli/helpers_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/charmbracelet/log"
 
-	"git.numtide.com/numtide/treefmt/stats"
+	"github.com/numtide/treefmt/stats"
 
-	"git.numtide.com/numtide/treefmt/test"
+	"github.com/numtide/treefmt/test"
 
 	"github.com/alecthomas/kong"
 	"github.com/stretchr/testify/require"

format/formatter.go

@@ -8,8 +8,8 @@ import (
 	"os/exec"
 	"time"
 
-	"git.numtide.com/numtide/treefmt/config"
-	"git.numtide.com/numtide/treefmt/walk"
+	"github.com/numtide/treefmt/config"
+	"github.com/numtide/treefmt/walk"
 
 	"github.com/charmbracelet/log"
 	"github.com/gobwas/glob"

format/glob_test.go

@@ -3,7 +3,7 @@ package format_test
 import (
 	"testing"
 
-	"git.numtide.com/numtide/treefmt/format"
+	"github.com/numtide/treefmt/format"
 
 	"github.com/gobwas/glob"
 	"github.com/stretchr/testify/require"

format/task.go

@@ -4,7 +4,7 @@ import (
 	"cmp"
 	"slices"
 
-	"git.numtide.com/numtide/treefmt/walk"
+	"github.com/numtide/treefmt/walk"
 )
 
 type Task struct {

go.mod

@@ -1,4 +1,4 @@
-module git.numtide.com/numtide/treefmt
+module github.com/numtide/treefmt
 
 go 1.22
 

init.toml

@@ -1,4 +1,4 @@
-# One CLI to format the code tree - https://git.numtide.com/numtide/treefmt
+# One CLI to format the code tree - https://github.com/numtide/treefmt
 
 [formatter.mylanguage]
 # Formatter to run

main.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
-	"git.numtide.com/numtide/treefmt/build"
-	"git.numtide.com/numtide/treefmt/cli"
 	"github.com/alecthomas/kong"
+	"github.com/numtide/treefmt/build"
+	"github.com/numtide/treefmt/cli"
 )
 
 // We embed the sample toml file for use with the init flag.

nix/devshells/default.nix

@@ -19,33 +19,8 @@ perSystem.self.treefmt.overrideAttrs (old: {
       pkgs.delve
       pkgs.pprof
       pkgs.graphviz
-      pkgs.nodejs
     ]
     ++
     # include formatters for development and testing
-    (import ../packages/treefmt/formatters.nix pkgs)
-    # docs related helpers
-    ++ (let
-      docs = command:
-        pkgs.writeShellApplication {
-          name = "docs:${command}";
-          runtimeInputs = [pkgs.nodejs];
-          text = ''cd "''${DIRENV_DIR:1}/docs" && npm ci && npm run ${command}'';
-        };
-    in [
-      (docs "dev")
-      (docs "build")
-      (docs "preview")
-      (pkgs.writeShellApplication {
-        name = "vhs";
-        runtimeInputs =
-          [
-            perSystem.self.treefmt
-            pkgs.rsync
-            pkgs.vhs
-          ]
-          ++ (import ../packages/treefmt/formatters.nix pkgs);
-        text = ''vhs "$@"'';
-      })
-    ]);
+    (import ../packages/treefmt/formatters.nix pkgs);
 })

nix/devshells/docs.nix

@@ -0,0 +1,30 @@
+{
+  pkgs,
+  perSystem,
+  ...
+}:
+pkgs.mkShellNoCC {
+  packages = let
+    docs = command:
+      pkgs.writeShellApplication {
+        name = "docs:${command}";
+        runtimeInputs = [pkgs.nodejs];
+        text = ''cd "''${DIRENV_DIR:1}/docs" && npm ci && npm run ${command}'';
+      };
+  in [
+    (docs "dev")
+    (docs "build")
+    (docs "preview")
+    (pkgs.writeShellApplication {
+      name = "vhs";
+      runtimeInputs =
+        [
+          perSystem.self.treefmt
+          pkgs.rsync
+          pkgs.vhs
+        ]
+        ++ (import ../packages/treefmt/formatters.nix pkgs);
+      text = ''vhs "$@"'';
+    })
+  ];
+}

nix/formatter.nix

@@ -1,14 +1,11 @@
 {
   pkgs,
   inputs,
-  perSystem,
   ...
 }:
 inputs.treefmt-nix.lib.mkWrapper pkgs {
   projectRootFile = "flake.nix";
 
-  package = perSystem.self.treefmt;
-
   programs = {
     alejandra.enable = true;
     deadnix.enable = true;

nix/packages/treefmt/default.nix

@@ -42,8 +42,8 @@ in
     ldflags = [
       "-s"
       "-w"
-      "-X git.numtide.com/numtide/treefmt/build.Name=${pname}"
-      "-X git.numtide.com/numtide/treefmt/build.Version=v${version}"
+      "-X github.com/numtide/treefmt/build.Name=${pname}"
+      "-X github.com/numtide/treefmt/build.Version=v${version}"
     ];
 
     nativeBuildInputs =
@@ -57,7 +57,7 @@ in
 
     meta = with lib; {
       description = "treefmt: one CLI to format your repo";
-      homepage = "https://git.numtide.com/numtide/treefmt";
+      homepage = "https://github.com/numtide/treefmt";
       license = licenses.mit;
       mainProgram = "treefmt";
     };

test/temp.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"git.numtide.com/numtide/treefmt/config"
+	"github.com/numtide/treefmt/config"
 
 	"github.com/BurntSushi/toml"
 	cp "github.com/otiai10/copy"

walk/filesystem_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"git.numtide.com/numtide/treefmt/test"
+	"github.com/numtide/treefmt/test"
 	"github.com/stretchr/testify/require"
 )