diff --git a/.config/nix/flake.nix b/.config/nix/flake.nix
index 63e0242..80941a2 100644
--- a/.config/nix/flake.nix
+++ b/.config/nix/flake.nix
@@ -25,11 +25,6 @@
     darwinConfigurations.TobAir = darwin.lib.darwinSystem {
       system = "aarch64-darwin";
 
-      pkgs = import nixpkgs {
-        system = "aarch64-darwin";
-        config.allowUnfree = true;
-      };
-
       modules = [
         ./modules/nix-core.nix
         ./modules/system.nix
diff --git a/.config/nix/modules/nix-core.nix b/.config/nix/modules/nix-core.nix
index c955346..045799d 100644
--- a/.config/nix/modules/nix-core.nix
+++ b/.config/nix/modules/nix-core.nix
@@ -1,6 +1,15 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nixpkgs.config.allowUnfree = true;
+  nix.package = pkgs.nix;
   services.nix-daemon.enable = true;
   programs.nix-index.enable = true;
+  nix.gc = {
+    automatic = lib.mkDefault true;
+    options = lib.mkDefault "--delete-older-than 7d";
+  };
+  nix.settings = {
+    auto-optimise-store = false;
+  };
 }