From ab8850998ea9fa0d745aeb89880048ee8997b2d7 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Wed, 23 Mar 2022 11:07:43 +0100 Subject: [PATCH] virtualisation: add vagrant, comment out virbr1 --- modules/virtualisation/default.nix | 15 ++++++++------- overlays/overrides.nix | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/virtualisation/default.nix b/modules/virtualisation/default.nix index ad3db4e7..bb24f7e7 100644 --- a/modules/virtualisation/default.nix +++ b/modules/virtualisation/default.nix @@ -31,8 +31,9 @@ in libvirt libvirt-glib qemu + vagrant virt-manager - python38Packages.libvirt + python39Packages.libvirt gvfs edk2 OVMF @@ -49,11 +50,11 @@ in systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 ${psCfg.user.name} kvm" ]; - networking.bridges.virbr1.interfaces = [ ]; - networking.interfaces.virbr1 = { - ipv4.addresses = [ - { address = "192.168.123.1"; prefixLength = 24; } - ]; - }; + #networking.bridges.virbr1.interfaces = [ ]; + #networking.interfaces.virbr1 = { + # ipv4.addresses = [ + # { address = "192.168.123.1"; prefixLength = 24; } + # ]; + #}; }; } diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 25a8d983..477e2bfb 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -25,6 +25,7 @@ channels: final: prev: { ; inherit (channels.master) + vagrant ; haskellPackages = prev.haskellPackages.override