diff --git a/.gitignore b/.gitignore
index 0fb07cfaf..c3acfbc13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,4 @@ docker/livekit/rootCA.pem
 
 # NixOS
 .devenv
+.pre-commit-config.yaml
diff --git a/devenv.lock b/devenv.lock
index 81f597ef3..58769be7e 100644
--- a/devenv.lock
+++ b/devenv.lock
@@ -18,12 +18,50 @@
         "url": "https://github.com/cachix/devenv"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1791909798,
+        "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=",
+        "ref": "refs/heads/master",
+        "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9",
+        "shallow": true,
+        "type": "git",
+        "url": "https://github.com/cachix/git-hooks.nix"
+      },
+      "original": {
+        "shallow": true,
+        "type": "git",
+        "url": "https://github.com/cachix/git-hooks.nix"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1789542786,
-        "narHash": "sha256-ajQuqcxnj6RYnwCjA/9FTCnrdR2+BDzstE8UembXf60=",
+        "lastModified": 1792295010,
+        "narHash": "sha256-F7meJtbqGttmUoMmYjRRgkVs42sn7bh7vvRvLPlUN98=",
         "ref": "nixos-26.05",
-        "rev": "4c7870105e7f1fdf9c48688c8d7efc21abf0688a",
+        "rev": "8ce73368d1efd4d657e9064d29b144a52046b4e8",
         "shallow": true,
         "type": "git",
         "url": "https://github.com/NixOS/nixpkgs"
@@ -38,6 +76,7 @@
     "root": {
       "inputs": {
         "devenv": "devenv",
+        "git-hooks": "git-hooks",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/devenv.nix b/devenv.nix
index e7f808f5b..9a83ff5cb 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -101,6 +101,8 @@ in
     languages.typescript.enable = false;
     languages.nix.enable = true;
 
+    git-hooks.hooks.gitlint.enable = true;
+
     packages =
       with pkgs;
       [
diff --git a/devenv.yaml b/devenv.yaml
index 60520eef5..5b852af04 100644
--- a/devenv.yaml
+++ b/devenv.yaml
@@ -3,3 +3,8 @@ inputs:
     url: git+https://github.com/NixOS/nixpkgs?ref=nixos-26.05&shallow=1
   devenv:
     url: git+https://github.com/cachix/devenv?ref=refs/tags/v2.1.2&dir=src/modules
+  git-hooks:
+    url: git+https://github.com/cachix/git-hooks.nix?shallow=1
+    inputs:
+      nixpkgs:
+        follows: nixpkgs