diff --git a/.cz.toml b/.cz.toml
new file mode 100644
index 0000000..d98e25c
--- /dev/null
+++ b/.cz.toml
@@ -0,0 +1,7 @@
+[tool.commitizen]
+name = "cz_conventional_commits"
+tag_format = "$version"
+version_scheme = "semver"
+version = "0.0.1"
+update_changelog_on_bump = true
+major_version_zero = true
diff --git a/hosts/nixos/home.nix b/hosts/nixos/home.nix
index 20e568f..62ffb1c 100644
--- a/hosts/nixos/home.nix
+++ b/hosts/nixos/home.nix
@@ -43,6 +43,7 @@
     osu-lazer-bin
     overskride
     delfin
+    commitizen
   ];
 
   # Install librewolf
diff --git a/shell.nix b/shell.nix
index bdd7d67..96cfeff 100644
--- a/shell.nix
+++ b/shell.nix
@@ -9,6 +9,8 @@
       # General formaters
       end-of-file-fixer.enable = true;
       mixed-line-endings.enable = true;
+      # Git commit lint
+      commitizen.enable = true;
       # Nix section
       alejandra.enable = true;
       deadnix.enable = true;