Greatly simplified modules

modules-all/automatic/default.nix

@@ -1,8 +0,0 @@
-{ ... }:
-
-{
-	imports = [
-		./nix.nix
-		./programs.nix
-	];
-}

modules-all/automatic/nix.nix

@@ -1,34 +0,0 @@
-{ pkgs, ... }:
-
-{
-	# Enable flakes
-	nix = {
-		package = pkgs.nixFlakes;
-		buildMachines = [
-			{
-				hostName = "dns.me.ts";
-				system = "aarch64-linux";
-			}
-
-			{
-				hostName = "jude.me.ts";
-				system = "x86_64-linux";
-			}
-		];
-
-		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"
-			];
-			trusted-public-keys = [
-				"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-			];
-		};
-	};
-	nixpkgs.config.allowUnfree = true;
-}

modules-all/automatic/programs.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
-	# Base packages that need to be in all my hosts
-	environment.systemPackages = with pkgs; [
-		agenix
-		android-file-transfer
-		bitwarden-cli
-		diffutils
-		git
-		gh
-		gnupatch
-		gregpy
-		findutils
-		hms # My own home manager switcher
-		home-manager
-		htop
-		killall
-		nano
-		pwgen
-		transcrypt
-		unzip
-		wget
-	];
-}

modules-all/default.nix

@@ -1,8 +1,58 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
-	imports = [
-		./automatic
-		./xprograms.nix
+	# Enable flakes
+	nix = {
+		package = pkgs.nixFlakes;
+		buildMachines = [
+			{
+				hostName = "dns.me.ts";
+				system = "aarch64-linux";
+			}
+
+			{
+				hostName = "jude.me.ts";
+				system = "x86_64-linux";
+			}
+		];
+
+		settings = {
+			auto-optimise-store = true;
+			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"
+			];
+			trusted-public-keys = [
+				"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
+			];
+		};
+	};
+
+	nixpkgs.config.allowUnfree = true;
+
+	# Base packages that need to be in all my hosts
+	environment.systemPackages = with pkgs; [
+		agenix
+		android-file-transfer
+		bitwarden-cli
+		diffutils
+		git
+		gh
+		gnupatch
+		gregpy
+		findutils
+		hms # My own home manager switcher
+		home-manager
+		htop
+		killall
+		nano
+		pwgen
+		transcrypt
+		unzip
+		wget
 	];
 }

modules-all/xprograms.nix

@@ -1,16 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-	cfg = config.greg.xprograms;
-
-in with lib; {
-	options = {
-		greg.xprograms.enable = mkEnableOption "Install my favorite XPrograms";
-	};
-
-	config = mkIf cfg.enable {
-		environment.systemPackages = with pkgs; [
-			keepassxc
-		];
-	};
-}