diff --git a/flake.nix b/flake.nix
index 1c0dbb1..8ac3c46 100755
--- a/flake.nix
+++ b/flake.nix
@@ -66,7 +66,7 @@
     in {
       devShells = import ./shells {
         inherit inputs mkPkgs;
-        supportedSystems = linuxSystems;
+        systems = linuxSystems;
       };
 
       nixosConfigurations = generateHosts "nixos";
diff --git a/generator.nix b/generator.nix
index 8a1bca8..4289aec 100755
--- a/generator.nix
+++ b/generator.nix
@@ -41,6 +41,12 @@
         home-manager.extraSpecialArgs = { inherit inputs; };
         home-manager.users = mkHomeUsers importsForUser;
       };
+      sharedModules = [
+        ./modules/shared/syscfg
+        ./modules/shared/sops
+        syscfg
+        ./systems/${host}
+      ];
       defaultUser =
         builtins.head (
           builtins.filter (user: user.username == syscfg.syscfg.defaultUser) users
@@ -52,12 +58,8 @@
         "nixos" = inputs.nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = { inherit inputs; };
-          modules = [
-            ./modules/shared/syscfg
-            ./modules/shared/sops
+          modules = sharedModules ++ [
             ./modules/nixos
-            syscfg
-            ./systems/${host}
             inputs.sops-nix.nixosModules.sops
             inputs.home-manager.nixosModules.home-manager
 
@@ -70,11 +72,7 @@
 
         "macos" = inputs.darwin.lib.darwinSystem {
           inherit system;
-          modules = [
-            ./modules/shared/syscfg
-            ./modules/shared/sops
-            syscfg
-            ./systems/${host}
+          modules = sharedModules ++ [
             inputs.sops-nix.darwinModules.sops
             inputs.home-manager.darwinModules.home-manager
             (mkHomeManager (_: mkDarwinHomeImports))
diff --git a/shells/default.nix b/shells/default.nix
index 3160886..e8f8287 100644
--- a/shells/default.nix
+++ b/shells/default.nix
@@ -1,5 +1,5 @@
-{ inputs, mkPkgs, supportedSystems, ... }:
-inputs.nixpkgs.lib.genAttrs supportedSystems (
+{ inputs, mkPkgs, systems, ... }:
+inputs.nixpkgs.lib.genAttrs systems (
   system:
   let pkgs = mkPkgs system;
   in {