diff --git a/users/modules/vcs/default.nix b/users/modules/vcs/default.nix
index 571b187..64d52d0 100644
--- a/users/modules/vcs/default.nix
+++ b/users/modules/vcs/default.nix
@@ -12,6 +12,7 @@ in {
   options.modules.vcs = {
     git = {
       enable = mkEnableOption "enables git";
+      cliff = mkEnableOption "enables git-cliff support";
       sendmail = {
         enable = mkOption {
           type = types.bool;
@@ -94,7 +95,7 @@ in {
     '');
     modules = {
       git = mkIf cfg.git.enable {
-        inherit (cfg.git) enable sendmail browser completeConfig emacs mergeTool;
+        inherit (cfg.git) enable cliff sendmail browser completeConfig emacs mergeTool;
         inherit (cfg) email name editor;
         publicKeyFile = cfg.publicKey.file;
       };
diff --git a/users/modules/vcs/git.nix b/users/modules/vcs/git.nix
index e877f9c..437fe31 100644
--- a/users/modules/vcs/git.nix
+++ b/users/modules/vcs/git.nix
@@ -17,6 +17,7 @@ in {
       type = types.str;
       default = "Lucien Cartier-Tilet";
     };
+    cliff = mkEnableOption "enables git-cliff support";
     sendmail = {
       enable = mkOption {
         type = types.bool;
@@ -77,6 +78,7 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    programs.git-cliff.enable = cfg.cliff;
     programs.git = let
       smtpEmail =
         if (cfg.sendmail.user == null)
diff --git a/users/phundrak/home.nix b/users/phundrak/home.nix
index 54f11a7..1b6e54b 100644
--- a/users/phundrak/home.nix
+++ b/users/phundrak/home.nix
@@ -89,6 +89,7 @@
           integration = true;
           pkg = emacsPkg;
         };
+        cliff = true;
         sendmail = {
           enable = true;
           passwordFile = config.sops.secrets.emailPassword.path;