mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
Merge pull request #297640 from Mic92/digitalocean
digital-ocean: 'make it easier to use disko' and 'no longer disable multiple nixos generations in bootloader'
This commit is contained in:
commit
949fe90552
@ -31,7 +31,7 @@ with lib;
|
|||||||
hostName = config.networking.hostName;
|
hostName = config.networking.hostName;
|
||||||
doMetadataFile = "/run/do-metadata/v1.json";
|
doMetadataFile = "/run/do-metadata/v1.json";
|
||||||
in mkMerge [{
|
in mkMerge [{
|
||||||
fileSystems."/" = {
|
fileSystems."/" = lib.mkDefault {
|
||||||
device = "/dev/disk/by-label/nixos";
|
device = "/dev/disk/by-label/nixos";
|
||||||
autoResize = true;
|
autoResize = true;
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
@ -41,11 +41,7 @@ with lib;
|
|||||||
kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
|
kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];
|
||||||
initrd.kernelModules = [ "virtio_scsi" ];
|
initrd.kernelModules = [ "virtio_scsi" ];
|
||||||
kernelModules = [ "virtio_pci" "virtio_net" ];
|
kernelModules = [ "virtio_pci" "virtio_net" ];
|
||||||
loader = {
|
loader.grub.devices = lib.mkDefault ["/dev/vda"];
|
||||||
grub.device = "/dev/vda";
|
|
||||||
timeout = 0;
|
|
||||||
grub.configurationLimit = 0;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = mkDefault true;
|
enable = mkDefault true;
|
||||||
|
Loading…
Reference in New Issue
Block a user