diff --git a/.gitattributes b/.gitattributes
index e0f76f82..74bc5051 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,4 @@ Cargo.nix linguist-generated
 yarn.lock linguist-generated
 nix/** linguist-generated
 go.sum linguist-generated
+gomod2nix.toml linguist-generated
diff --git a/.gitignore b/.gitignore
index a7cd14bb..40b2fd66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,11 +6,6 @@
 htpasswd
 .yarn
 
-# Nix
-gomod2nix.toml
-Cargo.nix
-crate-hashes.json
-
 # Misc
 /demos
 /stacks
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3aa7d999..8673ebe4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,6 @@
 ---
 # See https://pre-commit.com for more information
+fail_fast: true
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -7,8 +8,9 @@ repos:
     hooks:
       - id: trailing-whitespace
         # Generated file
-        exclude: ^web/src/api/schema.d.ts|extra/.*$
+        exclude: ^web/src/api/schema\.d\.ts|extra/.*$
       - id: end-of-file-fixer
+        exclude: Cargo.nix
       - id: detect-aws-credentials
         args: ["--allow-missing-credentials"]
       - id: detect-private-key
@@ -49,31 +51,43 @@ repos:
     hooks:
       - id: gen-man
         name: gen-man
+        files: ^rust/stackablectl/
         language: system
         entry: cargo xtask gen-man
         stages: [commit, merge-commit, manual]
         pass_filenames: false
       - id: gen-comp
         name: gen-comp
+        files: ^rust/stackablectl/
         language: system
         entry: cargo xtask gen-comp
         stages: [commit, merge-commit, manual]
         pass_filenames: false
       - id: gen-openapi
         name: gen-openapi
+        files: ^web/
         language: system
         entry: cargo xtask gen-openapi
         stages: [commit, merge-commit, manual]
         pass_filenames: false
       - id: gen-ctl-readme
         name: gen-ctl-readme
+        files: ^rust/stackablectl/
         language: system
         entry: cargo xtask gen-ctl-readme
         stages: [commit, merge-commit, manual]
         pass_filenames: false
       - id: gen-docs
         name: gen-docs
+        files: ^rust/stackablectl/
         language: system
         entry: cargo xtask gen-docs
         stages: [commit, merge-commit, manual]
         pass_filenames: false
+      - id: gen-cargo-nix
+        name: gen-cargo-nix
+        files: ^Cargo\.lock|go\.mod$
+        language: system
+        entry: make regenerate-nix
+        stages: [commit, merge-commit, manual]
+        pass_filename: false
diff --git a/Cargo.nix b/Cargo.nix
index 2b1e1aa1..a3ac620c 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -9465,7 +9465,7 @@ rec {
       };
       "stackablectl" = rec {
         crateName = "stackablectl";
-        version = "24.3.4";
+        version = "24.3.5";
         edition = "2021";
         crateBin = [
           {