diff --git a/flake.nix b/flake.nix index 188ff2a..1e5a2b2 100755 --- a/flake.nix +++ b/flake.nix @@ -50,7 +50,7 @@ ./configuration/common.nix ./configuration/vm.nix - ./hardware-configuration/vm-minecraft.nix # Include the results of the hardware scan. + ./hardware-configuration/vm.nix # Include the results of the hardware scan. ]; }; }; diff --git a/hardware-configuration/muskduck.nix b/hardware-configuration/muskduck.nix index d6505f9..367b9e3 100644 --- a/hardware-configuration/muskduck.nix +++ b/hardware-configuration/muskduck.nix @@ -1,4 +1,7 @@ -{ config, lib, modulesPath, ... }: +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: { imports = @@ -25,7 +28,13 @@ swapDevices = [ ]; + # 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.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hardware-configuration/vm-minecraft.nix b/hardware-configuration/vm-minecraft.nix deleted file mode 100644 index b6816e7..0000000 --- a/hardware-configuration/vm-minecraft.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/4d1a9488-acf2-456c-a435-cc96ecff8aba"; - fsType = "ext4"; - }; - - fileSystems."/home/docker/volumes" = - { device = "/dev/disk/by-uuid/e520aca6-6cad-483c-b855-f6409a8a6908"; - fsType = "ext2"; - }; - - fileSystems."/var/lib/docker" = - { device = "/dev/disk/by-uuid/fab223a4-78a1-4900-81a6-45d04325fdcf"; - fsType = "ext2"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/73916996-b863-4279-9fe5-ae2b3b773608"; } - ]; - - networking.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -} \ No newline at end of file