diff --git a/flake.lock b/flake.lock index 67815fc..51a77cf 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724395761, - "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", + "lastModified": 1731531548, + "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", + "rev": "24f0d4acd634792badd6470134c387a3b039dace", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1724338379, - "narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=", + "lastModified": 1730321837, + "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "070f834771efa715f3e74cd8ab93ecc96fabc951", + "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a042210..c78afa0 100644 --- a/flake.nix +++ b/flake.nix @@ -17,23 +17,28 @@ systems.url = "github:nix-systems/default"; }; - outputs = inputs: - inputs.flake-utils.lib.eachDefaultSystem (system: let - pkgs = inputs.nixpkgs.legacyPackages.${system}; - treefmtEval = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix; - in { - ### nix fmt - formatter = treefmtEval.config.build.wrapper; + outputs = + inputs: + inputs.flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = inputs.nixpkgs.legacyPackages.${system}; + treefmtEval = inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix; + in + { + ### nix fmt + formatter = treefmtEval.config.build.wrapper; - ### nix flake check - checks.formatting = treefmtEval.config.build.check inputs.self; + ### nix flake check + checks.formatting = treefmtEval.config.build.check inputs.self; - ### nix develop - devShells.default = pkgs.mkShellNoCC { - packages = with pkgs; [ - lua-language-server - stylua - ]; - }; - }); + ### nix develop + devShells.default = pkgs.mkShellNoCC { + packages = with pkgs; [ + lua-language-server + stylua + ]; + }; + } + ); } diff --git a/treefmt.nix b/treefmt.nix index 249ad8d..56203f7 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -1,17 +1,12 @@ { projectRootFile = "flake.nix"; - ### nix - programs.deadnix.enable = true; - programs.statix.enable = true; - programs.alejandra.enable = true; - - ### lua - programs.stylua.enable = true; - - ### toml - programs.taplo.enable = true; - - ### misc - programs.prettier.enable = true; + programs = { + deadnix.enable = true; + nixfmt.enable = true; + prettier.enable = true; + statix.enable = true; + stylua.enable = true; + taplo.enable = true; + }; }