diff --git a/modules/attrs/development/default.nix b/modules/attrs/development/default.nix
index 95f6920..fb23ef8 100644
--- a/modules/attrs/development/default.nix
+++ b/modules/attrs/development/default.nix
@@ -1,22 +1,18 @@
 {
   self,
-  inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.development = {
-    pkgs,
-    lib,
-    ...
-  }: let
+  flake.nixosModules.development = moduleWithSystem ({pkgs, ...}: let
     modules = with self.nixosModules; [
-		git
-		nvim
+      git
+      nvim
     ];
   in {
     imports = modules;
     environment.systemPackages = with pkgs; [
-		opencode
-		devenv
-		];
-  };
+      opencode
+      devenv
+    ];
+  });
 }
diff --git a/modules/attrs/gaming/default.nix b/modules/attrs/gaming/default.nix
index a3841b4..437e566 100644
--- a/modules/attrs/gaming/default.nix
+++ b/modules/attrs/gaming/default.nix
@@ -1,17 +1,13 @@
 {
   self,
-  inputs,
+  moduleWithSystem,
   ...
 }: {
-  flake.nixosModules.gaming = {
-    pkgs,
-    lib,
-    ...
-  }: let
+  flake.nixosModules.gaming = moduleWithSystem ({...}: let
     modules = with self.nixosModules; [
-		steam
-		];
+      steam
+    ];
   in {
     imports = modules;
-  };
+  });
 }