diff --git a/flake.lock b/flake.lock index 5077928..5c49420 100644 --- a/flake.lock +++ b/flake.lock @@ -211,8 +211,7 @@ "flake-parts": "flake-parts", "mmsg": "mmsg", "nixpkgs": "nixpkgs", - "nixpkgs-wayland": "nixpkgs-wayland", - "treefmt-nix": "treefmt-nix" + "nixpkgs-wayland": "nixpkgs-wayland" } }, "systems": { @@ -229,26 +228,6 @@ "repo": "default", "type": "github" } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1749194973, - "narHash": "sha256-eEy8cuS0mZ2j/r/FE0/LYBSBcIs/MKOIVakwHVuqTfk=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "a05be418a1af1198ca0f63facb13c985db4cb3c5", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6dfc25c..b420722 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; flake-parts.url = "github:hercules-ci/flake-parts"; - treefmt-nix = { - url = "github:numtide/treefmt-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; mmsg = { url = "github:DreamMaoMao/mmsg"; inputs.nixpkgs.follows = "nixpkgs"; @@ -16,7 +12,6 @@ outputs = { self, flake-parts, - treefmt-nix, ... } @ inputs: flake-parts.lib.mkFlake {inherit inputs;} { @@ -46,7 +41,6 @@ nativeBuildInputs = old.nativeBuildInputs ++ []; buildInputs = old.buildInputs ++ []; }; - treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix; in { packages.default = maomaowm; overlayAttrs = { @@ -56,7 +50,7 @@ inherit maomaowm; }; devShells.default = maomaowm.overrideAttrs shellOverride; - formatter = treefmtEval.config.build.wrapper; + formatter = pkgs.alejandra; }; systems = ["x86_64-linux" "aarch64-linux"]; }; diff --git a/treefmt.nix b/treefmt.nix deleted file mode 100644 index e61ce2d..0000000 --- a/treefmt.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ ... }: - -{ - projectRootFile = "flake.nix"; - programs = { - nixfmt.enable = true; - }; -}