Merge pull request 'Revert "Merge pull request 'add pre-commit-check' (#1369) from fricklerhandwerk/clan-core:add-pre-commit into main"' (#1408) from Qubasa-revert_hooks into main

This commit is contained in:
clan-bot
2024-05-22 12:36:23 +00:00
3 changed files with 2 additions and 27 deletions

View File

@@ -1,4 +1,3 @@
{ inputs, ... }:
{ {
perSystem = perSystem =
{ {
@@ -9,7 +8,6 @@
}: }:
let let
writers = pkgs.callPackage ./pkgs/builders/script-writers.nix { }; writers = pkgs.callPackage ./pkgs/builders/script-writers.nix { };
inherit (pkgs.callPackage inputs.git-hooks { }) lib;
ansiEscapes = { ansiEscapes = {
reset = ''\033[0m''; reset = ''\033[0m'';
@@ -22,11 +20,6 @@
select-shell = writers.writePython3Bin "select-shell" { select-shell = writers.writePython3Bin "select-shell" {
flakeIgnore = [ "E501" ]; flakeIgnore = [ "E501" ];
} ./pkgs/scripts/select-shell.py; } ./pkgs/scripts/select-shell.py;
# run treefmt before each commit
install-pre-commit-hook =
with lib.git-hooks;
pre-commit (wrap.abort-on-change config.treefmt.build.wrapper);
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
@@ -41,7 +34,8 @@
config.treefmt.build.wrapper config.treefmt.build.wrapper
]; ];
shellHook = '' shellHook = ''
${install-pre-commit-hook} # no longer used
rm -f "$(git rev-parse --show-toplevel)/.git/hooks/pre-commit"
echo -e "${ansiEscapes.green}switch to another dev-shell using: select-shell${ansiEscapes.reset}" echo -e "${ansiEscapes.green}switch to another dev-shell using: select-shell${ansiEscapes.reset}"
''; '';

17
flake.lock generated
View File

@@ -40,22 +40,6 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"flake": false,
"locked": {
"lastModified": 1715912400,
"narHash": "sha256-7GYXKJP7bglYgofN3/PW5EBGaGOIKbBKSgFb6m4ttC4=",
"owner": "fricklerhandwerk",
"repo": "git-hooks",
"rev": "5a23214ca74a7656048fe1402c4e98f5cd2b3729",
"type": "github"
},
"original": {
"owner": "fricklerhandwerk",
"repo": "git-hooks",
"type": "github"
}
},
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1712450863, "lastModified": 1712450863,
@@ -149,7 +133,6 @@
"inputs": { "inputs": {
"disko": "disko", "disko": "disko",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"nixos-generators": "nixos-generators", "nixos-generators": "nixos-generators",
"nixos-images": "nixos-images", "nixos-images": "nixos-images",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",

View File

@@ -21,8 +21,6 @@
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
git-hooks.url = "github:fricklerhandwerk/git-hooks";
git-hooks.flake = false;
}; };
outputs = outputs =