diff --git a/subprojects/wrapper-manager-fds/Makefile b/subprojects/wrapper-manager-fds/Makefile index e45c7669..b0024313 100644 --- a/subprojects/wrapper-manager-fds/Makefile +++ b/subprojects/wrapper-manager-fds/Makefile @@ -11,3 +11,8 @@ docs-build: .PHONY: update update: npins update + +# Ideally this should be done before committing. +.PHONY: format +format: + treefmt diff --git a/subprojects/wrapper-manager-fds/shell.nix b/subprojects/wrapper-manager-fds/shell.nix index d1cff494..c471c348 100644 --- a/subprojects/wrapper-manager-fds/shell.nix +++ b/subprojects/wrapper-manager-fds/shell.nix @@ -4,19 +4,16 @@ in { pkgs ? import sources.nixos-unstable { } }: let - websiteDevshell = import ./docs/shell.nix { inherit pkgs; }; + websitePkg = import ./docs { inherit pkgs; }; in pkgs.mkShell { - packages = with pkgs; [ - websiteDevshell + inputsFrom = [ websitePkg ]; + packages = with pkgs; [ npins treefmt nixpkgs-fmt - hugo - asciidoctor - # For easy validation of the test suite. yajsv jq diff --git a/subprojects/wrapper-manager-fds/treefmt.toml b/subprojects/wrapper-manager-fds/treefmt.toml new file mode 100644 index 00000000..4deb3fd4 --- /dev/null +++ b/subprojects/wrapper-manager-fds/treefmt.toml @@ -0,0 +1,8 @@ +[global] +excludes = [ + "npins/default.nix" +] + +[formatter.nix] +command = "nixfmt" +includes = [ "*.nix" ]