diff --git a/modules/home/docker.nix b/modules/home/docker.nix
index d755d1e..1c2fa08 100644
--- a/modules/home/docker.nix
+++ b/modules/home/docker.nix
@@ -10,9 +10,9 @@ with lib;
 let
   configDir =
     if pkgs.stdenv.hostPlatform.isDarwin then
-      "Library/Application Support"
+      "Library/Application Support/docker"
     else
-      removePrefix config.home.homeDirectory config.xdg.configHome;
+      "${removePrefix config.home.homeDirectory config.xdg.configHome}/docker";
 in
 {
   home.packages = [
@@ -22,8 +22,8 @@ in
 
   programs = {
     docker-cli = {
+      inherit configDir;
       enable = true;
-      configDir = "${configDir}/docker";
       settings.auths = {
         "asia.gcr.io" = { };
         "eu.gcr.io" = { };
diff --git a/modules/home/javascript.nix b/modules/home/javascript.nix
index 09a4f0a..942c6df 100644
--- a/modules/home/javascript.nix
+++ b/modules/home/javascript.nix
@@ -7,14 +7,14 @@
 let
   cacheDir =
     if pkgs.stdenv.hostPlatform.isDarwin then
-      "${config.home.homeDirectory}/Library/Caches"
+      "${config.home.homeDirectory}/Library/Caches/npm"
     else
-      config.xdg.cacheHome;
+      "${config.xdg.cacheHome}/npm";
   configDir =
     if pkgs.stdenv.hostPlatform.isDarwin then
-      "${config.home.homeDirectory}/Library/Application Support"
+      "${config.home.homeDirectory}/Library/Application Support/npm"
     else
-      config.xdg.configHome;
+      "${config.xdg.configHome}/npm";
 in
 {
   home.packages = [
@@ -25,8 +25,8 @@ in
   ];
 
   home.sessionVariables = {
-    NPM_CONFIG_CACHE = "${cacheDir}/npm";
-    NPM_CONFIG_USERCONFIG = "${configDir}/npm";
+    NPM_CONFIG_CACHE = cacheDir;
+    NPM_CONFIG_USERCONFIG = configDir;
   };
 
   programs.nushell.extraConfig = ''
diff --git a/modules/home/k8s.nix b/modules/home/k8s.nix
index 6aae0ad..4f14a82 100644
--- a/modules/home/k8s.nix
+++ b/modules/home/k8s.nix
@@ -7,9 +7,9 @@
 let
   configDir =
     if pkgs.stdenv.hostPlatform.isDarwin then
-      "${config.home.homeDirectory}/Library/Application Support"
+      "${config.home.homeDirectory}/Library/Application Support/skaffold"
     else
-      config.xdg.configHome;
+      "${config.xdg.configHome}/skaffold";
 in
 {
   home = {
@@ -21,6 +21,6 @@ in
       pkgs.skaffold
     ];
 
-    sessionVariables.SKAFFOLD_CONFIG = "${configDir}/skaffold/config";
+    sessionVariables.SKAFFOLD_CONFIG = "${configDir}/config";
   };
 }
diff --git a/modules/home/rust.nix b/modules/home/rust.nix
index 607ac71..b33fa84 100644
--- a/modules/home/rust.nix
+++ b/modules/home/rust.nix
@@ -5,23 +5,29 @@
 }:
 
 let
-  configDir =
+  cargoConfigDir =
     if pkgs.stdenv.hostPlatform.isDarwin then
-      "${config.home.homeDirectory}/Library/Application Support"
+      "${config.home.homeDirectory}/Library/Application Support/cargo"
     else
-      config.xdg.configHome;
+      "${config.xdg.configHome}/cargo";
+
+  rustupConfigDir =
+    if pkgs.stdenv.hostPlatform.isDarwin then
+      "${config.home.homeDirectory}/Library/Application Support/rustup"
+    else
+      "${config.xdg.configHome}/rustup";
 in
 {
   home = {
     packages = [ pkgs.rustup ];
 
     sessionPath = [
-      "${configDir}/cargo/bin"
+      "${cargoConfigDir}/bin"
     ];
 
     sessionVariables = {
-      CARGO_HOME = "${configDir}/cargo";
-      RUSTUP_HOME = "${configDir}/rustup";
+      CARGO_HOME = cargoConfigDir;
+      RUSTUP_HOME = rustupConfigDir;
     };
   };