diff --git a/configurations.nix b/configurations.nix index 550d0fd..8441d78 100644 --- a/configurations.nix +++ b/configurations.nix @@ -8,7 +8,6 @@ let nur colmena flake-registry - nixos-hypervisor nixos-hardware nixpkgs-unstable srvos @@ -44,8 +43,6 @@ let srvos.nixosModules.mixins-trusted-nix-caches srvos.nixosModules.mixins-terminfo - nixos-hypervisor.nixosModules.host - # srvos.nixosModules.mixins-telegraf # srvos.nixosModules.mixins-terminfo @@ -107,9 +104,6 @@ in flake.colmena = { meta.nixpkgs = import nixpkgs { system = "x86_64-linux"; - overlays = [ - nixos-hypervisor.overlays.default - ]; }; epyc = { imports = diff --git a/flake.lock b/flake.lock index 6a47414..7e4330f 100644 --- a/flake.lock +++ b/flake.lock @@ -241,11 +241,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1688319245, - "narHash": "sha256-+fXRVu4TDH8mxmZpSByJZCprKfHduFTLOb7sTm4w0RQ=", + "lastModified": 1688312018, + "narHash": "sha256-HU6yQuvGyA9ZPik6VQ1RaIyRfPksDCDVVnUXVfpenzo=", "ref": "main", - "rev": "89b36124b161492f140185815ec5b76a0b29dba7", - "revCount": 5, + "rev": "1b532cd9302454fb65027ca9a190c875195fb01c", + "revCount": 2, "type": "git", "url": "ssh://gitea@git.newtype.fr/newtype/nixos-hypervisor" }, diff --git a/hosts/epyc.nix b/hosts/epyc.nix index 805fa33..efbf696 100644 --- a/hosts/epyc.nix +++ b/hosts/epyc.nix @@ -3,21 +3,12 @@ ../modules/ipmi-supermicro.nix ../modules/hardware/supermicro-H12SSL-i.nix ../modules/iperf-server.nix - ../modules/hypervisor.nix ]; networking.hostName = "epyc"; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - virtualisation.nvisor.vms = { - vm01 = { - config = { pkgs, ... }: { - environment.systemPackages = [ pkgs.hello ]; - }; - }; - }; - simd.arch = "znver3"; system.stateVersion = "23.05"; } diff --git a/modules/hypervisor.nix b/modules/hypervisor.nix deleted file mode 100644 index 2b11b5c..0000000 --- a/modules/hypervisor.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ ... }: { - virtualisation.nvisor = { - enable = true; - }; -}