diff --git a/modules/home-manager/cli/zsh/default.nix b/modules/home-manager/cli/zsh/default.nix
index 108dd36..7fc4a5f 100644
--- a/modules/home-manager/cli/zsh/default.nix
+++ b/modules/home-manager/cli/zsh/default.nix
@@ -10,14 +10,14 @@ in
   config = mkIf cfg.enable {
     programs.zsh = {
       enable = true;
-      dotDir = ".config/zsh";
+      dotDir = "${config.xdg.configHome}/zsh";
       defaultKeymap = "viins";
       enableCompletion = true;
       history = {
         ignoreAllDups = true;
         save = 10000;
         share = true;
-        path = "$HOME/.local/share/zsh/history";
+        path = "${config.xdg.dataHome }/share/zsh/history";
       };
       historySubstringSearch = {
         enable = true;
@@ -108,7 +108,7 @@ in
           };
       }];
       localVariables = {
-        BASE16_THEME = "$HOME/.config/zsh/plugins/base16";
+        BASE16_THEME = "${config.xdg.configHome}/zsh/plugins/base16";
         # Make ESC key more reactive to go to normal mode
         KEYTIMEOUT = 1;
       };