pyrox.dev / nixpkgs
lol
fork atom

digital-ocean: revert "make it easier to use disko"

This reverts parts of commit d87c4e1a720f827996c282d0e194850a8903cebe from @Mic92

After switching from nixos-23.11 to nixos-unstable, I got the following error:

```
$ nixos-rebuild switch --flake nixos/#digitalocean
...
error:
Failed assertions:
- You must set the option ‘boot.loader.grub.devices’ or 'boot.loader.grub.mirroredBoots' to make the system bootable.
```

In my nixos config I don't set boot.loader.grub.devices or boot.loader.grub.mirroredBoots explicitly.

It seems like the values are not really defaulted via mkDefault? I am still relatively new to Nix, not sure how to fix this properly, so I am proposing to revert this change.

André Schröder 168793f1 5c24cf2f

options
unified split
Changed files
+1 -1
nixos
modules
virtualisation
digital-ocean-config.nix
+1 -1
nixos/modules/virtualisation/digital-ocean-config.nix 
···

       
41

       
 

       
        kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];


     

       
42

       
 

       
        initrd.kernelModules = [ "virtio_scsi" ];


     

       
43

       
 

       
        kernelModules = [ "virtio_pci" "virtio_net" ];


     

       
44

       
-

       
        loader.grub.devices = lib.mkDefault ["/dev/vda"];


     

       
45

       
 

       
      };


     

       
46

       
 

       
      services.openssh = {


     

       
47

       
 

       
        enable = mkDefault true;


     
···

       
41

       
 

       
        kernelParams = [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ];


     

       
42

       
 

       
        initrd.kernelModules = [ "virtio_scsi" ];


     

       
43

       
 

       
        kernelModules = [ "virtio_pci" "virtio_net" ];


     

       
44

       
+

       
        loader.grub.devices = ["/dev/vda"];


     

       
45

       
 

       
      };


     

       
46

       
 

       
      services.openssh = {


     

       
47

       
 

       
        enable = mkDefault true;