From 77eaaf52c73b9c5b4ccbad44698e72f4a93953ce Mon Sep 17 00:00:00 2001
From: Jack O'Sullivan <jackos1998@gmail.com>
Date: Mon, 6 Jun 2022 13:25:05 +0100
Subject: [PATCH] nixos: Remove containers from global deploy list

---
 nixos/boxes/colony/vms/shill/containers/middleman.nix   | 1 +
 nixos/boxes/colony/vms/shill/containers/vaultwarden.nix | 1 +
 nixos/default.nix                                       | 2 +-
 nixos/modules/deploy-rs.nix                             | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/boxes/colony/vms/shill/containers/middleman.nix b/nixos/boxes/colony/vms/shill/containers/middleman.nix
index a9530da..d450ba4 100644
--- a/nixos/boxes/colony/vms/shill/containers/middleman.nix
+++ b/nixos/boxes/colony/vms/shill/containers/middleman.nix
@@ -25,6 +25,7 @@
       config = mkMerge [
         {
           my = {
+            deploy.enable = false;
             server.enable = true;
 
             secrets = {
diff --git a/nixos/boxes/colony/vms/shill/containers/vaultwarden.nix b/nixos/boxes/colony/vms/shill/containers/vaultwarden.nix
index cccc01f..0dd19d6 100644
--- a/nixos/boxes/colony/vms/shill/containers/vaultwarden.nix
+++ b/nixos/boxes/colony/vms/shill/containers/vaultwarden.nix
@@ -27,6 +27,7 @@
       config = mkMerge [
         {
           my = {
+            deploy.enable = false;
             server.enable = true;
 
             secrets = {
diff --git a/nixos/default.nix b/nixos/default.nix
index 2cdaa78..62ee89d 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -51,7 +51,7 @@ let
 
           system.name = name;
           networking = {
-            domain = let d = config'.assignments.internal.domain; in mkIf (d != null) (mkDefault' d);
+            domain = let d = config'.assignments.internal.domain or null; in mkIf (d != null) (mkDefault' d);
             hostName = mkDefault (config'.assignments.internal.name or name);
           };
           nixpkgs = {
diff --git a/nixos/modules/deploy-rs.nix b/nixos/modules/deploy-rs.nix
index 92e0fc0..9f4b8ee 100644
--- a/nixos/modules/deploy-rs.nix
+++ b/nixos/modules/deploy-rs.nix
@@ -80,7 +80,7 @@ in
 
   config = mkMerge [
     {
-      my.deploy.enable = mkIf config.my.build.isDevVM false;
+      my.deploy.enable = mkIf (config.my.build.isDevVM || config.boot.isContainer) false;
     }
     (mkIf cfg.enable {
       my.deploy.node = {