diff --git a/flake.lock b/flake.lock index 35ab585..3d851f3 100644 --- a/flake.lock +++ b/flake.lock @@ -485,7 +485,9 @@ "pre-commit-hooks": [ "pre-commit-hooks" ], - "treefmt-nix": "treefmt-nix" + "treefmt-nix": [ + "treefmt-nix" + ] }, "locked": { "lastModified": 1715976947, @@ -584,6 +586,7 @@ "rust-overlay": "rust-overlay", "stable": "stable", "systems": "systems", + "treefmt-nix": "treefmt-nix", "universe-cli": "universe-cli" } }, @@ -661,16 +664,15 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1715940852, + "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1937c73..b6eb3f8 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,7 @@ impermanence.url = "github:nix-community/impermanence"; nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-wsl.url = "github:nix-community/NixOS-WSL"; + treefmt-nix.url = "github:numtide/treefmt-nix"; ### Domain-Specific Flake Inputs ### ## Minecraft @@ -71,11 +72,13 @@ nixvim.inputs.nix-darwin.follows = "blank"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; nixvim.inputs.pre-commit-hooks.follows = "pre-commit-hooks"; + nixvim.inputs.treefmt-nix.follows = "treefmt-nix"; pre-commit-hooks.inputs.flake-compat.follows = "blank"; pre-commit-hooks.inputs.nixpkgs-stable.follows = "nixpkgs"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; rust-overlay.inputs.flake-utils.follows = "flake-utils"; rust-overlay.inputs.nixpkgs.follows = "nixpkgs"; + treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; universe-cli.inputs.devshell.follows = "devshell"; universe-cli.inputs.flake-parts.follows = "flake-parts"; universe-cli.inputs.flake-utils.follows = "flake-utils"; @@ -98,6 +101,9 @@ self.overlays.patches ]; }; + + treefmt.projectRootFile = "flake.nix"; + treefmt.programs.nixpkgs-fmt.enable = true; }; flake = { @@ -188,6 +194,7 @@ ./pkgs ./shell inputs.devshell.flakeModule + inputs.treefmt-nix.flakeModule ]; }); }