From e86a839bd725513369af968463a29e497be06ccb Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 21 Jan 2026 09:42:51 -0600 Subject: [PATCH] rename options --- profiles/homebox/default.nix | 2 +- profiles/laptop/default.nix | 2 +- .../containers/authentik/default.nix | 4 ++-- .../containers/code-server/default.nix | 4 ++-- .../virtualization/containers/gitea/default.nix | 4 ++-- .../virtualization/containers/gitlab/default.nix | 4 ++-- .../containers/homeassistant/default.nix | 4 ++-- .../containers/jellyfin/default.nix | 4 ++-- .../containers/keycloak/default.nix | 4 ++-- .../containers/minecraft/default.nix | 4 ++-- system/virtualization/containers/n8n/default.nix | 4 ++-- .../containers/netbird/default.nix | 8 ++++---- .../containers/nextcloud/default.nix | 4 ++-- .../virtualization/containers/nginx/default.nix | 4 ++-- .../virtualization/containers/novnc/default.nix | 6 +++--- .../virtualization/containers/ntfy/default.nix | 4 ++-- .../containers/openwebui/default.nix | 7 +++---- .../containers/rustdesk/default.nix | 4 ++-- .../containers/sandbox/default.nix | 4 ++-- .../containers/traefik/default.nix | 4 ++-- .../containers/wyoming/default.nix | 16 ++++++++-------- .../virtualization/virtual-machines/default.nix | 9 +++++++-- 22 files changed, 57 insertions(+), 53 deletions(-) diff --git a/profiles/homebox/default.nix b/profiles/homebox/default.nix index 978ac7e..2981c29 100644 --- a/profiles/homebox/default.nix +++ b/profiles/homebox/default.nix @@ -81,7 +81,7 @@ searxng.enable = true; }; - virtualization = { + containers = { traefik.enable = true; jellyfin.enable = true; "esotericbytes.com".enable = true; diff --git a/profiles/laptop/default.nix b/profiles/laptop/default.nix index 66327c7..5b21687 100644 --- a/profiles/laptop/default.nix +++ b/profiles/laptop/default.nix @@ -63,7 +63,7 @@ }; - virtualization = { + containers = { wyoming = { enable = mkDefault false; diff --git a/system/virtualization/containers/authentik/default.nix b/system/virtualization/containers/authentik/default.nix index cb20f3f..d814024 100644 --- a/system/virtualization/containers/authentik/default.nix +++ b/system/virtualization/containers/authentik/default.nix @@ -1,11 +1,11 @@ { config, lib, sops-nix, ... }: { - options.sysconfig.virtualization.authentik.enable = lib.options.mkOption { + options.sysconfig.containers.authentik.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.authentik.enable { + config = lib.mkIf config.sysconfig.containers.authentik.enable { sops.secrets."authentik/dbpass" = {}; diff --git a/system/virtualization/containers/code-server/default.nix b/system/virtualization/containers/code-server/default.nix index 96dc147..3e5570c 100644 --- a/system/virtualization/containers/code-server/default.nix +++ b/system/virtualization/containers/code-server/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.code-server.enable = lib.options.mkOption { + options.sysconfig.containers.code-server.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.code-server.enable { + config = lib.mkIf config.sysconfig.containers.code-server.enable { containers.code-server = { diff --git a/system/virtualization/containers/gitea/default.nix b/system/virtualization/containers/gitea/default.nix index d0946a9..6ede9e1 100644 --- a/system/virtualization/containers/gitea/default.nix +++ b/system/virtualization/containers/gitea/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.gitea.enable = lib.options.mkOption { + options.sysconfig.containers.gitea.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.gitea.enable { + config = lib.mkIf config.sysconfig.containers.gitea.enable { networking = { hosts."192.168.100.20" = [ "gitea.esotericbytes.com" ]; diff --git a/system/virtualization/containers/gitlab/default.nix b/system/virtualization/containers/gitlab/default.nix index 7f67df8..8d1089a 100644 --- a/system/virtualization/containers/gitlab/default.nix +++ b/system/virtualization/containers/gitlab/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.gitlab.enable = lib.options.mkOption { + options.sysconfig.containers.gitlab.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.gitlab.enable { + config = lib.mkIf config.sysconfig.containers.gitlab.enable { sops.secrets = { "gitlab/db_pass" = {}; diff --git a/system/virtualization/containers/homeassistant/default.nix b/system/virtualization/containers/homeassistant/default.nix index 1b2fa93..a4ecb52 100644 --- a/system/virtualization/containers/homeassistant/default.nix +++ b/system/virtualization/containers/homeassistant/default.nix @@ -1,13 +1,13 @@ { config, lib, ... }: { - options.sysconfig.virtualization.homeassistant = { + options.sysconfig.containers.homeassistant = { enable = lib.options.mkOption { type = lib.types.bool; default = false; }; }; - config = lib.mkIf config.sysconfig.virtualization.homeassistant.enable { + config = lib.mkIf config.sysconfig.containers.homeassistant.enable { containers.home-assistant = { diff --git a/system/virtualization/containers/jellyfin/default.nix b/system/virtualization/containers/jellyfin/default.nix index 1c4b1d0..f425251 100644 --- a/system/virtualization/containers/jellyfin/default.nix +++ b/system/virtualization/containers/jellyfin/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.jellyfin.enable = lib.options.mkOption { + options.sysconfig.containers.jellyfin.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.jellyfin.enable { + config = lib.mkIf config.sysconfig.containers.jellyfin.enable { containers.jellyfin = { diff --git a/system/virtualization/containers/keycloak/default.nix b/system/virtualization/containers/keycloak/default.nix index 6b87968..6a6d10a 100644 --- a/system/virtualization/containers/keycloak/default.nix +++ b/system/virtualization/containers/keycloak/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.keycloak.enable = lib.options.mkOption { + options.sysconfig.containers.keycloak.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.keycloak.enable { + config = lib.mkIf config.sysconfig.containers.keycloak.enable { sops.secrets."keycloak/dbpass" = {}; diff --git a/system/virtualization/containers/minecraft/default.nix b/system/virtualization/containers/minecraft/default.nix index 2cff6a2..116808a 100644 --- a/system/virtualization/containers/minecraft/default.nix +++ b/system/virtualization/containers/minecraft/default.nix @@ -1,13 +1,13 @@ { config, lib, pkgs, nix-minecraft, ... }: { options.sysconfig = { - virtualization.minecraft.enable = lib.options.mkOption { + containers.minecraft.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; }; - config = lib.mkIf config.sysconfig.virtualization.minecraft.enable { + config = lib.mkIf config.sysconfig.containers.minecraft.enable { networking = { firewall = { diff --git a/system/virtualization/containers/n8n/default.nix b/system/virtualization/containers/n8n/default.nix index 8ecc139..123e62f 100644 --- a/system/virtualization/containers/n8n/default.nix +++ b/system/virtualization/containers/n8n/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.n8n.enable = lib.options.mkOption { + options.sysconfig.containers.n8n.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.n8n.enable { + config = lib.mkIf config.sysconfig.containers.n8n.enable { containers.n8n = { diff --git a/system/virtualization/containers/netbird/default.nix b/system/virtualization/containers/netbird/default.nix index b40706c..33b255c 100644 --- a/system/virtualization/containers/netbird/default.nix +++ b/system/virtualization/containers/netbird/default.nix @@ -7,7 +7,7 @@ default = false; }; - virtualization.netbird = { + containers.netbird = { enable = lib.options.mkOption { type = lib.types.bool; default = false; @@ -32,7 +32,7 @@ }; networking = { - firewall = lib.mkIf config.sysconfig.virtualization.netbird.enable { + firewall = lib.mkIf config.sysconfig.containers.netbird.enable { allowedUDPPorts = [ 3478 ]; allowedUDPPortRanges = [{ from = 51100; to = 56100; }]; @@ -44,10 +44,10 @@ nat.internalInterfaces = [ "ve-netbird" "wt0" ]; }; - sops.secrets."netbird/coturnPass" = lib.mkIf config.sysconfig.virtualization.netbird.enable {}; + sops.secrets."netbird/coturnPass" = lib.mkIf config.sysconfig.containers.netbird.enable {}; - containers.netbird = lib.mkIf config.sysconfig.virtualization.netbird.enable { + containers.netbird = lib.mkIf config.sysconfig.containers.netbird.enable { autoStart = true; privateNetwork = true; diff --git a/system/virtualization/containers/nextcloud/default.nix b/system/virtualization/containers/nextcloud/default.nix index b80af8f..028cd06 100644 --- a/system/virtualization/containers/nextcloud/default.nix +++ b/system/virtualization/containers/nextcloud/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.nextcloud.enable = lib.options.mkOption { + options.sysconfig.containers.nextcloud.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.nextcloud.enable { + config = lib.mkIf config.sysconfig.containers.nextcloud.enable { sops.secrets."nextcloud/pass" = {}; diff --git a/system/virtualization/containers/nginx/default.nix b/system/virtualization/containers/nginx/default.nix index fef5bdd..9db98ba 100644 --- a/system/virtualization/containers/nginx/default.nix +++ b/system/virtualization/containers/nginx/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization."esotericbytes.com".enable = lib.mkOption { + options.sysconfig.containers."esotericbytes.com".enable = lib.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization."esotericbytes.com".enable { + config = lib.mkIf config.sysconfig.containers."esotericbytes.com".enable { containers.esotericbytes-com = { diff --git a/system/virtualization/containers/novnc/default.nix b/system/virtualization/containers/novnc/default.nix index fd47969..3f66b29 100644 --- a/system/virtualization/containers/novnc/default.nix +++ b/system/virtualization/containers/novnc/default.nix @@ -1,14 +1,14 @@ { config, lib, pkgs, ... }: { - options.sysconfig.virtualization.novnc.enable = lib.mkOption { + options.sysconfig.containers.novnc.enable = lib.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.novnc.enable { + config = lib.mkIf config.sysconfig.containers.novnc.enable { networking = { - firewall.interfaces."ve-novnc" = lib.mkIf config.sysconfig.virtualization.novnc.enable { + firewall.interfaces."ve-novnc" = { allowedTCPPorts = [ 5900 ]; allowedUDPPorts = [ 5900 ]; }; diff --git a/system/virtualization/containers/ntfy/default.nix b/system/virtualization/containers/ntfy/default.nix index 78c049f..c3c8305 100644 --- a/system/virtualization/containers/ntfy/default.nix +++ b/system/virtualization/containers/ntfy/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.ntfy.enable = lib.mkOption { + options.sysconfig.containers.ntfy.enable = lib.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.ntfy.enable { + config = lib.mkIf config.sysconfig.containers.ntfy.enable { containers.ntfy = { diff --git a/system/virtualization/containers/openwebui/default.nix b/system/virtualization/containers/openwebui/default.nix index 23c1cfa..bab04c9 100644 --- a/system/virtualization/containers/openwebui/default.nix +++ b/system/virtualization/containers/openwebui/default.nix @@ -1,13 +1,13 @@ -{ config, lib, pkgs, nixpkgs-us, ... }: { +{ config, lib, nixpkgs-us, ... }: { options = { - sysconfig.virtualization.openwebui.enable = lib.options.mkOption { + sysconfig.containers.openwebui.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; }; - config = lib.mkIf config.sysconfig.virtualization.openwebui.enable { + config = lib.mkIf config.sysconfig.containers.openwebui.enable { containers.openwebui = { @@ -20,7 +20,6 @@ services.open-webui = { enable = true; - #package = pkgs.open-webui; package = let pkgs-us = import nixpkgs-us { system = "x86_64-linux"; diff --git a/system/virtualization/containers/rustdesk/default.nix b/system/virtualization/containers/rustdesk/default.nix index 8fa9a61..536bfde 100644 --- a/system/virtualization/containers/rustdesk/default.nix +++ b/system/virtualization/containers/rustdesk/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.rustdesk.enable = lib.options.mkOption { + options.sysconfig.containers.rustdesk.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.rustdesk.enable { + config = lib.mkIf config.sysconfig.containers.rustdesk.enable { /*networking = { firewall.allowedTCPPorts = [ 21115 21116 21117 21118 21119 ]; diff --git a/system/virtualization/containers/sandbox/default.nix b/system/virtualization/containers/sandbox/default.nix index 7a6f4fd..d745bc4 100644 --- a/system/virtualization/containers/sandbox/default.nix +++ b/system/virtualization/containers/sandbox/default.nix @@ -1,11 +1,11 @@ { config, lib, self, ... }: { - options.sysconfig.virtualization.sandbox.enable = lib.mkOption { + options.sysconfig.containers.sandbox.enable = lib.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.sandbox.enable { + config = lib.mkIf config.sysconfig.containers.sandbox.enable { networking = { diff --git a/system/virtualization/containers/traefik/default.nix b/system/virtualization/containers/traefik/default.nix index 07cc47a..d6ec466 100644 --- a/system/virtualization/containers/traefik/default.nix +++ b/system/virtualization/containers/traefik/default.nix @@ -1,11 +1,11 @@ { config, lib, ... }: { - options.sysconfig.virtualization.traefik.enable = lib.options.mkOption { + options.sysconfig.containers.traefik.enable = lib.options.mkOption { type = lib.types.bool; default = false; }; - config = lib.mkIf config.sysconfig.virtualization.traefik.enable { + config = lib.mkIf config.sysconfig.containers.traefik.enable { networking = { hosts."192.168.100.11" = [ diff --git a/system/virtualization/containers/wyoming/default.nix b/system/virtualization/containers/wyoming/default.nix index 7389d68..0f4275d 100644 --- a/system/virtualization/containers/wyoming/default.nix +++ b/system/virtualization/containers/wyoming/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: { - options.sysconfig.virtualization.wyoming = { + options.sysconfig.containers.wyoming = { enable = lib.options.mkOption { type = lib.types.bool; default = false; @@ -23,7 +23,7 @@ }; }; - config = lib.mkIf config.sysconfig.virtualization.wyoming.enable { + config = lib.mkIf config.sysconfig.containers.wyoming.enable { containers.wyoming = { @@ -32,7 +32,7 @@ hostAddress = "192.168.100.10"; localAddress = "192.168.100.26"; - bindMounts = lib.mkIf config.sysconfig.virtualization.wyoming.faster-whisper { + bindMounts = lib.mkIf config.sysconfig.containers.wyoming.faster-whisper { "/dev/nvidia0" = { hostPath = "/dev/nvidia0"; isReadOnly = false; @@ -55,7 +55,7 @@ }; }; - allowedDevices = lib.mkIf config.sysconfig.virtualization.wyoming.faster-whisper [ + allowedDevices = lib.mkIf config.sysconfig.containers.wyoming.faster-whisper [ { node = "/dev/nvidia0"; modifier = "rw"; @@ -86,7 +86,7 @@ services.wyoming = { - piper = lib.mkIf config.sysconfig.virtualization.wyoming.piper { + piper = lib.mkIf config.sysconfig.containers.wyoming.piper { servers.piper = { enable = true; @@ -95,7 +95,7 @@ }; }; - openwakeword = lib.mkIf config.sysconfig.virtualization.wyoming.openwakeword { + openwakeword = lib.mkIf config.sysconfig.containers.wyoming.openwakeword { enable = true; uri = "tcp://0.0.0.0:11432"; @@ -105,7 +105,7 @@ ]; }; - faster-whisper = lib.mkIf config.sysconfig.virtualization.wyoming.faster-whisper { + faster-whisper = lib.mkIf config.sysconfig.containers.wyoming.faster-whisper { servers.whisper = { enable = true; device = "auto"; @@ -115,7 +115,7 @@ }; }; - satellite = lib.mkIf config.sysconfig.virtualization.wyoming.satellite { + satellite = lib.mkIf config.sysconfig.containers.wyoming.satellite { enable = true; uri = "tcp://0.0.0.0:11431"; #user = "nathan"; diff --git a/system/virtualization/virtual-machines/default.nix b/system/virtualization/virtual-machines/default.nix index 0ff3785..c25a2f6 100644 --- a/system/virtualization/virtual-machines/default.nix +++ b/system/virtualization/virtual-machines/default.nix @@ -1,4 +1,9 @@ -{ ... }: { +{ config, lib, ... }: { + + options.sysconfig.virtualization.enable = with lib; mkOption { + type = with types; bool; + default = false; + }; imports = let dir = builtins.readDir ./.; @@ -7,7 +12,7 @@ (builtins.attrNames dir) ); - config = { + config = lib.mkIf config.sysconfig.virtualisation.enable { programs.virt-manager.enable = true; virtualisation.libvirtd.enable = true;