Formatting

app/frontend/src/components/CV/Skill.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 
+import PageBreakAvoid from "../common/PageBreakAvoid";
 import { Spacer } from "../common/Spacer";
 import { Paragraph } from "../common/Text";
-import PageBreakAvoid from "../common/PageBreakAvoid";
 
 type SkillProps = {
   title: string;

app/server/internal/config/config.go

@@ -7,10 +7,9 @@ import (
 	"os"
 	"time"
 
+	"go.c3c.cz/cv/app/server/internal/version"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-
-	"go.c3c.cz/cv/app/server/internal/version"
 )
 
 type FrontendConfigDef struct {

app/server/internal/httpserver/httphandler.go

@@ -14,10 +14,9 @@ import (
 	"strings"
 	"time"
 
-	"go.uber.org/zap"
-
 	"go.c3c.cz/cv/app/server/internal/files"
 	"go.c3c.cz/cv/app/server/internal/version"
+	"go.uber.org/zap"
 )
 
 type handler struct {
@@ -67,7 +66,6 @@ func (h *handler) serveFile(w http.ResponseWriter, r *http.Request, modtime time
 			gw.Reset(io.Discard)
 		}
 		err = gw.Close()
-
 		if err != nil {
 			h.logger.Warn("Could not close gzip writer", zap.Error(err))
 			return

app/server/internal/httpserver/httpserver.go

@@ -10,9 +10,8 @@ import (
 	"net/http"
 	"time"
 
-	"go.uber.org/zap"
-
 	"go.c3c.cz/cv/app/server/internal/files"
+	"go.uber.org/zap"
 )
 
 func init() {

app/server/main.go

@@ -8,12 +8,11 @@ import (
 	"os/signal"
 	"syscall"
 
-	"go.uber.org/zap"
-
 	"go.c3c.cz/cv/app/server/internal/config"
 	"go.c3c.cz/cv/app/server/internal/httpserver"
 	"go.c3c.cz/cv/app/server/internal/pprofserver"
 	"go.c3c.cz/cv/app/server/internal/version"
+	"go.uber.org/zap"
 )
 
 func main() {
@@ -33,7 +32,6 @@ func main() {
 	var err error
 
 	logger, err = config.LoggerConfig.Build()
-
 	if err != nil {
 		fmt.Println(notice)
 		fmt.Println(version.CommitTime.Format("Committed at 2006/01/02 15:04:05 MST"))

flake.nix

@@ -73,6 +73,19 @@
           ];
 
           commands = [
+            {
+              # Override golangci-lint for vscode, because the extension incorrectly assumes usage of global binaries is preferred
+              name = "golangci-lint";
+              command = ''
+                CMD=''${1:-}
+                if [[ "$CMD" == "run" ]]; then
+                  shift
+                  ${pkgs.golangci-lint}/bin/golangci-lint run --config ${nix.lib.golangci-config-file} $@
+                else
+                  ${pkgs.golangci-lint}/bin/golangci-lint $@
+                fi
+              '';
+            }
             {
               name = "lint";
               help = "run linters";
@@ -87,7 +100,7 @@
               help = "format & fix found issues";
               command = ''
                 ${nix.lib.cd_root}
-                nix fmt .
+                nix fmt ./*.nix
                 ${pkgs.golangci-lint}/bin/golangci-lint run --sort-results --out-format tab --config ${nix.lib.golangci-config-file} --fix --issues-exit-code 0 ./...
                 npm --prefix app/frontend run fix
               '';