From 424854cfb239e00b836c28677286cc05f3932785 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Mon, 19 Jun 2023 03:28:10 -0400 Subject: [PATCH] New hardware --- machines/productivity-vm/configuration.nix | 2 +- machines/productivity-vm/hardware.nix | 12 ++++++------ machines/productivity-vm/home.nix | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/machines/productivity-vm/configuration.nix b/machines/productivity-vm/configuration.nix index 8d7064b..8c31fae 100644 --- a/machines/productivity-vm/configuration.nix +++ b/machines/productivity-vm/configuration.nix @@ -25,7 +25,7 @@ # Make the vm boot boot.loader.grub = { enable = true; - device = "/dev/sda"; + device = "/dev/vda"; useOSProber = true; }; # Setup system configuration diff --git a/machines/productivity-vm/hardware.nix b/machines/productivity-vm/hardware.nix index c149b7a..e6a149b 100755 --- a/machines/productivity-vm/hardware.nix +++ b/machines/productivity-vm/hardware.nix @@ -4,28 +4,28 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; boot.initrd.availableKernelModules = - [ "ata_piix" "mptspi" "uhci_hcd" "sd_mod" "sr_mod" ]; + [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/09b33aea-1ba4-45de-9973-bded8dad8ac9"; + device = "/dev/disk/by-uuid/2da5b2c6-cad4-41a6-9884-4d91f560cd96"; fsType = "ext4"; }; swapDevices = - [{ device = "/dev/disk/by-uuid/62754f77-dc2f-49f0-9d86-c1f9c9b8fe8f"; }]; + [{ device = "/dev/disk/by-uuid/fbef248f-db77-4785-8b3d-111f5e74c00b"; }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens33.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/machines/productivity-vm/home.nix b/machines/productivity-vm/home.nix index ac9f40f..b16c196 100644 --- a/machines/productivity-vm/home.nix +++ b/machines/productivity-vm/home.nix @@ -25,7 +25,7 @@ # sensitivity = -0.8 # accel_profile = flat } - exec-once=hyprpaper + # exec-once=hyprpaper ''; # System specific autoruns