From f05e8522b2a4e0fc730f950563db26fc95e0c299 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 24 Feb 2025 19:56:19 +0100 Subject: [PATCH] Remove formatting check from flake check --- flake/checks.nix | 2 -- flake/formatter.nix | 11 ++++++++++- flake/treefmt.nix | 10 ---------- 3 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 flake/treefmt.nix diff --git a/flake/checks.nix b/flake/checks.nix index a130438..6359292 100644 --- a/flake/checks.nix +++ b/flake/checks.nix @@ -4,8 +4,6 @@ { pkgs, ... }: { checks = { - treefmt = (import ./treefmt.nix { inherit inputs pkgs; }).check self; - statix = pkgs.runCommand "statix" { buildInputs = [ pkgs.statix ]; } '' statix check ${self} mkdir $out diff --git a/flake/formatter.nix b/flake/formatter.nix index 1d884b7..c3feeac 100644 --- a/flake/formatter.nix +++ b/flake/formatter.nix @@ -3,6 +3,15 @@ perSystem = { pkgs, ... }: { - formatter = (import ./treefmt.nix { inherit inputs pkgs; }).wrapper; + formatter = + (inputs.treefmt-nix.lib.evalModule pkgs { + projectRootFile = "flake.nix"; + programs = { + nixfmt.enable = true; + prettier.enable = true; + just.enable = true; + }; + settings.formatter.nixfmt.excludes = [ "modules/home/shell/aliases.nix" ]; + }).config.build.wrapper; }; } diff --git a/flake/treefmt.nix b/flake/treefmt.nix deleted file mode 100644 index c4ef1b0..0000000 --- a/flake/treefmt.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ inputs, pkgs, ... }: -(inputs.treefmt-nix.lib.evalModule pkgs { - projectRootFile = "flake.nix"; - programs = { - nixfmt.enable = true; - prettier.enable = true; - just.enable = true; - }; - settings.formatter.nixfmt.excludes = [ "modules/home/shell/aliases.nix" ]; -}).config.build