mirror of
https://github.com/rosenpass/rosenpass.git
synced 2026-02-28 14:33:37 -08:00
feat: add treefmt.nix setup
Add a treefmt setup for a single-entry point format-everything system. To use it, simply run `nix fmt`. This will in term run nixfmt, prettier and rustfmt. Signed-off-by: wucke13 <wucke13+github@gmail.com>
This commit is contained in:
23
flake.lock
generated
23
flake.lock
generated
@@ -80,7 +80,8 @@
|
|||||||
"fenix": "fenix",
|
"fenix": "fenix",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nix-vm-test": "nix-vm-test",
|
"nix-vm-test": "nix-vm-test",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs",
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-analyzer-src": {
|
"rust-analyzer-src": {
|
||||||
@@ -114,6 +115,26 @@
|
|||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1743748085,
|
||||||
|
"narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
24
flake.nix
24
flake.nix
@@ -10,9 +10,12 @@
|
|||||||
nix-vm-test.url = "github:numtide/nix-vm-test";
|
nix-vm-test.url = "github:numtide/nix-vm-test";
|
||||||
nix-vm-test.inputs.nixpkgs.follows = "nixpkgs";
|
nix-vm-test.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
nix-vm-test.inputs.flake-utils.follows = "flake-utils";
|
nix-vm-test.inputs.flake-utils.follows = "flake-utils";
|
||||||
|
|
||||||
|
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||||
|
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, flake-utils, nix-vm-test, ... }@inputs:
|
outputs = { self, nixpkgs, flake-utils, nix-vm-test, treefmt-nix, ... }@inputs:
|
||||||
nixpkgs.lib.foldl (a: b: nixpkgs.lib.recursiveUpdate a b) { } [
|
nixpkgs.lib.foldl (a: b: nixpkgs.lib.recursiveUpdate a b) { } [
|
||||||
|
|
||||||
|
|
||||||
@@ -86,6 +89,8 @@
|
|||||||
nix-vm-test.overlays.default
|
nix-vm-test.overlays.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages.package-deb = pkgs.callPackage ./pkgs/package-deb.nix {
|
packages.package-deb = pkgs.callPackage ./pkgs/package-deb.nix {
|
||||||
@@ -152,26 +157,15 @@
|
|||||||
checks = {
|
checks = {
|
||||||
systemd-rosenpass = pkgs.testers.runNixOSTest ./tests/systemd/rosenpass.nix;
|
systemd-rosenpass = pkgs.testers.runNixOSTest ./tests/systemd/rosenpass.nix;
|
||||||
systemd-rp = pkgs.testers.runNixOSTest ./tests/systemd/rp.nix;
|
systemd-rp = pkgs.testers.runNixOSTest ./tests/systemd/rp.nix;
|
||||||
|
formatting = treefmtEval.config.build.check self;
|
||||||
cargo-fmt = pkgs.runCommand "check-cargo-fmt"
|
|
||||||
{ inherit (self.devShells.${system}.default) nativeBuildInputs buildInputs; } ''
|
|
||||||
cargo fmt --manifest-path=${./.}/Cargo.toml --check --all && touch $out
|
|
||||||
'';
|
|
||||||
nixpkgs-fmt = pkgs.runCommand "check-nixpkgs-fmt"
|
|
||||||
{ nativeBuildInputs = [ pkgs.nixpkgs-fmt ]; } ''
|
|
||||||
nixpkgs-fmt --check ${./.} && touch $out
|
|
||||||
'';
|
|
||||||
prettier-check = pkgs.runCommand "check-with-prettier"
|
|
||||||
{ nativeBuildInputs = [ pkgs.nodePackages.prettier ]; } ''
|
|
||||||
cd ${./.} && prettier --check . && touch $out
|
|
||||||
'';
|
|
||||||
} // pkgs.lib.optionalAttrs (system == "x86_64-linux") (import ./tests/legacy-distro-packaging.nix {
|
} // pkgs.lib.optionalAttrs (system == "x86_64-linux") (import ./tests/legacy-distro-packaging.nix {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
rosenpass-deb = self.packages.${system}.package-deb;
|
rosenpass-deb = self.packages.${system}.package-deb;
|
||||||
rosenpass-rpm = self.packages.${system}.package-rpm;
|
rosenpass-rpm = self.packages.${system}.package-rpm;
|
||||||
});
|
});
|
||||||
|
|
||||||
formatter = pkgs.nixpkgs-fmt;
|
# for `nix fmt`
|
||||||
|
formatter = treefmtEval.config.build.wrapper;
|
||||||
}))
|
}))
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
30
treefmt.nix
Normal file
30
treefmt.nix
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
# Used to find the project root
|
||||||
|
projectRootFile = "flake.nix";
|
||||||
|
programs.nixfmt.enable = true;
|
||||||
|
programs.prettier = {
|
||||||
|
enable = true;
|
||||||
|
includes = [
|
||||||
|
"*.css"
|
||||||
|
"*.html"
|
||||||
|
"*.js"
|
||||||
|
"*.json"
|
||||||
|
"*.json5"
|
||||||
|
"*.md"
|
||||||
|
"*.mdx"
|
||||||
|
"*.toml"
|
||||||
|
"*.yaml"
|
||||||
|
"*.yml"
|
||||||
|
];
|
||||||
|
excludes = [
|
||||||
|
"supply-chain/*"
|
||||||
|
];
|
||||||
|
settings = {
|
||||||
|
plugins = [
|
||||||
|
"${pkgs.nodePackages.prettier-plugin-toml}/lib/node_modules/prettier-plugin-toml/lib/index.js"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
programs.rustfmt.enable = true;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user