@@ -6,7 +6,7 @@ imports = [
     ./settings/base.nix
     ./settings/configuration/berlin.nix
     ./settings/configuration/british-english.nix
-    ./settings/configuration/nix.nix
+    ./settings/configuration/nix-linux.nix
     ./settings/configuration/user.nix
     ./settings/hardware/audio.nix
     ./settings/hardware/bare-metal.nix

@@ -0,0 +1,32 @@
+{ config
+, lib
+, pkgs
+, ...
+}: {
+  imports = [
+    ./nix.nix
+  ];
+
+  nix = {
+    settings = {
+      auto-optimise-store = true;
+
+      daemonCPUSchedPolicy = "idle";
+      daemonIOSchedClass = "idle";
+    };
+  };
+
+  nixpkgs.config.allowUnfree = true;
+
+  system.autoUpgrade = {
+    enable = true;
+    flags = [ "--max-jobs" "2" ];
+    flake = "/home/alan/projects/alanpearce/nixfiles";
+  };
+  systemd.services.nixos-upgrade = {
+    script = pkgs.lib.mkForce ''
+      ${pkgs.nix}/bin/nix-channel --update
+      ${config.system.build.nixos-rebuild}/bin/nixos-rebuild boot --no-build-output ${toString config.system.autoUpgrade.flags}
+    '';
+  };
+}

@@ -8,36 +8,17 @@ ../../../pin.nix
   ];
   nix = {
     settings = {
-      cores = 0;
-      auto-optimise-store = true;
+      cores = lib.mkDefault 0;
       use-xdg-base-directories = true;
+      keep-outputs = true;
+      keep-derivations = true;
+      experimental-features = "nix-command flakes";
+      warn-dirty = false;
     };
 
-    daemonCPUSchedPolicy = "idle";
-    daemonIOSchedClass = "idle";
-
-    extraOptions = ''
-      keep-outputs = true
-      keep-derivations = true
-      experimental-features = nix-command flakes
-      warn-dirty = false
-    '';
-
     gc = {
       automatic = lib.mkDefault true;
-      options = "--delete-older-than 14d";
+      options = lib.mkDefault "--delete-older-than 14d";
     };
-  };
-
-  system.autoUpgrade = {
-    enable = true;
-    flags = [ "--max-jobs" "2" ];
-    flake = "/home/alan/projects/alanpearce/nixfiles";
-  };
-  systemd.services.nixos-upgrade = {
-    script = pkgs.lib.mkForce ''
-      ${pkgs.nix}/bin/nix-channel --update
-      ${config.system.build.nixos-rebuild}/bin/nixos-rebuild boot --no-build-output ${toString config.system.autoUpgrade.flags}
-    '';
   };
 }

@@ -4,7 +4,7 @@ , lib
 , ...
 }: {
   imports = [
-    ../../pin.nix
+    ./configuration/nix.nix
   ];
   services.nix-daemon = {
     enable = true;
@@ -17,19 +17,12 @@ [ "/run/current-system/sw" "/nix/var/nix/profiles/default" ]
   ];
 
   nix = {
-    settings.cores = lib.mkDefault 0;
     daemonIOLowPriority = true;
     gc = {
-      automatic = true;
       user = "alan";
       options = "--max-freed $((25 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | awk '{ print $4 }')))";
     };
     settings.extra-platforms = "aarch64-darwin x86_64-darwin";
-    settings.experimental-features = "nix-command flakes";
-    settings.warn-dirty = false;
-    settings.keep-outputs = true;
-    settings.keep-derivations = true;
-    settings.use-xdg-base-directories = true;
 
     linux-builder.enable = true;
     settings.trusted-users = [ "@admin" ];