4 files changed, 9 insertions, 2 deletions
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 31338e5..6fb25f3 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -50,7 +50,6 @@ with nixpkgs.lib; let
     system = "armv7l-linux";
     extra_modules = [
       nixos-hardware.nixosModules.raspberry-pi-2
-      nixturris.nixosModules.armv7l-overlay
       ({pkgs, ...}: {
         boot.loader.systemd-boot.enable = false;
         boot.initrd.includeDefaultModules = false;
@@ -75,7 +74,6 @@ with nixpkgs.lib; let
   beagleboneSystem = genericSystem {
     system = "armv7l-linux";
     extra_modules = [
-      nixturris.nixosModules.armv7l-overlay
       {
         boot.loader.grub.enable = false;
         boot.loader.systemd-boot.enable = false;
diff --git a/nixos/machine/adm-omnia2.nix b/nixos/machine/adm-omnia2.nix
index f534a21..7673ecf 100644
--- a/nixos/machine/adm-omnia2.nix
+++ b/nixos/machine/adm-omnia2.nix
@@ -35,5 +35,8 @@ with lib; {
       nameservers = ["1.1.1.1" "8.8.8.8"];
       dhcpcd.allowInterfaces = [];
     };
+
+    # TODO: ubootTools build is broken!
+    firmware.environment.enable = false;
   };
 }
diff --git a/nixos/machine/spt-mox.nix b/nixos/machine/spt-mox.nix
index 6ca780a..accd963 100644
--- a/nixos/machine/spt-mox.nix
+++ b/nixos/machine/spt-mox.nix
@@ -39,5 +39,8 @@ with lib; {
       nameservers = ["1.1.1.1" "8.8.8.8"];
       dhcpcd.allowInterfaces = [];
     };
+
+    # TODO: ubootTools build is broken!
+    firmware.environment.enable = false;
   };
 }
diff --git a/nixos/machine/spt-mox2.nix b/nixos/machine/spt-mox2.nix
index 178a780..4d1a148 100644
--- a/nixos/machine/spt-mox2.nix
+++ b/nixos/machine/spt-mox2.nix
@@ -44,5 +44,8 @@ with lib; {
       nameservers = ["1.1.1.1" "8.8.8.8"];
       dhcpcd.allowInterfaces = [];
     };
+
+    # TODO: ubootTools build is broken!
+    firmware.environment.enable = false;
   };
 }