diff --git a/flake.lock b/flake.lock index d654964..0ce37e0 100644 --- a/flake.lock +++ b/flake.lock @@ -626,6 +626,22 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1735554305, + "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1719010183, "narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=", @@ -641,7 +657,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1714091391, "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", @@ -708,6 +724,7 @@ "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", "tomater": "tomater", + "treefmt-nix": "treefmt-nix", "vpsadminos": "vpsadminos", "warthunder-leak-counter": "warthunder-leak-counter", "wl-crosshair": "wl-crosshair", @@ -900,6 +917,24 @@ "url": "https://git.lelgenio.com/lelgenio/tomater" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1737483750, + "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "vpsadminos": { "locked": { "lastModified": 1737136524, @@ -919,7 +954,7 @@ "inputs": { "crane": "crane_3", "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1719076817, @@ -938,7 +973,7 @@ "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1715216838, diff --git a/flake.nix b/flake.nix index 1e11ec6..49c3192 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + treefmt-nix.url = "github:numtide/treefmt-nix"; + # my stuff dhist.url = "github:lelgenio/dhist"; demoji.url = "github:lelgenio/demoji"; @@ -176,6 +178,7 @@ packages.${system} = pkgs // packages; - formatter.${system} = pkgs.nixfmt-rfc-style; + # formatter.${system} = pkgs.nixfmt-rfc-style; + formatter.${system} = (inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix).config.build.wrapper; }; } diff --git a/treefmt.nix b/treefmt.nix new file mode 100644 index 0000000..6c86ca2 --- /dev/null +++ b/treefmt.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + projectRootFile = "flake.nix"; + programs.nixfmt.enable = true; + programs.nixfmt.package = pkgs.nixfmt-rfc-style; + + settings.on-unmatched = "debug"; +}