nixos: Remove containers from global deploy list

This commit is contained in:
Jack O'Sullivan 2022-06-06 13:25:05 +01:00
parent 796e1582a3
commit 77eaaf52c7
4 changed files with 4 additions and 2 deletions

View File

@ -25,6 +25,7 @@
config = mkMerge [ config = mkMerge [
{ {
my = { my = {
deploy.enable = false;
server.enable = true; server.enable = true;
secrets = { secrets = {

View File

@ -27,6 +27,7 @@
config = mkMerge [ config = mkMerge [
{ {
my = { my = {
deploy.enable = false;
server.enable = true; server.enable = true;
secrets = { secrets = {

View File

@ -51,7 +51,7 @@ let
system.name = name; system.name = name;
networking = { 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); hostName = mkDefault (config'.assignments.internal.name or name);
}; };
nixpkgs = { nixpkgs = {

View File

@ -80,7 +80,7 @@ in
config = mkMerge [ 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 { (mkIf cfg.enable {
my.deploy.node = { my.deploy.node = {