diff --git a/flake.nix b/flake.nix
index de9fa0a..01fad59 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,15 +109,16 @@
           };
         };
         modules = [
-          ./configurations/hosts/magames-lappy/configuration.nix
-          ./modules/users/magames.nix
           catppuccin.nixosModules.catppuccin
           home-manager.nixosModules.home-manager
           niri.nixosModules.niri
 
-          ./modules/network/gitea.nix
+          ./configurations/hosts/magames-lappy/configuration.nix
+          ./modules/default.nix
 
-          ./modules/network/default.nix
+          ./modules/users/magames.nix
+
+          ./modules/network/gitea.nix
 
           ./modules/display/niri.nix
           ./modules/display/sddm.nix
@@ -128,12 +129,6 @@
 
           ./modules/boot/plymouth.nix
 
-          ./modules/catppuccin.nix
-          ./modules/i18n.nix
-          ./modules/esp.nix
-					./modules/fonts.nix
-					./modules/fsj.nix
-          ./modules/self.nix
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
diff --git a/modules/default.nix b/modules/default.nix
new file mode 100644
index 0000000..26c720c
--- /dev/null
+++ b/modules/default.nix
@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+  imports = [
+    ./network/default.nix
+
+    ./catppuccin.nix
+    ./esp.nix
+    ./fonts.nix
+    ./fsj.nix
+    ./i18n.nix
+    ./obsvcam.nix
+    ./self.nix
+  ];
+}
diff --git a/modules/network/bluetooth.nix b/modules/network/bluetooth.nix
index 3aebeda..7749a7d 100644
--- a/modules/network/bluetooth.nix
+++ b/modules/network/bluetooth.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, inputs, ... }:
+{ ... }:
 
 {
   hardware.bluetooth = {
diff --git a/modules/network/gitea.nix b/modules/network/gitea.nix
index d343065..ff4c7b8 100644
--- a/modules/network/gitea.nix
+++ b/modules/network/gitea.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ ... }:
 
 {
   networking.firewall.allowedTCPPorts = [ 9170 ];
diff --git a/modules/network/ports.nix b/modules/network/ports.nix
index 9fab9c1..0e98510 100644
--- a/modules/network/ports.nix
+++ b/modules/network/ports.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, inputs, ... }:
+{ ... }:
 
 {
   # Open ports in the firewall.