diff --git a/default.nix b/default.nix
index ed84837..cbd5ec7 100644
--- a/default.nix
+++ b/default.nix
@@ -9,7 +9,8 @@ in {
 	imports = [	
 		home-manager
 		./hosts/vulkan
-		./modules/machine-info.nix
+		./modules
+		./saturn/system.nix
 	];
 
 	# nix options
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..47bd7b9
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+	imports = [ 
+		./saturnConfig.nix
+		./machineInfo.nix
+	];
+}
diff --git a/modules/machine-info.nix b/modules/machineInfo.nix
similarity index 100%
rename from modules/machine-info.nix
rename to modules/machineInfo.nix
diff --git a/modules/saturnConfig.nix b/modules/saturnConfig.nix
new file mode 100644
index 0000000..54ffa7f
--- /dev/null
+++ b/modules/saturnConfig.nix
@@ -0,0 +1,23 @@
+{ lib, ... }: with lib;
+{
+	options.saturn = {
+		user = mkOption {
+			type = types.str;
+			default = "saturn";
+			description = mdDoc "The name of the user of the system.";
+		};
+		hostname = mkOption {
+			type = types.strMatching 
+				"[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?";
+			default = "saturnOS-device";
+			description = mdDoc "The network hostname of the system, which must only contain letters,
+			numbers, and dashes, and cannot start or end with a dash.";
+		};
+		prettyHostname = mkOption { 
+			type = types.str;
+			default = "🪐 saturnOS";
+			description = mdDoc "The pretty hostname is used for things like bluetooth pairing,
+			device sharing, and is fully unicode.";
+		};
+	};
+}
diff --git a/modules/saturn_config.nix b/modules/saturn_config.nix
deleted file mode 100644
index 2c63c08..0000000
--- a/modules/saturn_config.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/saturn/system.nix b/saturn/system.nix
index d234831..7c0e2e9 100644
--- a/saturn/system.nix
+++ b/saturn/system.nix
@@ -1,10 +1,10 @@
-## not real code yet
+{ config, ... }:
 {
-	user = "hive";
-	hostname = "vulkan";
-	prett_hostname = "🌋 vulkan";
-	packages = {
-	}
-	user_packages = {
-	}
+	saturn.user = "hive";
+	saturn.hostname = "vulkan";
+	saturn.prettyHostname = "🌋 vulkan";
+	# packages = {
+	# }
+	# userPackages = {
+	# }
 }