Fix: Use nix flake check for hooks, simplify module, remove apps
This commit is contained in:
@@ -1,22 +1,48 @@
|
||||
{ config, lib, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
options.services.git-hooks = {
|
||||
enable = lib.mkEnableOption "Install git hooks for Nix flake";
|
||||
flake-path = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = "Path to Nix flake repository";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.services.git-hooks.enable {
|
||||
system.activationScripts.git-hooks = lib.stringAfter [ "users" ] ''
|
||||
if [ -d "${config.services.git-hooks.flake-path}/.git" ]; then
|
||||
echo "🪝 Installing git hooks..."
|
||||
cd ${config.services.git-hooks.flake-path}
|
||||
nix run .#apps.x86_64-linux.pre-commit-install || true
|
||||
echo "✅ Done"
|
||||
echo "🪝 Installing git hooks..."
|
||||
|
||||
cd /home/h/nix
|
||||
|
||||
# Use nix flake check which properly evaluates and installs hooks
|
||||
nix flake check 2>&1 || true
|
||||
|
||||
# Verify hooks were installed
|
||||
if [ -f ".git/hooks/pre-commit" ]; then
|
||||
echo "✅ Git hooks installed successfully"
|
||||
else
|
||||
echo "⚠️ Git hooks may not have installed properly"
|
||||
fi
|
||||
'';
|
||||
|
||||
environment.systemPackages = lib.singleton (
|
||||
pkgs.writeShellApplication {
|
||||
name = "install-git-hooks";
|
||||
runtimeInputs = [ pkgs.git ];
|
||||
text = ''
|
||||
set -euo pipefail
|
||||
echo "🪝 Installing git hooks..."
|
||||
cd /home/h/nix
|
||||
nix flake check || echo "⚠️ Hook installation had issues"
|
||||
echo "✅ Done"
|
||||
'';
|
||||
}
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user