diff --git a/default.nix b/default.nix
index 84a1a0c..6fe5f00 100644
--- a/default.nix
+++ b/default.nix
@@ -25,10 +25,6 @@ let
 in
 {
 
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
   networking.nameservers = [
     "9.9.9.9"
     "1.1.1.1"
@@ -36,7 +32,21 @@ in
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  nix.settings.trusted-users = [ "administration" ];
+  nix = {
+    settings = {
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+      trusted-users = [ "administration" ];
+      auto-optimise-store = true;
+    };
+    optimise.automatic = true;
+    gc = {
+      automatic = true;
+      options = "--delete-older-than 42d";
+    };
+  };
 
   networking.domain = "htw.stura-dresden.de";
 
diff --git a/flake.nix b/flake.nix
index 6ec8d49..17a40d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -117,14 +117,20 @@
         // {
           "${input}" = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
-            modules = [
-              ./hosts/${input}
-              ./hosts/${input}/hetzner-disk.nix
-              ./default.nix
-              disko.nixosModules.disko
-              authentik.nixosModules.default
-              mailserver.nixosModules.mailserver
-            ];
+            modules =
+              let
+                modulesPath = "${nixpkgs}";
+              in
+              [
+                ./hosts/${input}
+                ./default.nix
+                disko.nixosModules.disko
+                authentik.nixosModules.default
+                mailserver.nixosModules.mailserver
+                {
+                  _module.args = { inherit modulesPath; };
+                }
+              ];
           };
         }
       ) { } (builtins.attrNames (builtins.readDir ./hosts));