diff --git a/modules/system/cloud-init.nix b/modules/system/cloud-init.nix
index a41513f..f03dea3 100644
--- a/modules/system/cloud-init.nix
+++ b/modules/system/cloud-init.nix
@@ -3,8 +3,11 @@
 with lib;
 
 {
-	services.cloud-init = {
-		enable = true;
-		network.enable = true;
+	options.myModules.cloud-init.enable = mkEnableOption "custom cloud-init configuration";
+	config = mkIf config.myModules.cloud-init.enable {
+		services.cloud-init = {
+			enable = true;
+			network.enable = true;
+		};
 	};
 }
diff --git a/modules/system/do-agent.nix b/modules/system/do-agent.nix
index cb60e8f..de7bb2c 100644
--- a/modules/system/do-agent.nix
+++ b/modules/system/do-agent.nix
@@ -3,5 +3,9 @@
 with lib;
 
 {
-	services.do-agent.enable = true;
+	options.myModules.do-agent.enable = mkEnableOption "custom do-agent configuration";
+
+	config = mkIf config.myModules.do-agent.enable {
+		services.do-agent.enable = true;
+	};
 }
diff --git a/modules/system/fish.nix b/modules/system/fish.nix
index e7d7bed..a195b7f 100644
--- a/modules/system/fish.nix
+++ b/modules/system/fish.nix
@@ -3,5 +3,8 @@
 with lib;
 
 {
-	environment.systemPackages = [ pkgs.fish ];
+	options.myModules.fish.enable = mkEnableOption "custom fish configuration";
+	config = mkIf config.myModules.fish.enable {
+		environment.systemPackages = [ pkgs.fish ];
+	};
 }
diff --git a/nixos-anywhere/configuration.nix b/nixos-anywhere/configuration.nix
index 6b3c041..c994d17 100644
--- a/nixos-anywhere/configuration.nix
+++ b/nixos-anywhere/configuration.nix
@@ -22,7 +22,12 @@
 		pkgs.gitMinimal
 	];
 
-	myModules.tmux.enable = true;
+	myModules = {
+		cloud-init.enable = true;
+		do-agent.enable = true;
+		fish.enable = true;
+		tmux.enable = true;
+	};
 
 	services.openssh.enable = true;