simplify pi archetype

1 files changed, 17 insertions, 18 deletions

diff --git a/archetypes/profiles/pi/default.nix b/archetypes/profiles/pi/default.nix
index 8ea33e4..639111a 100644
--- a/archetypes/profiles/pi/default.nix
+++ b/archetypes/profiles/pi/default.nix
@@ -2,28 +2,27 @@
 	mkPi = lib.mkOverride 900;
 
 	nixosConfig = {
-		# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
-		boot.loader.grub.enable = false;
-		# Enables the generation of /boot/extlinux/extlinux.conf
-		boot.loader.generic-extlinux-compatible.enable = true;
+		boot.loader = {
+			# Use the extlinux boot loader. (NixOS wants to enable GRUB by default)
+			grub.enable = false;
+			# Enables the generation of /boot/extlinux/extlinux.conf
+			generic-extlinux-compatible.enable = true;
+		};
 	};
 
 	homeConfig = {
 		# Use raspian logo in fastfetch
-		programs.fastfetch = {
-			enable = mkPi true;
-			settings = {
-				logo.source = mkPi "raspbian";
-				# Default options for the rest of this
-				# TODO figure out how to just override logo and keep defaults w/config file
-				modules = [
-					"title" "separator" "os" "host" "kernel" "uptime"
-					"packages" "shell" "display" "de" "wm" "wmtheme" "theme"
-					"icons" "font" "cursor" "terminal" "terminalfont" "cpu"
-					"gpu" "memory" "swap" "disk" "localip" "battery"
-					"poweradapter" "locale" "break" "colors"
-				];
-			};
+		programs.fastfetch.settings = {
+			logo.source = mkPi "raspbian";
+			# Default options for the rest of this
+			# TODO figure out how to just override logo and keep defaults w/config file
+			modules = [
+				"title" "separator" "os" "host" "kernel" "uptime" "packages"
+				"shell" "display" "de" "wm" "wmtheme" "theme" "icons" "font"
+				"cursor" "terminal" "terminalfont" "cpu" "gpu" "memory" "swap"
+				"disk" "localip" "battery" "poweradapter" "locale" "break"
+				"colors"
+			];
 		};
 	};
 in {