fix!: update configuration options types

squirmy · Apr 13, 2024 · 8a97e83 · 8a97e83
1 parent 0464332
commit 8a97e83
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/configuration/default.nix b/configuration/default.nix
@@ -1,7 +1,7 @@
 {...}: {
   nix-machine.configurations.nix-machine = {
-    options = ./options.nix;
-    darwin = ./nix-darwin;
-    home = ./home-manager;
+    options = [./options.nix];
+    darwin = [./nix-darwin];
+    home = [./home-manager];
   };
 }
diff --git a/flake-module.nix b/flake-module.nix
@@ -10,16 +10,16 @@
 
   configurationOptions = {
     options = lib.mkOption {
-      type = lib.types.deferredModule;
-      default = {};
+      type = lib.types.listOf lib.types.deferredModule;
+      default = [];
     };
     darwin = lib.mkOption {
-      type = lib.types.deferredModule;
-      default = {};
+      type = lib.types.listOf lib.types.deferredModule;
+      default = [];
     };
     home = lib.mkOption {
-      type = lib.types.deferredModule;
-      default = {};
+      type = lib.types.listOf lib.types.deferredModule;
+      default = [];
     };
     path = lib.mkOption {
       type = lib.types.nullOr lib.types.path;

diff --git a/templates/expose-configuration/configuration/default.nix b/templates/expose-configuration/configuration/default.nix
@@ -1,7 +1,7 @@
 {...}: {
   nix-machine.configurations.private = {
-    options = ./options.nix;
-    darwin = ./nix-darwin;
-    home = ./home-manager;
+    options = [./options.nix];
+    darwin = [./nix-darwin];
+    home = [./home-manager];
   };
 }
diff --git a/templates/minimal/flake.nix b/templates/minimal/flake.nix
@@ -26,17 +26,21 @@
       nix-machine.configurations.private = {
         # configuration to apply to nix-darwin
         # https://daiderd.com/nix-darwin/manual/index.html
-        darwin = {...}: {
-          security.pam.enableSudoTouchIdAuth = true;
-        };
+        darwin = [
+          ({...}: {
+            security.pam.enableSudoTouchIdAuth = true;
+          })
+        ];
 
         # configuration to apply to home-manager
         # https://mipmip.github.io/home-manager-option-search/
-        home = {pkgs, ...}: {
-          home.packages = [
-            pkgs.fortune
-          ];
-        };
+        home = [
+          ({pkgs, ...}: {
+            home.packages = [
+              pkgs.fortune
+            ];
+          })
+        ];
       };
     };
 }
diff --git a/templates/simple-macos/configuration/default.nix b/templates/simple-macos/configuration/default.nix
@@ -1,6 +1,6 @@
 {...}: {
   nix-machine.configurations.private = {
-    darwin = ./nix-darwin;
-    home = ./home-manager;
+    darwin = [./nix-darwin];
+    home = [./home-manager];
   };
 }