From 0c20a8f522565ef319b1c102aa74f443d606da0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 Dec 2024 16:45:55 +0100
Subject: [PATCH 1/3] remove clanCore in comment

---
 pkgs/clan-cli/clan_cli/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py
index aa9ffd363..85b6ac69c 100644
--- a/pkgs/clan-cli/clan_cli/__init__.py
+++ b/pkgs/clan-cli/clan_cli/__init__.py
@@ -380,7 +380,7 @@ State can be folders and databases that modules depend on managed by clan.
 
 State directories can be added to on a per machine basis:
 ```
-  config.clanCore.state.[SERVICE_NAME].folders = [
+  config.clan.core.state.[SERVICE_NAME].folders = [
     "/home"
     "/root"
   ];

From 0a3e49ba110e563f407f7983a85ad5bb619149f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 Dec 2024 16:48:19 +0100
Subject: [PATCH 2/3] no longer use deprecated hardware.opengl

---
 clanModules/sunshine/default.nix  | 2 +-
 nixosModules/clanCore/waypipe.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/clanModules/sunshine/default.nix b/clanModules/sunshine/default.nix
index 3785d645d..c7f419ebe 100644
--- a/clanModules/sunshine/default.nix
+++ b/clanModules/sunshine/default.nix
@@ -104,7 +104,7 @@ in
     }"
   ];
 
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   systemd.user.services.sunshine = {
     enable = true;
diff --git a/nixosModules/clanCore/waypipe.nix b/nixosModules/clanCore/waypipe.nix
index 327c899af..37920ae2d 100644
--- a/nixosModules/clanCore/waypipe.nix
+++ b/nixosModules/clanCore/waypipe.nix
@@ -38,7 +38,7 @@
     };
     # General default settings
     fonts.enableDefaultPackages = lib.mkDefault true;
-    hardware.opengl.enable = lib.mkDefault true;
+    hardware.graphics.enable = lib.mkDefault true;
 
     # User account
     services.getty.autologinUser = lib.mkDefault config.clan.services.waypipe.user;

From 13e72c7dbbeb330abedce11f1f907b9819d49f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 11 Dec 2024 16:49:03 +0100
Subject: [PATCH 3/3] vms: don't leak vsock sockets in error case

---
 pkgs/clan-cli/clan_cli/vms/waypipe.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/vms/waypipe.py b/pkgs/clan-cli/clan_cli/vms/waypipe.py
index c7b5216dc..524b65f99 100644
--- a/pkgs/clan-cli/clan_cli/vms/waypipe.py
+++ b/pkgs/clan-cli/clan_cli/vms/waypipe.py
@@ -16,9 +16,8 @@ def test_vsock_port(port: int) -> bool:
         msg = "vsock is only supported on Linux"
         raise NotImplementedError(msg)
     try:
-        s = socket.socket(socket.AF_VSOCK, socket.SOCK_STREAM)
-        s.connect((VMADDR_CID_HYPERVISOR, port))
-        s.close()
+        with socket.socket(socket.AF_VSOCK, socket.SOCK_STREAM) as s:
+            s.connect((VMADDR_CID_HYPERVISOR, port))
     except OSError:
         return False
     else: