diff --git a/modules/environment/default.nix b/modules/environment/default.nix
index d0fb128c..2791c45f 100644
--- a/modules/environment/default.nix
+++ b/modules/environment/default.nix
@@ -169,7 +169,10 @@ in
     '';
 
     environment.variables =
-      { EDITOR = mkDefault "nano";
+      {
+        XDG_CONFIG_DIRS = map (path: path + "/etc/xdg") cfg.profiles;
+        XDG_DATA_DIRS = map (path: path + "/share") cfg.profiles;
+        EDITOR = mkDefault "nano";
         PAGER = mkDefault "less -R";
       };
 
diff --git a/modules/programs/bash/default.nix b/modules/programs/bash/default.nix
index 1e60d843..7d13c690 100644
--- a/modules/programs/bash/default.nix
+++ b/modules/programs/bash/default.nix
@@ -86,9 +86,6 @@ in
             for m in "$p/etc/bash_completion.d/"*; do
               source $m
             done
-            for m in "$p/share/bash-completion/completions/"*; do
-              source $m
-            done
           done
           eval "$nullglobStatus"
           unset nullglobStatus p m