yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Fixes for VMs' (#2598) from vars-fixes into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/2598
This commit is contained in:
Mic92
2024-12-11 17:44:09 +00:00
parent e03f4c1292 13e72c7dbb
commit 3295b9fc92
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clanModules/sunshine/default.nix
View File

@@ -104,7 +104,7 @@ in
}" }"
]; ];
hardware.opengl.enable = true; hardware.graphics.enable = true;
systemd.user.services.sunshine = { systemd.user.services.sunshine = {
enable = true; enable = true;

2
nixosModules/clanCore/waypipe.nix
View File

@@ -38,7 +38,7 @@
}; };
# General default settings # General default settings
fonts.enableDefaultPackages = lib.mkDefault true; fonts.enableDefaultPackages = lib.mkDefault true;
hardware.opengl.enable = lib.mkDefault true; hardware.graphics.enable = lib.mkDefault true;
# User account # User account
services.getty.autologinUser = lib.mkDefault config.clan.services.waypipe.user; services.getty.autologinUser = lib.mkDefault config.clan.services.waypipe.user;

2
pkgs/clan-cli/clan_cli/__init__.py
View File

@@ -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: 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" "/home"
"/root" "/root"
]; ];

5
pkgs/clan-cli/clan_cli/vms/waypipe.py
View File

@@ -16,9 +16,8 @@ def test_vsock_port(port: int) -> bool:
msg = "vsock is only supported on Linux" msg = "vsock is only supported on Linux"
raise NotImplementedError(msg) raise NotImplementedError(msg)
try: try:
s = socket.socket(socket.AF_VSOCK, socket.SOCK_STREAM) with socket.socket(socket.AF_VSOCK, socket.SOCK_STREAM) as s:
s.connect((VMADDR_CID_HYPERVISOR, port)) s.connect((VMADDR_CID_HYPERVISOR, port))
s.close()
except OSError: except OSError:
return False return False
else: else: