manuth/NixOSConfig
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Allow enabling USB redirection

Browse source
This commit is contained in:
Manuel Thalmann 2024-05-08 11:13:07 +02:00
parent 88b8bdc16b
commit 157a1cf990
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/configuration.nix
View file

@ -15,6 +15,7 @@
vmConfig = { vmConfig = {
virtualisation = { virtualisation = {
sharedHostKeys = true; sharedHostKeys = true;
usb-redirect = true;
virt-viewer = true; virt-viewer = true;
cores = 4; cores = 4;
memorySize = 4 * 1024; memorySize = 4 * 1024;

29
lib/modules/custom-build-vm.nix
View file

@ -36,6 +36,12 @@ in {
default = false; default = false;
}; };
usb-redirect = lib.mkOption {
type = lib.types.bool;
description = lib.mdDoc "Whether to enable USB redirection to the VM.";
default = false;
};
virt-viewer = lib.mkOption { virt-viewer = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
description = "Whether to use `remote-viewer` for displaying the VM."; description = "Whether to use `remote-viewer` for displaying the VM.";
@ -84,7 +90,9 @@ in {
virtualisation = { virtualisation = {
# Enable root permissions to get access to the `/etc/ssh` directory # Enable root permissions to get access to the `/etc/ssh` directory
runAsRoot = lib.mkIf vmVariant.virtualisation.sharedHostKeys true; runAsRoot = lib.mkIf
(vmVariant.virtualisation.sharedHostKeys || vmVariant.virtualisation.usb-redirect)
true;
# Enable spice and run QEMU in background to let `remote-viewer` take over # Enable spice and run QEMU in background to let `remote-viewer` take over
qemu = { qemu = {
@ -94,7 +102,22 @@ in {
options = options =
with { with {
inherit (vmVariant.virtualisation.qemu) spice; inherit (vmVariant.virtualisation.qemu) spice;
inherit (vmVariant.virtualisation) usb-redirect;
}; };
(
lib.optionals usb-redirect (
[
"-usb"
"-device qemu-xhci"
] ++ (builtins.concatMap
(index:
let
devName = "usbredirchardev${toString index}";
in [
"-chardev spicevmc,name=usbredir,id=${devName}"
"-device usb-redir,chardev=${devName},id=usbredirdev${toString index}"
])
(lib.lists.range 1 3)))) ++
( (
lib.optional (spice.enable) lib.optional (spice.enable)
("-spice " + ( ("-spice " + (
@ -147,6 +170,7 @@ in {
vmRunner = pkgs.writeShellApplication { vmRunner = pkgs.writeShellApplication {
name = "run-${config.system.name}-vm"; name = "run-${config.system.name}-vm";
runtimeInputs = lib.optional config.virtualisation.usb-redirect pkgs.spice-gtk;
text = lib.strings.concatLines ( text = lib.strings.concatLines (
[ [
@ -159,10 +183,9 @@ in {
let let
spice = config.virtualisation.qemu.spice; spice = config.virtualisation.qemu.spice;
remoteAddress = "spice://${lib.escapeShellArg spice.bindAddress}:${toString spice.port}"; remoteAddress = "spice://${lib.escapeShellArg spice.bindAddress}:${toString spice.port}";
viewerPrefix = "sudo -Eu\"#$SUDO_UID\" ";
in in
[ [
"${viewerPrefix}${pkgs.virt-viewer}/bin/remote-viewer ${remoteAddress}" "${pkgs.virt-viewer}/bin/remote-viewer ${remoteAddress}"
# Kill QEMU after `remote-viewer` finished running # Kill QEMU after `remote-viewer` finished running
"kill %1" "kill %1"
])))); ]))));