diff --git a/machines/izanagi/main/default.nix b/machines/izanagi/main/default.nix index 78457a0..d0c37ff 100644 --- a/machines/izanagi/main/default.nix +++ b/machines/izanagi/main/default.nix @@ -4,9 +4,11 @@ let flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; in { imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ./disko-config.nix + [ + ../../minimal.nix + + ../hardware-configuration.nix + ../disko-config.nix ./sops.nix ]; diff --git a/machines/izanagi/main/disko-config.nix b/machines/izanagi/main/disko-config.nix deleted file mode 100644 index c9460a9..0000000 --- a/machines/izanagi/main/disko-config.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - username, - ... -}: -{ - disko.devices = { - disk = { - main = { - device = "/dev/vda"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - boot = { - size = "1M"; - type = "EF02"; # for grub MBR - }; - root = { - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/machines/izanagi/main/hardware-configuration.nix b/machines/izanagi/main/hardware-configuration.nix deleted file mode 100644 index c760612..0000000 --- a/machines/izanagi/main/hardware-configuration.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - # fileSystems."/" = - # { device = "/dev/disk/by-uuid/301d5990-7186-4a90-94aa-997044007358"; - # fsType = "ext4"; - # }; - - # 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.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens18.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -}