This commit is contained in:
Anton Hvornum 2025-06-12 08:48:21 +02:00 committed by GitHub
parent 12c8a5c62e
commit 2038e68560
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 9 deletions

View File

@ -51,7 +51,6 @@ class GfxPackage(Enum):
Xf86VideoAmdgpu = 'xf86-video-amdgpu' Xf86VideoAmdgpu = 'xf86-video-amdgpu'
Xf86VideoAti = 'xf86-video-ati' Xf86VideoAti = 'xf86-video-ati'
Xf86VideoNouveau = 'xf86-video-nouveau' Xf86VideoNouveau = 'xf86-video-nouveau'
Xf86VideoVmware = 'xf86-video-vmware'
XorgServer = 'xorg-server' XorgServer = 'xorg-server'
XorgXinit = 'xorg-xinit' XorgXinit = 'xorg-xinit'
@ -63,7 +62,7 @@ class GfxDriver(Enum):
NvidiaOpenKernel = 'Nvidia (open kernel module for newer GPUs, Turing+)' NvidiaOpenKernel = 'Nvidia (open kernel module for newer GPUs, Turing+)'
NvidiaOpenSource = 'Nvidia (open-source nouveau driver)' NvidiaOpenSource = 'Nvidia (open-source nouveau driver)'
NvidiaProprietary = 'Nvidia (proprietary)' NvidiaProprietary = 'Nvidia (proprietary)'
VMOpenSource = 'VMware / VirtualBox (open-source)' VMOpenSource = 'VirtualBox (open-source)'
def is_nvidia(self) -> bool: def is_nvidia(self) -> bool:
match self: match self:
@ -91,7 +90,6 @@ class GfxDriver(Enum):
GfxPackage.Xf86VideoAmdgpu, GfxPackage.Xf86VideoAmdgpu,
GfxPackage.Xf86VideoAti, GfxPackage.Xf86VideoAti,
GfxPackage.Xf86VideoNouveau, GfxPackage.Xf86VideoNouveau,
GfxPackage.Xf86VideoVmware,
GfxPackage.LibvaMesaDriver, GfxPackage.LibvaMesaDriver,
GfxPackage.LibvaIntelDriver, GfxPackage.LibvaIntelDriver,
GfxPackage.IntelMediaDriver, GfxPackage.IntelMediaDriver,
@ -136,7 +134,6 @@ class GfxDriver(Enum):
case GfxDriver.VMOpenSource: case GfxDriver.VMOpenSource:
packages += [ packages += [
GfxPackage.Mesa, GfxPackage.Mesa,
GfxPackage.Xf86VideoVmware,
] ]
return packages return packages

View File

@ -83,7 +83,7 @@
"type": "object", "type": "object",
"properties": { "properties": {
"type": "string", "type": "string",
"nics": [ "nics": {
"type": "array", "type": "array",
"items": { "items": {
"iface": "string", "iface": "string",
@ -97,7 +97,7 @@
"type": "string" "type": "string"
} }
} }
] }
} }
} }
}, },
@ -175,7 +175,7 @@
"description": "Graphics Drivers to install if a desktop profile is used, ignored otherwise.", "description": "Graphics Drivers to install if a desktop profile is used, ignored otherwise.",
"type": "string", "type": "string",
"enum": [ "enum": [
"VMware / VirtualBox (open-source)", "VirtualBox (open-source)",
"Intel (open-source)", "Intel (open-source)",
"AMD / ATI (open-source)", "AMD / ATI (open-source)",
"All open-source (default)", "All open-source (default)",
@ -222,7 +222,7 @@
] ]
}, },
{ {
"required": [ "required": {
"!users": { "!users": {
"description": "User account", "description": "User account",
"type": "object", "type": "object",
@ -232,7 +232,7 @@
"sudo": "boolean" "sudo": "boolean"
} }
} }
] }
} }
] ]
} }