diff --git a/hosts/kabtopci/default.nix b/hosts/kabtopci/default.nix index 006f074..7f2e72d 100644 --- a/hosts/kabtopci/default.nix +++ b/hosts/kabtopci/default.nix @@ -23,7 +23,7 @@ imports = # For now, if applying to other system, swap files [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix [(import ../../modules/wm/virtualisation/docker.nix)] ++ # Docker - [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++ # Docker + [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++ # Docker (import ../../modules/services/kabtopci); # Server Services boot = { # Boot options diff --git a/hosts/kabtopci/hardware-configuration.nix b/hosts/kabtopci/hardware-configuration.nix index 60ebe22..2558e6f 100644 --- a/hosts/kabtopci/hardware-configuration.nix +++ b/hosts/kabtopci/hardware-configuration.nix @@ -17,7 +17,7 @@ [ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ]; + boot.initrd.availableKernelModules = [ "ata_piix" "virtio_pci" "virtio_scsi" "xhci_pci" "sr_mod" "virtio_blk" ]; boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -69,12 +69,6 @@ options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ]; }; - fileSystems."/mnt/snapshots/root" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ]; - }; - swapDevices = [ ]; networking = { @@ -85,7 +79,7 @@ enable = false; }; interfaces = { - ens18 = { + ens3 = { useDHCP = false; # For versatility sake, manually edit IP on nm-applet. ipv4.addresses = [ { address = "195.90.221.87"; @@ -97,7 +91,7 @@ } ]; }; }; - defaultGateway = "195.90.221.1"; + defaultGateway = "195.90.220.1"; defaultGateway6 = { address = "2a00:6800:3::1"; interface = "ens18";