diff --git a/flake.lock b/flake.lock
index 32bb8e3..b6c9b2f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,22 @@
         "type": "github"
       }
     },
+    "cmp-conventionalcommits": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1635383929,
+        "narHash": "sha256-ZuVXmn4YkeMFiLjSVTd+6DBdtn0D+PI44J3kLDX6Wwo=",
+        "owner": "davidsierradz",
+        "repo": "cmp-conventionalcommits",
+        "rev": "5518362bc4f5dfbc9d242d9379fdec48b6278c5e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "davidsierradz",
+        "repo": "cmp-conventionalcommits",
+        "type": "github"
+      }
+    },
     "cmp-git": {
       "flake": false,
       "locked": {
@@ -107,6 +123,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "cmp-conventionalcommits": "cmp-conventionalcommits",
         "cmp-git": "cmp-git",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
diff --git a/flake.nix b/flake.nix
index caae3bb..1320936 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,6 +8,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    cmp-conventionalcommits = {
+      url = "github:davidsierradz/cmp-conventionalcommits";
+      flake = false;
+    };
+
     cmp-git = {
       url = "github:petertriho/cmp-git";
       flake = false;
diff --git a/programs/nvim.nix b/programs/nvim.nix
index 6a2cbf7..eead769 100644
--- a/programs/nvim.nix
+++ b/programs/nvim.nix
@@ -20,6 +20,7 @@
           };
         buildPlugins = names: lib.attrsets.genAttrs names buildPlugin;
         plugins = buildPlugins [
+          "cmp-conventionalcommits"
           "cmp-git"
           "lsp-trouble"
         ];
@@ -28,6 +29,7 @@
         with plugins; [
           {plugin = cmp-buffer;}
           {plugin = cmp-calc;}
+          {plugin = cmp-conventionalcommits;}
           {plugin = cmp-latex-symbols;}
           {plugin = cmp-nvim-lsp;}
           {plugin = cmp-path;}
@@ -144,6 +146,7 @@
                   sources = cmp.config.sources {
                     { name = 'buffer' },
                     { name = 'calc' },
+                    { name = 'conventionalcommits' },
                     { name = 'crates' },
                     { name = 'git' },
                     { name = 'latex_symbols' },