From 92b4451e9c526431c048a0b65208120db60f032c Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Thu, 21 Mar 2024 21:29:37 +0900
Subject: [PATCH] tst

---
 lib/default.nix                             | 3 +--
 nixos/common/modules/networking.nix         | 2 +-
 nixos/containers/rdesktop/default.nix       | 1 +
 nixos/hosts/framework-server/containers.nix | 5 -----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 9e2abde4..40c59c87 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -46,8 +46,7 @@
       { inherit system; config.allowUnfree = unfree; hostPlatform = system; }
   }: { 
     autoStart = true;
-    privateNetwork = true;
-    hostBridge = "br0";
+    privateNetwork = false;
     specialArgs = { inherit pkgs pkgs-unstable hostname username desktop theme system repo unfree stateVersion tskey; };
     config = { lib, config, pkgs, pkgs-unstable, hostname, username, desktop, theme, system, repo, stateVersion, tskey, ... }: {
       system.stateVersion = stateVersion;
diff --git a/nixos/common/modules/networking.nix b/nixos/common/modules/networking.nix
index 9d2336e5..db5fcb12 100644
--- a/nixos/common/modules/networking.nix
+++ b/nixos/common/modules/networking.nix
@@ -7,7 +7,7 @@
     };
 
     useDHCP = lib.mkDefault true;
-    enableIPv6 = lib.mkForce false;
+    enableIPv6 = false;
     firewall = { 
       enable = true;
       allowedTCPPorts = [  ];
diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix
index 0faf3f32..b12f78f2 100644
--- a/nixos/containers/rdesktop/default.nix
+++ b/nixos/containers/rdesktop/default.nix
@@ -8,5 +8,6 @@
   services.xrdp = {
     enable = true;
     openFirewall = true;
+    defaultWindowManager = "xfce4-session";
   };
 }
diff --git a/nixos/hosts/framework-server/containers.nix b/nixos/hosts/framework-server/containers.nix
index a58b46dc..cb837877 100644
--- a/nixos/hosts/framework-server/containers.nix
+++ b/nixos/hosts/framework-server/containers.nix
@@ -5,11 +5,6 @@ in {
   # TODO: Set up Tailscale key
 
   # Set up the bridge network:
-  networking = {
-    bridges.br0.interfaces = [ "enp0s13f0u4" ]; # nmcli con show | grep Wired\ connection\ 2
-    interfaces.br0.useDHCP = true;
-  };
-
   containers = {
     rdesktop = libx.mkContainer { hostname = "rdesktop"; desktop = "xfce"; unfree = true; };
   };