From 0eb0dede78075916772acf62e4a57c749153dfc6 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Fri, 23 Sep 2022 11:17:03 -0500
Subject: [PATCH] Convert nix settings to nix format

---
 modules-all/automatic/nix.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules-all/automatic/nix.nix b/modules-all/automatic/nix.nix
index bc4bdb9..feb18e6 100644
--- a/modules-all/automatic/nix.nix
+++ b/modules-all/automatic/nix.nix
@@ -6,6 +6,11 @@
 		package = pkgs.nixFlakes;
 
 		settings = {
+			experimental-features = "nix-command flakes";
+			keep-outputs = true;
+			keep-derivations = true;
+			min-free = (toString (1024 * 1024 * 1024) );
+			max-free = (toString (5 * 1024 * 1024 * 1024) );
 			substituters = [
 				"https://cache.garnix.io"
 			];
@@ -13,16 +18,6 @@
 				"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
 			];
 		};
-		# Keep freespace available, at a minimum, and enable Flakes
-		extraOptions = ''
-experimental-features = nix-command flakes
-min-free = ${toString (1024 * 1024 * 1024) }
-max-free = ${toString (5 * 1024 * 1024 * 1024) }
-
-# Used by direnv
-keep-outputs = true
-keep-derivations = true
-'';
 	};
 	nixpkgs.config.allowUnfree = true;
 }