diff --git a/modules/apps/default.nix b/modules/apps/default.nix
index 1a89f07..550d795 100644
--- a/modules/apps/default.nix
+++ b/modules/apps/default.nix
@@ -1,6 +1,10 @@
-[
-  ./qbittirrent.nix
-  ./steam.nix
-  ./ungoogled-chromium.nix
-  ./wine.nix
-]
+{ ... }:
+
+{
+  imports = [
+    ./qbittirrent.nix
+    ./steam.nix
+    ./ungoogled-chromium.nix
+    ./wine.nix
+  ];
+}
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 9b1ce95..8a33ecd 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -1,8 +1,12 @@
-[
-  ./boot.nix
-  ./env-vars.nix
-  ./nix-settings.nix
-  ./security.nix
-  ./time.nix
-  ./users.nix
-]
+{ ... }:
+
+{
+  imports = [
+    ./boot.nix
+    ./env-vars.nix
+    ./nix-settings.nix
+    ./security.nix
+    ./time.nix
+    ./users.nix
+  ];
+}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 09a3866..a7f65a3 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,4 +1,8 @@
-[
-  ./fonts.nix
-  ./gnome.nix
-]
+{ ... }:
+
+{
+  imports = [
+    ./fonts.nix
+    ./gnome.nix
+  ];
+}
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index f3b9e87..902bf29 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -1,5 +1,9 @@
-[
-  ./audio.nix
-  ./opengl.nix
-  ./usb.nix
-]
+{ ... }:
+
+{
+  imports = [
+    ./audio.nix
+    ./opengl.nix
+    ./usb.nix
+  ];
+}
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 5ff8a4b..083f289 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,5 +1,9 @@
-[
-  ./networking.nix
-  ./openssh.nix
-  ./printing.nix
-]
+{ ... }:
+
+{
+  imports = [
+    ./networking.nix
+    ./openssh.nix
+    ./printing.nix
+  ];
+}