diff --git a/containers/gui.nix b/containers/gui.nix
index 41550311..177ffd12 100644
--- a/containers/gui.nix
+++ b/containers/gui.nix
@@ -1,5 +1,3 @@
-{ home-manager, stylix, ... }:
-
 {
   containers.gui = {
     privateNetwork = true;
@@ -25,11 +23,7 @@
 
     config = { pkgs, ... }: {
       imports = [
-        home-manager.nixosModules.home-manager
-        stylix.nixosModules.stylix
-        ./common/wayland.nix
-        ../modules/fonts.nix
-        ../modules/stylix.nix
+        ../setup.nix
       ];
 
       environment.systemPackages = with pkgs; [
diff --git a/containers/common/wayland.nix b/setup.nix
similarity index 82%
rename from containers/common/wayland.nix
rename to setup.nix
index 3a074ccd..311a9973 100644
--- a/containers/common/wayland.nix
+++ b/setup.nix
@@ -1,6 +1,13 @@
-{ pkgs, ... }:
+{ pkgs, home-manager, stylix, ... }:
 
 {
+  imports = [
+    home-manager.nixosModules.home-manager
+    stylix.nixosModules.stylix
+    ./modules/fonts.nix
+    ./modules/stylix.nix
+  ];
+
   environment = {
     defaultPackages = [ ];
     variables.TERM = "xterm-kitty";