diff --git a/flake.nix b/flake.nix
index 6769b60..54c1226 100644
--- a/flake.nix
+++ b/flake.nix
@@ -112,9 +112,25 @@
           pkgs = import nixpkgs {inherit system overlays;};
           module = ./nvim/nixvim.nix;
         };
-        fmt = pkgs.callPackage ./fmt.nix {inherit src;};
-        lint = pkgs.callPackage ./lint.nix {inherit src;};
-        typos = pkgs.callPackage ./lint.nix {inherit src;};
+        formatting = pkgs.stdenvNoCC.mkDerivation {
+          name = "nix-formatting-check";
+          dontUnpack = true;
+          dontBuild = true;
+          doCheck = true;
+          checkPhase = "${pkgs.lib.getExe self.formatter.${system}} --check --quiet ${src}";
+          installPhase = "mkdir $out";
+        };
+        typos = let
+          typos = pkgs.lib.getExe pkgs.typos;
+        in
+          pkgs.stdenvNoCC.mkDerivation {
+            name = "typos-check";
+            dontUnpack = true;
+            dontBuild = true;
+            doCheck = true;
+            checkPhase = "${typos} --color=always ${src}";
+            installPhase = "mkdir $out";
+          };
       }
     );
 
diff --git a/fmt.nix b/fmt.nix
deleted file mode 100644
index 84b7369..0000000
--- a/fmt.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  alejandra,
-  src,
-}:
-stdenvNoCC.mkDerivation {
-  name = "fmt-src";
-  inherit src;
-  buildPhase = "${lib.getExe alejandra} --check .";
-  installPhase = "mkdir $out";
-}
diff --git a/lint.nix b/lint.nix
deleted file mode 100644
index 5c80e23..0000000
--- a/lint.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  statix,
-  src,
-}:
-stdenvNoCC.mkDerivation {
-  name = "lint-src";
-  inherit src;
-  buildPhase = "${lib.getExe statix} check .";
-  installPhase = "mkdir $out";
-}
diff --git a/typos.nix b/typos.nix
deleted file mode 100644
index 9a02768..0000000
--- a/typos.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  typos,
-  src,
-}:
-stdenvNoCC.mkDerivation {
-  name = "typos-src";
-  inherit src;
-  buildPhase = "${lib.getExe typos} .";
-  installPhase = "mkdir $out";
-}