From cf46a32ecfdbd152bbc08bf1eaee57feec466a5f Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Fri, 14 Mar 2025 19:46:30 -0400 Subject: [PATCH] Vm update, disabled unused imports in VM --- flake.lock | 148 +------------------------------------ home/toph/vm/default.nix | 4 +- hosts/nixos/vm/default.nix | 16 +++- 3 files changed, 16 insertions(+), 152 deletions(-) diff --git a/flake.lock b/flake.lock index 7020f3e..8421865 100644 --- a/flake.lock +++ b/flake.lock @@ -1,44 +1,5 @@ { "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixtheplanet", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "hardware": { "locked": { "lastModified": 1740646007, @@ -54,25 +15,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1701009247, - "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -109,24 +51,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-ovmf": { "locked": { "lastModified": 1708984720, @@ -176,38 +100,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1703255338, - "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1735471104, "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", @@ -223,27 +115,6 @@ "type": "github" } }, - "nixtheplanet": { - "inputs": { - "flake-parts": "flake-parts", - "hercules-ci-effects": "hercules-ci-effects", - "nixpkgs": "nixpkgs_3", - "osx-kvm": "osx-kvm" - }, - "locked": { - "lastModified": 1739955541, - "narHash": "sha256-X7BvCkW6QQFOmjBgrpdayOR+pv7gz7a/0wl/p+mTxt4=", - "owner": "matthewcroughan", - "repo": "nixtheplanet", - "rev": "c9d159dc2e0049e7b250a767a3a01def52c3412b", - "type": "github" - }, - "original": { - "owner": "matthewcroughan", - "repo": "nixtheplanet", - "type": "github" - } - }, "nixvirt": { "inputs": { "nixpkgs": [ @@ -264,22 +135,6 @@ "url": "https://flakehub.com/f/AshleyYakeley/NixVirt/%2A.tar.gz" } }, - "osx-kvm": { - "flake": false, - "locked": { - "lastModified": 1701316418, - "narHash": "sha256-Sk8LYhFovoMX1ln7DWYArJQphW2a4h8Xg7/ZEZXwZv4=", - "owner": "kholia", - "repo": "OSX-KVM", - "rev": "09daff670a7eb9ff616073df329586c5995623a9", - "type": "github" - }, - "original": { - "owner": "kholia", - "repo": "OSX-KVM", - "type": "github" - } - }, "root": { "inputs": { "hardware": "hardware", @@ -287,14 +142,13 @@ "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "nixtheplanet": "nixtheplanet", "nixvirt": "nixvirt", "zen-browser": "zen-browser" } }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1740554227, diff --git a/home/toph/vm/default.nix b/home/toph/vm/default.nix index 8abe464..b6f280e 100644 --- a/home/toph/vm/default.nix +++ b/home/toph/vm/default.nix @@ -10,8 +10,8 @@ ## Host-specific Optional Configs ## ../common/optional/browsers ../common/optional/desktops - ../common/optional/development - ../common/optional/gaming + # ../common/optional/development + # ../common/optional/gaming ../common/optional/xdg.nix # file associations ]; diff --git a/hosts/nixos/vm/default.nix b/hosts/nixos/vm/default.nix index 1c905b7..2f99439 100644 --- a/hosts/nixos/vm/default.nix +++ b/hosts/nixos/vm/default.nix @@ -27,10 +27,10 @@ in ## Optional Configs ## "hosts/common/optional/audio.nix" # pipewire and cli controls - "hosts/common/optional/gaming.nix" # steam, gamescope, gamemode, and related hardware + # "hosts/common/optional/gaming.nix" # steam, gamescope, gamemode, and related hardware "hosts/common/optional/gnome.nix" # desktop - "hosts/common/optional/nvtop.nix" # GPU monitor (not available in home-manager) - "hosts/common/optional/plymouth.nix" # fancy boot screen + # "hosts/common/optional/nvtop.nix" # GPU monitor (not available in home-manager) + # "hosts/common/optional/plymouth.nix" # fancy boot screen ## Misc Inputs ## @@ -56,6 +56,16 @@ in enableIPv6 = false; }; + # VM guest additions to improve host-guest interaction + services.spice-vdagentd.enable = true; + services.qemuGuest.enable = true; + virtualisation.vmware.guest.enable = pkgs.stdenv.hostPlatform.isx86; + virtualisation.hypervGuest.enable = true; + services.xe-guest-utilities.enable = pkgs.stdenv.hostPlatform.isx86; + # The VirtualBox guest additions rely on an out-of-tree kernel module + # which lags behind kernel releases, potentially causing broken builds. + virtualisation.virtualbox.guest.enable = false; + ## System-wide packages ## environment.systemPackages = with pkgs; [ openssh