diff --git a/modules/home/gdb/default.nix b/modules/home/gdb/default.nix
index efb49e2..1ffc6bd 100644
--- a/modules/home/gdb/default.nix
+++ b/modules/home/gdb/default.nix
@@ -23,11 +23,11 @@ in
 
       xdg = {
         configFile."gdb/gdbinit".source = ./gdbinit;
-        dataFile. "gdb/.keep".text = "";
+        stateFile."gdb/.keep".text = "";
       };
 
       home.sessionVariables = {
-        GDBHISTFILE = "${config.xdg.dataHome}/gdb/gdb_history";
+        GDBHISTFILE = "${config.xdg.stateHome}/gdb/gdb_history";
       };
     }
 
diff --git a/modules/home/pager/default.nix b/modules/home/pager/default.nix
index e304097..1119440 100644
--- a/modules/home/pager/default.nix
+++ b/modules/home/pager/default.nix
@@ -15,7 +15,7 @@ in
       # Clear the screen on start and exit
       LESS = "-R -+X -c";
       # Better XDG compliance
-      LESSHISTFILE = "${config.xdg.dataHome}/less/history";
+      LESSHISTFILE = "${config.xdg.stateHome}/less/history";
       LESSKEY = "${config.xdg.configHome}/less/lesskey";
     };
   };
diff --git a/modules/home/wget/default.nix b/modules/home/wget/default.nix
index 32c13c0..1be5397 100644
--- a/modules/home/wget/default.nix
+++ b/modules/home/wget/default.nix
@@ -20,7 +20,7 @@ in
     };
 
     xdg.configFile."wgetrc".text = ''
-      hsts-file = ${config.xdg.dataHome}/wget-hsts
+      hsts-file = ${config.xdg.stateHome}/wget-hsts
     '';
   };
 }
diff --git a/modules/home/xdg/default.nix b/modules/home/xdg/default.nix
index fb2668c..e180f27 100644
--- a/modules/home/xdg/default.nix
+++ b/modules/home/xdg/default.nix
@@ -34,6 +34,9 @@ in
       "gdb/.keep".text = "";
       "tig/.keep".text = "";
     };
+    stateFile = {
+      "python/.keep".text = "";
+    };
   };
 
   # I want a tidier home
@@ -43,13 +46,13 @@ in
     CARGO_HOME = "${dataHome}/cargo";
     DOCKER_CONFIG = "${configHome}/docker";
     GRADLE_USER_HOME = "${dataHome}/gradle";
-    HISTFILE = "${dataHome}/bash/history";
+    HISTFILE = "${stateHome}/bash/history";
     INPUTRC = "${configHome}/readline/inputrc";
-    PSQL_HISTORY = "${dataHome}/psql_history";
+    PSQL_HISTORY = "${stateHome}/psql_history";
     PYTHONPYCACHEPREFIX = "${cacheHome}/python/";
     PYTHONUSERBASE = "${dataHome}/python/";
     PYTHON_HISTORY = "${stateHome}/python/history";
-    REDISCLI_HISTFILE = "${dataHome}/redis/rediscli_history";
+    REDISCLI_HISTFILE = "${stateHome}/redis/rediscli_history";
     REPO_CONFIG_DIR = "${configHome}/repo";
     XCOMPOSECACHE = "${dataHome}/X11/xcompose";
     _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${configHome}/java";
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
index a277366..11b6cb2 100644
--- a/modules/home/zsh/default.nix
+++ b/modules/home/zsh/default.nix
@@ -68,7 +68,7 @@ in
           ignoreSpace = true;
           ignoreDups = true;
           share = false;
-          path = "${config.xdg.dataHome}/zsh/zsh_history";
+          path = "${config.xdg.stateHome}/zsh/zsh_history";
         };
 
         plugins = [