diff --git a/default.nix b/default.nix index d628044..b68440f 100644 --- a/default.nix +++ b/default.nix @@ -41,33 +41,19 @@ }: let - git-checks = - (import ( - pkgs.applyPatches { - name = "git-hooks.nix"; - src = builtins.storePath sources.git-hooks; - patches = [ ./patches/00-git-hooks-nixfmt.patch ]; - } - )).run - { - src = ./.; + git-checks = (import (builtins.storePath sources.git-hooks)).run { + src = ./.; - hooks = { - # Nix Hooks - statix.enable = true; - deadnix.enable = true; - rfc101 = { - enable = true; + hooks = { + # Nix Hooks + statix.enable = true; + deadnix.enable = true; + nixfmt-rfc-style.enable = true; - name = "RFC-101 formatting"; - entry = "${pkgs.lib.getExe pkgs.nixfmt-rfc-style}"; - files = "\\.nix$"; - }; - - # Misc Hooks - commitizen.enable = true; - }; - }; + # Misc Hooks + commitizen.enable = true; + }; + }; in { diff --git a/patches/00-git-hooks-nixfmt.patch b/patches/00-git-hooks-nixfmt.patch deleted file mode 100644 index d9ec03a..0000000 --- a/patches/00-git-hooks-nixfmt.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/modules/hooks.nix b/modules/hooks.nix -index bb194ee..8505794 100644 ---- a/modules/hooks.nix -+++ b/modules/hooks.nix -@@ -2848,7 +2848,7 @@ lib.escapeShellArgs (lib.concatMap (ext: [ "--ghc-opt" "-X${ext}" ]) hooks.ormol - { - name = "nixfmt"; - description = "Nix code prettifier."; -- package = tools.nixfmt; -+ package = tools.nixfmt-classic; - entry = "${hooks.nixfmt.package}/bin/nixfmt ${lib.optionalString (hooks.nixfmt.settings.width != null) "--width=${toString hooks.nixfmt.settings.width}"}"; - files = "\\.nix$"; - }; -diff --git a/nix/tools.nix b/nix/tools.nix -index 9bcc89d..9fec5d5 100644 ---- a/nix/tools.nix -+++ b/nix/tools.nix -@@ -44,7 +44,7 @@ - , mdl - , mdsh - , nil --, nixfmt -+, nixfmt-classic - , nixpkgs-fmt - , nodePackages - , ocamlPackages -@@ -131,7 +131,7 @@ in - mdl - mdsh - nil -- nixfmt -+ nixfmt-classic - nixpkgs-fmt - ormolu - pre-commit-hook-ensure-sops -