Imports split into three groups: standard library, third-party, then this project's own packages

gci is configured with the sections standard, default and localmodule, and
goimports with the module path as its local prefix, so both formatters
agree.

.golangci.json

@@ -51,6 +51,18 @@
       "golines"
     ],
     "settings": {
+      "gci": {
+        "sections": [
+          "standard",
+          "default",
+          "localmodule"
+        ]
+      },
+      "goimports": {
+        "local-prefixes": [
+          "git.avsdev.uk/Go/job-search"
+        ]
+      },
       "golines": {
         "max-len": 100,
         "tab-len": 2

cmd/jobsearch/main.go

@@ -23,13 +23,14 @@ import (
 	"os"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/cli"
 	"git.avsdev.uk/Go/job-search/internal/cli/config"
 	"git.avsdev.uk/Go/job-search/internal/cli/fetch"
 	"git.avsdev.uk/Go/job-search/internal/cli/migrate"
 	"git.avsdev.uk/Go/job-search/internal/cli/version"
 	"git.avsdev.uk/Go/job-search/internal/cli/wsserve"
-	"github.com/spf13/cobra"
 )
 
 // newRootCmd builds the command tree. It returns a fresh tree on each call so

cmd/mock-fts/main.go

@@ -32,9 +32,10 @@ import (
 	"time"
 	_ "time/tzdata"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/logging"
 	mock "git.avsdev.uk/Go/job-search/internal/mock/findatender"
-	"github.com/spf13/cobra"
 )
 
 // options holds the values of every command-line flag.

internal/cli/cli_test.go

@@ -7,9 +7,10 @@ import (
 	"strings"
 	"testing"
 
-	"git.avsdev.uk/Go/job-search/internal/logging"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"git.avsdev.uk/Go/job-search/internal/logging"
 )
 
 // The commands themselves are tested through the real command tree in

internal/cli/cmdtest/cmdtest.go

@@ -14,10 +14,11 @@ import (
 	"strings"
 	"testing"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
-	"git.avsdev.uk/Go/job-search/internal/logging"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
+	"git.avsdev.uk/Go/job-search/internal/logging"
 )
 
 // Setup changes into a new temporary directory holding an empty .env and,

internal/cli/config/command.go

@@ -3,8 +3,9 @@ package config
 import (
 	"log/slog"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
 )
 
 // NewCommand returns the "config" command, which shows and edits the configuration.

internal/cli/config/config_test.go

@@ -4,10 +4,11 @@ import (
 	"strings"
 	"testing"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
-	"git.avsdev.uk/Go/job-search/internal/cli/cmdtest"
 	"github.com/spf13/cobra"
 	"go.yaml.in/yaml/v3"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
+	"git.avsdev.uk/Go/job-search/internal/cli/cmdtest"
 )
 
 // These tests run the config commands as a user would, through a root

internal/cli/config/get.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"log/slog"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
 )
 
 func commandGet(opts *cli.Options) *cobra.Command {

internal/cli/config/init.go

@@ -7,9 +7,10 @@ import (
 	"os"
 	"strings"
 
-	"git.avsdev.uk/Go/job-search/internal/config"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"git.avsdev.uk/Go/job-search/internal/config"
 )
 
 func commandInit() *cobra.Command {

internal/cli/config/set.go

@@ -5,10 +5,11 @@ import (
 	"fmt"
 	"log/slog"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
-	"git.avsdev.uk/Go/job-search/internal/config"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
+	"git.avsdev.uk/Go/job-search/internal/config"
 )
 
 func commandSet(opts *cli.Options) *cobra.Command {

internal/cli/config/show.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"log/slog"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
 )
 
 func commandShow(opts *cli.Options) *cobra.Command {

internal/cli/fetch/command.go

@@ -3,8 +3,9 @@ package fetch
 import (
 	"log/slog"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
 )
 
 // NewCommand returns the "fetch" command, which fetches opportunities once or as a service.

internal/cli/fetch/once.go

@@ -7,10 +7,11 @@ import (
 	"slices"
 	"time"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/cli"
 	"git.avsdev.uk/Go/job-search/internal/findatender"
 	"git.avsdev.uk/Go/job-search/internal/types"
-	"github.com/spf13/cobra"
 )
 
 // Release tags for each stage of a procedure, from the OCDS releaseTag

internal/cli/fetch/service.go

@@ -9,9 +9,10 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/cli"
 	"git.avsdev.uk/Go/job-search/internal/fetcher"
-	"github.com/spf13/cobra"
 )
 
 func commandService(opts *cli.Options) *cobra.Command {

internal/cli/flags_test.go

@@ -5,9 +5,10 @@ import (
 	"os"
 	"testing"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/cli"
 	"git.avsdev.uk/Go/job-search/internal/cli/cmdtest"
-	"github.com/spf13/cobra"
 )
 
 // The shared flags (--config, --debug and --quiet), run through a root

internal/cli/logging.go

@@ -3,8 +3,9 @@ package cli
 import (
 	"log/slog"
 
-	"git.avsdev.uk/Go/job-search/internal/logging"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/logging"
 )
 
 // SetupInitialLogging starts logging to the terminal, at the level set by

internal/cli/migrate/common.go

@@ -10,10 +10,11 @@ import (
 	"path/filepath"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
-	"git.avsdev.uk/Go/job-search/internal/store"
 	"github.com/pressly/goose/v3"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
+	"git.avsdev.uk/Go/job-search/internal/store"
 )
 
 // openMigrator loads the configuration and returns a migrator over the

internal/cli/migrate/down.go

@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/cli"
 	"git.avsdev.uk/Go/job-search/internal/store"
-	"github.com/spf13/cobra"
 )
 
 func commandDown(opts *cli.Options) *cobra.Command {

internal/cli/migrate/migrate.go

@@ -9,8 +9,9 @@ package migrate
 import (
 	"log/slog"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
 )
 
 // NewCommand returns the "migrate" command, which migrates the database schema (see

internal/cli/migrate/migrate_test.go

@@ -5,10 +5,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/cli"
 	"git.avsdev.uk/Go/job-search/internal/cli/cmdtest"
 	"git.avsdev.uk/Go/job-search/internal/store"
-	"github.com/spf13/cobra"
 )
 
 // Run with: go test -tags sqlite_fts5 ./...

internal/cli/migrate/status.go

@@ -8,10 +8,11 @@ import (
 	"path/filepath"
 	"text/tabwriter"
 
-	"git.avsdev.uk/Go/job-search/internal/cli"
-	"git.avsdev.uk/Go/job-search/internal/store"
 	"github.com/pressly/goose/v3"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/cli"
+	"git.avsdev.uk/Go/job-search/internal/store"
 )
 
 // printStatus lists every migration as applied (with when) or pending,

internal/cli/migrate/up.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/cli"
 	"git.avsdev.uk/Go/job-search/internal/store"
-	"github.com/spf13/cobra"
 )
 
 // runStepUp applies steps pending migrations (0 means all), printing each one

internal/cli/options.go

@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"log/slog"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/config"
 	"git.avsdev.uk/Go/job-search/internal/logging"
-	"github.com/spf13/cobra"
 )
 
 // Options holds the flags shared by every command. Bind registers them on the

internal/cli/version/command.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"log/slog"
 
-	"git.avsdev.uk/Go/job-search/internal/version"
 	"github.com/spf13/cobra"
+
+	"git.avsdev.uk/Go/job-search/internal/version"
 )
 
 // NewCommand returns the "version" command.

internal/cli/wsserve/command.go

@@ -10,10 +10,11 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/spf13/cobra"
+
 	"git.avsdev.uk/Go/job-search/internal/cli"
 	"git.avsdev.uk/Go/job-search/internal/websocket"
 	"git.avsdev.uk/Go/job-search/internal/websocket/tcpserver"
-	"github.com/spf13/cobra"
 )
 
 func NewCommand(opts *cli.Options) *cobra.Command {

internal/findatender/api.go

@@ -13,9 +13,10 @@ import (
 	"strings"
 	"time"
 
+	resty "resty.dev/v3"
+
 	"git.avsdev.uk/Go/job-search/internal/findatender/ocds"
 	"git.avsdev.uk/Go/job-search/internal/logging"
-	resty "resty.dev/v3"
 )
 
 // Errors returned when fetching from the API.

internal/findatender/api_test.go

@@ -15,9 +15,10 @@ import (
 	"testing"
 	"time"
 
+	resty "resty.dev/v3"
+
 	"git.avsdev.uk/Go/job-search/internal/config"
 	"git.avsdev.uk/Go/job-search/internal/findatender/ocds"
-	resty "resty.dev/v3"
 )
 
 func testConfig(level string) *config.JobSearchConfig {

internal/findatender/findatender.go

@@ -5,9 +5,10 @@ import (
 	"log/slog"
 	"time"
 
+	resty "resty.dev/v3"
+
 	"git.avsdev.uk/Go/job-search/internal/config"
 	"git.avsdev.uk/Go/job-search/internal/types"
-	resty "resty.dev/v3"
 )
 
 // FindATender is a client for the Find a Tender OCDS API (or the mock

internal/store/migrate_test.go

@@ -8,8 +8,9 @@ import (
 	"strings"
 	"testing"
 
-	"git.avsdev.uk/Go/job-search/internal/store"
 	"github.com/pressly/goose/v3"
+
+	"git.avsdev.uk/Go/job-search/internal/store"
 )
 
 // Run with: go test -tags sqlite_fts5 ./...

internal/store/store.go

@@ -12,9 +12,10 @@ import (
 	"time"
 	"unicode"
 
-	"git.avsdev.uk/Go/job-search/internal/types"
 	"github.com/jmoiron/sqlx"
 	"github.com/mattn/go-sqlite3"
+
+	"git.avsdev.uk/Go/job-search/internal/types"
 )
 
 // ErrNotFound is returned when a requested opportunity does not exist.

internal/websocket/client_test.go

@@ -12,8 +12,9 @@ import (
 	"testing"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/config"
 	ws "github.com/coder/websocket"
+
+	"git.avsdev.uk/Go/job-search/internal/config"
 )
 
 // fakeConn is a msgConn that records how it was closed. Read blocks until its

internal/websocket/http.go

@@ -4,8 +4,9 @@ import (
 	"context"
 	"net/http"
 
-	"git.avsdev.uk/Go/job-search/internal/middleware"
 	ws "github.com/coder/websocket"
+
+	"git.avsdev.uk/Go/job-search/internal/middleware"
 )
 
 // ServeHTTP upgrades an http connection and runs the client until it closes.

internal/websocket/http_test.go

@@ -8,9 +8,10 @@ import (
 	"testing"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/config"
 	ws "github.com/coder/websocket"
 	"github.com/coder/websocket/wsjson"
+
+	"git.avsdev.uk/Go/job-search/internal/config"
 )
 
 // wsHub serves h's WebSocket clients on a test HTTP server and returns its

internal/websocket/hub.go

@@ -6,8 +6,9 @@ import (
 	"log/slog"
 	"sync"
 
-	"git.avsdev.uk/Go/job-search/internal/config"
 	ws "github.com/coder/websocket"
+
+	"git.avsdev.uk/Go/job-search/internal/config"
 )
 
 // Hub tracks connected clients, WebSocket (ServeHTTP) and plain TCP

internal/websocket/tcp_test.go

@@ -13,8 +13,9 @@ import (
 	"testing"
 	"time"
 
-	"git.avsdev.uk/Go/job-search/internal/config"
 	ws "github.com/coder/websocket"
+
+	"git.avsdev.uk/Go/job-search/internal/config"
 )
 
 var discardLog = slog.New(slog.NewTextHandler(io.Discard, nil))