diff --git a/home/config/xdg/directory-spec-overrides.nix b/home/config/xdg/directory-spec-overrides.nix
index fdf1777..0e7f8d5 100644
--- a/home/config/xdg/directory-spec-overrides.nix
+++ b/home/config/xdg/directory-spec-overrides.nix
@@ -11,11 +11,9 @@
     TEXMFCONFIG = "${configHome}/texlive";
 
     PSQL_HISTORY = "${dataHome}/psql_history";
-    SQLITE_HISTORY= "${dataHome}/sqlite_history";
     MYSQL_HISTFILE = "${dataHome}/mysql_history";
     NODE_REPL_HISTORY = "${dataHome}/node_repl_history";
     GDB_HISTFILE = "${dataHome}/gdb_history";
-    PYTHON_HISTORY = "${dataHome}/python_history";
     HISTFILE = "${dataHome}/bash_history";
 
     GHCUP_USE_XDG_DIRS = "true";
@@ -27,7 +25,6 @@
     BZRPATH = "${configHome}/bazaar";
     BZR_PLUGIN_PATH = "${dataHome}/bazaar";
     BZR_HOME = "${cacheHome}/bazaar";
-    CARGO_HOME = "${dataHome}/cargo";
     CUDA_CACHE_PATH = "${cacheHome}/nv";
     DOCKER_CONFIG = "${configHome}/docker";
     DOTNET_CLI_HOME = "${dataHome}/dotnet";
diff --git a/home/programs/python.nix b/home/programs/python.nix
index 6c39071..7671d47 100644
--- a/home/programs/python.nix
+++ b/home/programs/python.nix
@@ -17,5 +17,8 @@
     sys.ps2='\x01\x1b[1;49;31m\x02...\x01\x1b[0m\x02 '  # bright red
   '';
 
-  home.sessionVariables.PYTHONSTARTUP = "${config.xdg.configHome}/python/pyrc";
+  home.sessionVariables = {
+    PYTHONSTARTUP = "${config.xdg.configHome}/python/pyrc";
+    PYTHON_HISTORY = "${config.xdg.dataHome}/python_history";
+  };
 }
diff --git a/home/programs/sqlite.nix b/home/programs/sqlite.nix
index 74d4aea..9974b36 100644
--- a/home/programs/sqlite.nix
+++ b/home/programs/sqlite.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   xdg.configFile."sqlite3/sqliterc".text = ''
     .bail on
@@ -12,4 +12,6 @@
   home.packages = [
     pkgs.sqlite-interactive
   ];
+
+  home.sessionVariables.SQLITE_HISTORY= "${config.xdg.dataHome}/sqlite_history";
 }