improve devShell

This commit is contained in:
Louis Bettens 2021-07-04 17:11:21 +02:00
parent c6a7c6a071
commit fe994439ff
2 changed files with 15 additions and 5 deletions

View File

@ -28,6 +28,18 @@ category = "linters"
[git.hooks]
enable = true
pre-commit.text = """
find -name '*.nix' | xargs -r nixpkgs-fmt --check || exit
find -name '*.bash' | xargs -r shfmt -d -s || exit
if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
# Initial commit: diff against an empty tree object
against=$(git hash-object -t tree /dev/null)
fi
function find_staged {
git diff-index --name-only --cached $against --diff-filter d -- "$@"
}
find_staged '*.nix' | xargs -r nixpkgs-fmt --check || exit
find_staged '*.bash' | xargs -r shfmt -d -s || exit
"""

View File

@ -21,9 +21,7 @@
miniguest = final.callPackage ./miniguest { };
defaultPackage = miniguest;
defaultApp = mkApp { drv = miniguest; };
devShell = final.devshell.mkShell {
imports = [ (final.devshell.importTOML ./devshell.toml) ];
};
devShell = final.devshell.fromTOML ./devshell.toml;
checks = import ./checks inputs final prev;
};
};