From f5a827eacfb4dfddb594faad66b180a14b5efb95 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Wed, 10 Jul 2024 15:36:19 +0200 Subject: [PATCH] Switch to the formatting tool treefmt --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 11 ++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index febb9ce..72b2222 100644 --- a/flake.lock +++ b/flake.lock @@ -212,6 +212,7 @@ "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", + "treefmt-nix": "treefmt-nix", "wrapper-manager": "wrapper-manager" } }, @@ -251,6 +252,26 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720507012, + "narHash": "sha256-QIeZ43t9IVB4dLsFaWh2f4C7JSRfK7p+Y1U9dULsLXU=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "8b63fe8cf7892c59b3df27cbcab4d5644035d72f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "wrapper-manager": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 60d0f1b..ce05d93 100644 --- a/flake.nix +++ b/flake.nix @@ -28,6 +28,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + treefmt-nix = { + url = "github:numtide/treefmt-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-vscode-extensions = { url = "github:nix-community/nix-vscode-extensions"; inputs.nixpkgs.follows = "nixpkgs"; @@ -74,6 +79,10 @@ devShells.${system}.default = pkgs.mkShell { packages = [ pkgs.sops ]; }; - formatter.${system} = pkgs.nixfmt-rfc-style; + formatter.${system} = + (inputs.treefmt-nix.lib.evalModule pkgs { + projectRootFile = "flake.nix"; + programs.nixfmt-rfc-style.enable = true; + }).config.build.wrapper; }; }