evar/nixos-framework-laptop-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vm: remove bridge network interface, update vm xml, general cleanup

Browse source
This commit is contained in:
Evar 2025-06-25 01:03:16 -04:00
parent 9030a12931
commit 227c761ebe
5 changed files with 43 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/default.nix
View file

@ -33,10 +33,10 @@
]; ];
# So that I can get to the netgear router # So that I can get to the netgear router
networking.extraHosts = '' # networking.extraHosts = ''
10.0.0.152 routerlogin.net # 10.0.0.152 routerlogin.net
10.0.0.152 www.routerlogin.net # 10.0.0.152 www.routerlogin.net
''; # '';
services.flatpak.enable = true; services.flatpak.enable = true;
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];

19
nixos/kvmfr.nix
View file

@ -119,15 +119,16 @@ in {
# So I can build for kernel 6.13 # So I can build for kernel 6.13
# til https://github.com/gnif/LookingGlass/pull/1154 is merged # til https://github.com/gnif/LookingGlass/pull/1154 is merged
boot.extraModulePackages = with config.boot.kernelPackages; [ boot.extraModulePackages = with config.boot.kernelPackages; [
(kvmfr.overrideAttrs (old: { kvmfr
patches = [ ]; # The patches have already since been merged # (kvmfr.overrideAttrs (old: {
src = pkgs.fetchFromGitHub { # patches = [ ]; # The patches have already since been merged
owner = "zeule"; # src = pkgs.fetchFromGitHub {
repo = "LookingGlass"; # owner = "zeule";
rev = "7740692e3000c2019e21b9861585960174dd5ddc"; # repo = "LookingGlass";
sha256 = "sha256-2ayH8FXOn4Bflf55WvhMWTDMLwvucmofD3POI72bC+Q="; # rev = "7740692e3000c2019e21b9861585960174dd5ddc";
}; # sha256 = "sha256-2ayH8FXOn4Bflf55WvhMWTDMLwvucmofD3POI72bC+Q=";
})) # };
# }))
]; ];
services.udev.packages = optionals (cfg.devices != [ ]) [ udevPackage ]; services.udev.packages = optionals (cfg.devices != [ ]) [ udevPackage ];

1
nixos/users.nix
View file

@ -25,6 +25,7 @@
uid = 1000; uid = 1000;
isNormalUser = true; isNormalUser = true;
extraGroups = [ extraGroups = [
"libvirtd"
"wheel" "wheel"
"networkmanager" "networkmanager"
"video" "video"

39
nixos/vm.nix
View file

@ -82,33 +82,33 @@ in {
# the network bridge interface with systemctl start network-addresses-winvm0.service, # the network bridge interface with systemctl start network-addresses-winvm0.service,
# and potentially toggle the link state in the vm config # and potentially toggle the link state in the vm config
# to get this working. would be good to fix it. # to get this working. would be good to fix it.
networking.bridges = { # networking.bridges = {
"winvm0" = { # "winvm0" = {
interfaces = [ "eth0" ]; # interfaces = [ "eth0" ];
}; # };
}; # };
networking.dhcpcd.denyInterfaces = [ "winvm0" ]; # networking.dhcpcd.denyInterfaces = [ "winvm0" ];
# TODO: the below doesn't actually work, so I just # TODO: the below doesn't actually work, so I just
# disable wait-online entirely. # disable wait-online entirely.
# ensure the bridge network doesn't cause us to wait # ensure the bridge network doesn't cause us to wait
# on boot # on boot
# systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ]; # systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
systemd.network.wait-online.anyInterface = true; # systemd.network.wait-online.anyInterface = true;
boot.initrd.systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ]; # boot.initrd.systemd.network.wait-online.ignoredInterfaces = [ "eth0" "winvm0" ];
# These are needed, since I'm not currently trying to # These are needed, since I'm not currently trying to
# reserve a static IP for the bridge interface # reserve a static IP for the bridge interface
networking.defaultGateway = { address = "10.0.0.1"; interface = "eth0"; }; # networking.defaultGateway = { address = "10.0.0.1"; interface = "eth0"; };
networking.interfaces.winvm0 = { # networking.interfaces.winvm0 = {
useDHCP = false; # useDHCP = false;
ipv4 = { # ipv4 = {
addresses = [ # addresses = [
{ address = "10.0.5.1"; prefixLength = 32; } # { address = "10.0.5.1"; prefixLength = 32; }
]; # ];
}; # };
}; # };
environment.systemPackages = [ environment.systemPackages = [
# For sharing filesystems # For sharing filesystems
@ -135,7 +135,10 @@ in {
hardware.graphics.enable = true; # needed for display spice opengl hardware.graphics.enable = true; # needed for display spice opengl
virtualisation.libvirtd = { virtualisation.libvirtd = {
enable = true; enable = true;
qemu.swtpm.enable = true; # for TPM 2.0 support qemu = {
swtpm.enable = true; # for TPM 2.0 support
ovmf.packages = [ pkgs.OVMFFull.fd ];
};
onBoot = "ignore"; # only start autostart vms, not just ones that were running onBoot = "ignore"; # only start autostart vms, not just ones that were running
onShutdown = "shutdown"; # always shut down the vm's cleanly onShutdown = "shutdown"; # always shut down the vm's cleanly

29
win10.xml
View file

@ -183,25 +183,12 @@
<controller type="virtio-serial" index="0"> <controller type="virtio-serial" index="0">
<address type="pci" domain="0x0000" bus="0x03" slot="0x00" function="0x0"/> <address type="pci" domain="0x0000" bus="0x03" slot="0x00" function="0x0"/>
</controller> </controller>
<filesystem type="mount" accessmode="passthrough">
<driver type="virtiofs"/>
<binary path="/run/current-system/sw/bin/virtiofsd"/>
<source dir="/home/evar/Virtio Shared/"/>
<target dir="Virtio Shared"/>
<address type="pci" domain="0x0000" bus="0x0c" slot="0x00" function="0x0"/>
</filesystem>
<interface type="network"> <interface type="network">
<mac address="52:54:00:15:1c:97"/> <mac address="52:54:00:15:1c:97"/>
<source network="default"/> <source network="default"/>
<model type="virtio"/> <model type="virtio"/>
<address type="pci" domain="0x0000" bus="0x0a" slot="0x00" function="0x0"/>
</interface>
<interface type="bridge">
<mac address="52:54:00:33:7d:5e"/>
<source bridge="winvm0"/>
<model type="virtio"/>
<link state="up"/> <link state="up"/>
<address type="pci" domain="0x0000" bus="0x0b" slot="0x00" function="0x0"/> <address type="pci" domain="0x0000" bus="0x0a" slot="0x00" function="0x0"/>
</interface> </interface>
<serial type="pty"> <serial type="pty">
<target type="isa-serial" port="0"> <target type="isa-serial" port="0">
@ -255,19 +242,17 @@
</source> </source>
<address type="pci" domain="0x0000" bus="0x06" slot="0x00" function="0x0"/> <address type="pci" domain="0x0000" bus="0x06" slot="0x00" function="0x0"/>
</hostdev> </hostdev>
<hostdev mode="subsystem" type="usb" managed="yes">
<source>
<vendor id="0x256c"/>
<product id="0x006b"/>
</source>
<address type="usb" bus="0" port="1"/>
</hostdev>
<watchdog model="itco" action="reset"/> <watchdog model="itco" action="reset"/>
<memballoon model="none"/> <memballoon model="none"/>
<shmem name="scream">
<model type="ivshmem-plain"/>
<size unit="M">2</size>
<address type="pci" domain="0x0000" bus="0x00" slot="0x11" function="0x0"/>
</shmem>
</devices> </devices>
<qemu:commandline> <qemu:commandline>
<qemu:arg value="-device"/> <qemu:arg value="-device"/>
<qemu:arg value="{&quot;driver&quot;:&quot;ivshmem-plain&quot;,&quot;id&quot;:&quot;shmem0&quot;,&quot;memdev&quot;:&quot;looking-glass&quot;}"/> <qemu:arg value="{&quot;driver&quot;:&quot;ivshmem-plain&quot;,&quot;id&quot;:&quot;shmem1&quot;,&quot;memdev&quot;:&quot;looking-glass&quot;}"/>
<qemu:arg value="-object"/> <qemu:arg value="-object"/>
<qemu:arg value="{&quot;qom-type&quot;:&quot;memory-backend-file&quot;,&quot;id&quot;:&quot;looking-glass&quot;,&quot;mem-path&quot;:&quot;/dev/kvmfr0&quot;,&quot;size&quot;:134217728,&quot;share&quot;:true}"/> <qemu:arg value="{&quot;qom-type&quot;:&quot;memory-backend-file&quot;,&quot;id&quot;:&quot;looking-glass&quot;,&quot;mem-path&quot;:&quot;/dev/kvmfr0&quot;,&quot;size&quot;:134217728,&quot;share&quot;:true}"/>
</qemu:commandline> </qemu:commandline>