diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix
index 189adc4..61fbeb7 100644
--- a/modules/home-manager/common.nix
+++ b/modules/home-manager/common.nix
@@ -5,4 +5,27 @@
     ./shell
     ./git.nix
   ];
+
+  home.sessionVariables = {
+    CARGO_HOME = "${config.xdg.dataHome}/cargo";
+    RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
+    NUGET_PACKAGES = "${config.xdg.dataHome}/nuget";
+    W3M_DIR = "${config.xdg.dataHome}/w3m";
+  };
+
+  xdg.userDirs = {
+    enable = true;
+    createDirectories = true;
+
+    download = "${config.home.homeDirectory}/download";
+
+    music = "${config.home.homeDirectory}/media/music";
+    pictures = "${config.home.homeDirectory}/media/images";
+    videos = "${config.home.homeDirectory}/media/videos";
+
+    desktop = "${config.xdg.dataHome}/desktop";
+    documents = "${config.xdg.dataHome}/documents";
+    publicShare = "${config.xdg.dataHome}/public";
+    templates = "${config.xdg.dataHome}/templates";
+  };
 }
diff --git a/modules/home-manager/desktop.nix b/modules/home-manager/desktop.nix
index 6968a5a..a25ca15 100644
--- a/modules/home-manager/desktop.nix
+++ b/modules/home-manager/desktop.nix
@@ -88,9 +88,6 @@
       pipes
       cmatrix
 
-      # Backup
-      vscode
-
       libreoffice-qt6-fresh
     ];
   };
diff --git a/modules/home-manager/shell/zsh.nix b/modules/home-manager/shell/zsh.nix
index 338d26d..10b5fb1 100644
--- a/modules/home-manager/shell/zsh.nix
+++ b/modules/home-manager/shell/zsh.nix
@@ -21,6 +21,9 @@ in
 
   programs.zsh = {
     enable = true;
+
+    dotDir = "${config.xdg.configHome}/zsh";
+
     enableCompletion = true;
     autosuggestion.enable = true;
     syntaxHighlighting = {
@@ -40,6 +43,7 @@ in
       ignoreDups = true;
       save = 10000;
       size = 10000;
+      path = "${config.xdg.dataHome}/zsh_history";
     };
 
     profileExtra = lib.optionalString (config.home.sessionPath != [ ]) ''