diff --git a/modules/nix.nix b/modules/nix.nix
index d498061..c830a54 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -40,6 +40,7 @@ in {
       flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}'';
       keep-outputs = true;
       keep-derivations = true;
+      use-xdg-base-directories = true;
       trusted-users = [
         "root"
         "@wheel"
diff --git a/modules/shell.nix b/modules/shell.nix
index a77e22d..fad06ea 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -19,7 +19,6 @@
       PAGER = "page";
       SYSTEMD_PAGERSECURE = "true";
       TERMINAL = "st";
-      NIX_BUILD_SHELL = "zsh";
       DIRENV_LOG_FORMAT = "";
     };
     shellAliases = {