diff --git a/nix/modules/home-manager/cli/git.nix b/nix/modules/home-manager/cli/git.nix
index 3db41cbf..3b046c61 100644
--- a/nix/modules/home-manager/cli/git.nix
+++ b/nix/modules/home-manager/cli/git.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  home.file.".gitmessage".text = ''
+  home.file."${config.xdg.configHome}/git/message".text = ''
 
 
     # Description
@@ -103,7 +103,7 @@
         checkout.defaultRemote = "origin";
         color.ui = true;
         column.ui = "auto";
-        commit.template = "~/.gitmessage";
+        commit.template = "${config.xdg.configHome}/git/message";
 
         core = {
           editor = "nvim";