diff --git a/sets/base.nix b/sets/base.nix
index d264cd7..2fd05bc 100644
--- a/sets/base.nix
+++ b/sets/base.nix
@@ -12,16 +12,18 @@
       type = "path";
       path = inputs.nixpkgs.outPath;
     };
-    settings.auto-optimise-store = true;
-    extraOptions = ''
-      experimental-features = nix-command flakes ca-derivations
-    '';
+    settings = {
+      auto-optimise-store = true;
+      experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
+      trusted-users = [ "@wheel" ];
+      use-xdg-base-directories = true;
+    };
+
     gc = {
       automatic = true;
       dates = "8:00";
       options = "--delete-older-than 14d";
     };
-    settings.trusted-users = [ "artemis" ];
   };
 
   nixpkgs = {