flake: switch formatter to treefmt-nix, reformat

.github/workflows/e2e.yml

@@ -4,7 +4,6 @@ on:
   workflow_dispatch:
   pull_request:
 
-
 jobs:
   build:
     name: build binary

.github/workflows/lint.yml

@@ -83,11 +83,11 @@ jobs:
           actionlint
 
   vendorhash:
-      runs-on: ubuntu-latest
-      permissions:
-        id-token: write
-        contents: read
-      steps:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:

flake.nix

@@ -8,54 +8,74 @@
     flake-utils = {
       url = "github:numtide/flake-utils";
     };
+    treefmt-nix = {
+      url = "github:numtide/treefmt-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem
-      (system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-          uplosi = pkgs.buildGoModule {
-            pname = "uplosi";
-            version = "devel";
-            src = ./.;
-            # this needs to be updated together with go.mod / go.sum
-            vendorHash = "sha256-2lJmPNLpI1ksFb0EtcjPjyTy7eX1DKeX0F80k9FtGno=";
-
-            CGO_ENABLED = 0;
-
-            ldflags = [ "-s" ];
-
-            nativeBuildInputs = [ pkgs.installShellFiles ];
-
-            postInstall = ''
-              installShellCompletion --cmd uplosi \
-                --bash <($out/bin/uplosi completion bash) \
-                --fish <($out/bin/uplosi completion fish) \
-                --zsh <($out/bin/uplosi completion zsh)
-            '';
-
-            meta = with pkgs.lib; {
-              description = "Upload OS images to cloud provider";
-              homepage = "https://github.com/edgelesssys/uplosi";
-              maintainers = with maintainers; [ katexochen malt3 ];
-              license = licenses.asl20;
-            };
-          };
-        in
-        {
-          devShells.default = import ./shell.nix { inherit pkgs; };
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      treefmt-nix,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
 
-          packages = {
-            default = uplosi;
-            uplosi = uplosi;
-          };
+        uplosi = pkgs.buildGoModule {
+          pname = "uplosi";
+          version = "devel";
+          src = ./.;
+          # this needs to be updated together with go.mod / go.sum
+          vendorHash = "sha256-2lJmPNLpI1ksFb0EtcjPjyTy7eX1DKeX0F80k9FtGno=";
+
+          CGO_ENABLED = 0;
+
+          ldflags = [ "-s" ];
+
+          nativeBuildInputs = [ pkgs.installShellFiles ];
 
-          legacyPackages = {
-            nixpkgs = nixpkgs.legacyPackages.${system};
+          postInstall = ''
+            installShellCompletion --cmd uplosi \
+              --bash <($out/bin/uplosi completion bash) \
+              --fish <($out/bin/uplosi completion fish) \
+              --zsh <($out/bin/uplosi completion zsh)
+          '';
+
+          meta = with pkgs.lib; {
+            description = "Upload OS images to cloud provider";
+            homepage = "https://github.com/edgelesssys/uplosi";
+            maintainers = with maintainers; [
+              katexochen
+              malt3
+            ];
+            license = licenses.asl20;
           };
+        };
+
+        treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
+      in
+      {
+        devShells.default = import ./shell.nix { inherit pkgs; };
+
+        packages = {
+          default = uplosi;
+          inherit uplosi;
+        };
+
+        legacyPackages = {
+          nixpkgs = nixpkgs.legacyPackages.${system};
+        };
+
+        formatter = treefmtEval.config.build.wrapper;
 
-          formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
-        }
-      );
+        checks = {
+          formatting = treefmtEval.config.build.check self;
+        };
+      }
+    );
 }

hack/build_image.sh

@@ -5,5 +5,5 @@ set -euo pipefail
 target=$(mktemp)
 truncate -s 21MiB "${target}"
 parted -s -a optimal "${target}" -- \
-    mklabel msdos mkpart primary ext4 1MiB 100%
+  mklabel msdos mkpart primary ext4 1MiB 100%
 echo "${target}"

renovate.json5

@@ -1,80 +1,66 @@
 {
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended",
+  $schema: "https://docs.renovatebot.com/renovate-schema.json",
+  extends: [
     ":preserveSemverRanges",
-    "helpers:pinGitHubActionDigests",
-    ":separateMajorReleases",
     ":semanticCommitsDisabled",
+    ":separateMajorReleases",
+    "config:recommended",
+    "helpers:pinGitHubActionDigests",
   ],
-  "commitMessagePrefix": "deps:",
-  "commitMessageAction": "update",
-  "addLabels": [
-    "dependencies"
-  ],
-  "postUpdateOptions": [
+  commitMessagePrefix: "deps:",
+  commitMessageAction: "update",
+  addLabels: [ "dependencies" ],
+  postUpdateOptions: [
     "gomodTidy",
-    "gomodUpdateImportPaths"
+    "gomodUpdateImportPaths",
   ],
-  "prConcurrentLimit": 1,
-  "nix": {
-    "enabled": true,
+  prConcurrentLimit: 1,
+  nix: { enabled: true },
+  lockFileMaintenance: {
+    enabled: true,
+    commitMessageAction: "flake.lock: Update",
+    commitMessagePrefix: null,
+    schedule: [ "before 4am" ],
   },
-  "lockFileMaintenance": {
-      "enabled": true,
-      "commitMessageAction": "flake.lock: Update",
-      "commitMessagePrefix": null,
-      "schedule": ["before 4am"],
-  },
-  "packageRules": [
+  packageRules: [
     {
-      "matchManagers": ["gomod"],
-      "matchDepTypes": ["indirect"],
-      "enabled": true,
+      matchManagers: [ "gomod" ],
+      matchDepTypes: [ "indirect" ],
+      enabled: true,
     },
     {
-      "groupName": "Go indirect dependencies",
-      "matchManagers": [
-        "gomod"
-      ],
-      "matchDepTypes": [
-        "indirect"
-      ],
-      "prPriority": -30,
+      groupName: "Go indirect dependencies",
+      matchManagers: [ "gomod" ],
+      matchDepTypes: [ "indirect" ],
+      prPriority: -30,
     },
     {
-      "groupName": "Go dependencies",
-      "matchManagers": [
-        "gomod"
-      ],
-      "matchDepTypes": [
-        "require"
-      ],
-      "matchUpdateTypes": [
+      groupName: "Go dependencies",
+      matchManagers: [ "gomod" ],
+      matchDepTypes: [ "require" ],
+      matchUpdateTypes: [
+        "bump",
+        "digest",
+        "lockFileMaintenance",
         "minor",
         "patch",
         "pin",
         "pinDigest",
-        "digest",
-        "lockFileMaintenance",
         "rollback",
-        "bump",
       ],
     },
     {
-      "matchManagers": [
-        "github-actions"
-      ],
-      "groupName": "GitHub action dependencies",
-      "matchUpdateTypes": [
+      matchManagers: [ "github-actions" ],
+      groupName: "GitHub action dependencies",
+      matchUpdateTypes: [
+        "bump",
+        "digest",
+        "lockFileMaintenance",
         "minor",
         "patch",
         "pin",
         "pinDigest",
-        "digest",
-        "lockFileMaintenance",
         "rollback",
-        "bump",
       ],
     },
   ],

shell.nix

@@ -1,4 +1,5 @@
 { pkgs, ... }:
+
 pkgs.mkShell {
   nativeBuildInputs = with pkgs; [
     go

treefmt.nix

@@ -0,0 +1,32 @@
+{ lib, pkgs, ... }:
+
+{
+  projectRootFile = "flake.nix";
+  programs = {
+    # keep-sorted start block=true
+    actionlint.enable = true;
+    deadnix.enable = true;
+    formatjson5 = {
+      enable = true;
+      indent = 2;
+      oneElementLines = true;
+      sortArrays = true;
+    };
+    keep-sorted.enable = true;
+    nixfmt.enable = true;
+    shellcheck.enable = true;
+    shfmt.enable = true;
+    statix.enable = true;
+    # keep-sorted end
+  };
+  settings.formatter = {
+    yamlfmt = {
+      command = "${lib.getExe pkgs.yamlfmt}";
+      options = [ "-formatter=retain_line_breaks_single=true" ];
+      includes = [
+        "*.yaml"
+        "*.yml"
+      ];
+    };
+  };
+}