From 8f131a64e79f26f4568f31a4f2d822187b97b20c Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Mon, 12 Jun 2023 18:48:49 -0400
Subject: [PATCH] Only import internal container configs

Sharing external container configs seems non-trivial and, although
possible, it may be better to simply manage containers independently.
---
 containers/common-container/wayland.nix          | 14 --------------
 containers/{common-config => common}/wayland.nix |  0
 containers/gui.nix                               | 15 +++++++++++----
 3 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 containers/common-container/wayland.nix
 rename containers/{common-config => common}/wayland.nix (100%)

diff --git a/containers/common-container/wayland.nix b/containers/common-container/wayland.nix
deleted file mode 100644
index 236019b7..00000000
--- a/containers/common-container/wayland.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  bindMounts = {
-    waylandDisplay = rec {
-      hostPath = "/run/user/1000";
-      mountPoint = hostPath;
-    };
-
-    x11Display = rec {
-      hostPath = "/tmp/.X11-unix";
-      mountPoint = hostPath;
-      isReadOnly = true;
-    };
-  };
-}
diff --git a/containers/common-config/wayland.nix b/containers/common/wayland.nix
similarity index 100%
rename from containers/common-config/wayland.nix
rename to containers/common/wayland.nix
diff --git a/containers/gui.nix b/containers/gui.nix
index be0c1869..d781cd1e 100644
--- a/containers/gui.nix
+++ b/containers/gui.nix
@@ -4,10 +4,6 @@ let
 in
 {
   containers.gui = {
-    imports = [
-      ./common-container/wayland.nix
-    ];
-
     privateNetwork = true;
     ephemeral = true;
     autoStart = true;
@@ -17,6 +13,17 @@ in
         hostPath = "/home/${VARIABLES.username}/containers/gui";
         isReadOnly = false;
       };
+
+      waylandDisplay = rec {
+        hostPath = "/run/user/1000";
+        mountPoint = hostPath;
+      };
+
+      x11Display = rec {
+        hostPath = "/tmp/.X11-unix";
+        mountPoint = hostPath;
+        isReadOnly = true;
+      };
     };
 
     config = { pkgs, lib, ... }: {