From 0354c66afb736662cbf7cf9b5c84b5ed24fe7fcc Mon Sep 17 00:00:00 2001
From: Alejandro Angulo <iam@alejandr0angul0.dev>
Date: Mon, 27 May 2024 08:29:51 -0700
Subject: [PATCH] Worked around issue with failing DO image builds

---
 flake.nix                           | 4 ++--
 systems/x86_64-do/proxy/default.nix | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 20c03d3..8ff87ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,8 +98,6 @@
           "carbon"
         ];
       in {
-        inherit (inputs.self);
-
         # Only have a builder for x86_64-linux atm
         packages = inputs.self.packages.x86_64-linux;
 
@@ -107,6 +105,8 @@
           name:
             inputs.self.nixosConfigurations."${name}".config.system.build.toplevel
         );
+
+        droplets.proxy = inputs.self.doConfigurations.proxy;
       };
     };
 }
diff --git a/systems/x86_64-do/proxy/default.nix b/systems/x86_64-do/proxy/default.nix
index f25c444..080479c 100644
--- a/systems/x86_64-do/proxy/default.nix
+++ b/systems/x86_64-do/proxy/default.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: {
   aa = {
@@ -29,6 +30,11 @@
     tools.zsh.enable = true;
   };
 
+  # Workaround for broken digital ocean image builds
+  # See: https://github.com/NixOS/nixpkgs/issues/308404
+  boot.loader.grub.devices = lib.mkForce ["/dev/vda"];
+  boot.loader.grub.device = "/dev/vda";
+
   services.nginx = {
     enable = true;
     appendHttpConfig = ''