From 9e0c1102a911079c72e74e1cb42e1d7649a70308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sun, 15 Dec 2024 00:04:26 +0100 Subject: [PATCH] Use official nix formatter --- flake.nix | 1 + hm/dev/common.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 1668cfa..205c549 100644 --- a/flake.nix +++ b/flake.nix @@ -122,6 +122,7 @@ }}/bin/rebuild ${self} "$@"''}"; }; }; + formatter = pkgs.nixfmt-rfc-style; } ); }; diff --git a/hm/dev/common.nix b/hm/dev/common.nix index 2a71bff..ff1aab4 100644 --- a/hm/dev/common.nix +++ b/hm/dev/common.nix @@ -22,7 +22,7 @@ # nix lix - nixpkgs-fmt + nixfmt-rfc-style # Always on (graphical) ] ++ lib.optionals config.frogeye.desktop.xorg [ @@ -71,7 +71,7 @@ nil_ls = { enable = true; settings = { - formatting.command = [ "nixpkgs-fmt" ]; + formatting.command = [ "nixfmt" ]; nix.flake = { autoArchive = true; autoEvalInputs = true;