rename options

This commit is contained in:
2026-01-21 09:42:51 -06:00
parent 65f878b20d
commit e86a839bd7
22 changed files with 57 additions and 53 deletions

View File

@@ -81,7 +81,7 @@
searxng.enable = true; searxng.enable = true;
}; };
virtualization = { containers = {
traefik.enable = true; traefik.enable = true;
jellyfin.enable = true; jellyfin.enable = true;
"esotericbytes.com".enable = true; "esotericbytes.com".enable = true;

View File

@@ -63,7 +63,7 @@
}; };
virtualization = { containers = {
wyoming = { wyoming = {
enable = mkDefault false; enable = mkDefault false;

View File

@@ -1,11 +1,11 @@
{ config, lib, sops-nix, ... }: { { config, lib, sops-nix, ... }: {
options.sysconfig.virtualization.authentik.enable = lib.options.mkOption { options.sysconfig.containers.authentik.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.authentik.enable { config = lib.mkIf config.sysconfig.containers.authentik.enable {
sops.secrets."authentik/dbpass" = {}; sops.secrets."authentik/dbpass" = {};

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.code-server.enable = lib.options.mkOption { options.sysconfig.containers.code-server.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.code-server.enable { config = lib.mkIf config.sysconfig.containers.code-server.enable {
containers.code-server = { containers.code-server = {

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.gitea.enable = lib.options.mkOption { options.sysconfig.containers.gitea.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.gitea.enable { config = lib.mkIf config.sysconfig.containers.gitea.enable {
networking = { networking = {
hosts."192.168.100.20" = [ "gitea.esotericbytes.com" ]; hosts."192.168.100.20" = [ "gitea.esotericbytes.com" ];

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.gitlab.enable = lib.options.mkOption { options.sysconfig.containers.gitlab.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.gitlab.enable { config = lib.mkIf config.sysconfig.containers.gitlab.enable {
sops.secrets = { sops.secrets = {
"gitlab/db_pass" = {}; "gitlab/db_pass" = {};

View File

@@ -1,13 +1,13 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.homeassistant = { options.sysconfig.containers.homeassistant = {
enable = lib.options.mkOption { enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
}; };
config = lib.mkIf config.sysconfig.virtualization.homeassistant.enable { config = lib.mkIf config.sysconfig.containers.homeassistant.enable {
containers.home-assistant = { containers.home-assistant = {

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.jellyfin.enable = lib.options.mkOption { options.sysconfig.containers.jellyfin.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.jellyfin.enable { config = lib.mkIf config.sysconfig.containers.jellyfin.enable {
containers.jellyfin = { containers.jellyfin = {

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.keycloak.enable = lib.options.mkOption { options.sysconfig.containers.keycloak.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.keycloak.enable { config = lib.mkIf config.sysconfig.containers.keycloak.enable {
sops.secrets."keycloak/dbpass" = {}; sops.secrets."keycloak/dbpass" = {};

View File

@@ -1,13 +1,13 @@
{ config, lib, pkgs, nix-minecraft, ... }: { { config, lib, pkgs, nix-minecraft, ... }: {
options.sysconfig = { options.sysconfig = {
virtualization.minecraft.enable = lib.options.mkOption { containers.minecraft.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
}; };
config = lib.mkIf config.sysconfig.virtualization.minecraft.enable { config = lib.mkIf config.sysconfig.containers.minecraft.enable {
networking = { networking = {
firewall = { firewall = {

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.n8n.enable = lib.options.mkOption { options.sysconfig.containers.n8n.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.n8n.enable { config = lib.mkIf config.sysconfig.containers.n8n.enable {
containers.n8n = { containers.n8n = {

View File

@@ -7,7 +7,7 @@
default = false; default = false;
}; };
virtualization.netbird = { containers.netbird = {
enable = lib.options.mkOption { enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
@@ -32,7 +32,7 @@
}; };
networking = { networking = {
firewall = lib.mkIf config.sysconfig.virtualization.netbird.enable { firewall = lib.mkIf config.sysconfig.containers.netbird.enable {
allowedUDPPorts = [ 3478 ]; allowedUDPPorts = [ 3478 ];
allowedUDPPortRanges = [{ from = 51100; to = 56100; }]; allowedUDPPortRanges = [{ from = 51100; to = 56100; }];
@@ -44,10 +44,10 @@
nat.internalInterfaces = [ "ve-netbird" "wt0" ]; 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; autoStart = true;
privateNetwork = true; privateNetwork = true;

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.nextcloud.enable = lib.options.mkOption { options.sysconfig.containers.nextcloud.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.nextcloud.enable { config = lib.mkIf config.sysconfig.containers.nextcloud.enable {
sops.secrets."nextcloud/pass" = {}; sops.secrets."nextcloud/pass" = {};

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization."esotericbytes.com".enable = lib.mkOption { options.sysconfig.containers."esotericbytes.com".enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization."esotericbytes.com".enable { config = lib.mkIf config.sysconfig.containers."esotericbytes.com".enable {
containers.esotericbytes-com = { containers.esotericbytes-com = {

View File

@@ -1,14 +1,14 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
options.sysconfig.virtualization.novnc.enable = lib.mkOption { options.sysconfig.containers.novnc.enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.novnc.enable { config = lib.mkIf config.sysconfig.containers.novnc.enable {
networking = { networking = {
firewall.interfaces."ve-novnc" = lib.mkIf config.sysconfig.virtualization.novnc.enable { firewall.interfaces."ve-novnc" = {
allowedTCPPorts = [ 5900 ]; allowedTCPPorts = [ 5900 ];
allowedUDPPorts = [ 5900 ]; allowedUDPPorts = [ 5900 ];
}; };

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.ntfy.enable = lib.mkOption { options.sysconfig.containers.ntfy.enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.ntfy.enable { config = lib.mkIf config.sysconfig.containers.ntfy.enable {
containers.ntfy = { containers.ntfy = {

View File

@@ -1,13 +1,13 @@
{ config, lib, pkgs, nixpkgs-us, ... }: { { config, lib, nixpkgs-us, ... }: {
options = { options = {
sysconfig.virtualization.openwebui.enable = lib.options.mkOption { sysconfig.containers.openwebui.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
}; };
config = lib.mkIf config.sysconfig.virtualization.openwebui.enable { config = lib.mkIf config.sysconfig.containers.openwebui.enable {
containers.openwebui = { containers.openwebui = {
@@ -20,7 +20,6 @@
services.open-webui = { services.open-webui = {
enable = true; enable = true;
#package = pkgs.open-webui;
package = let package = let
pkgs-us = import nixpkgs-us { pkgs-us = import nixpkgs-us {
system = "x86_64-linux"; system = "x86_64-linux";

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.rustdesk.enable = lib.options.mkOption { options.sysconfig.containers.rustdesk.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.rustdesk.enable { config = lib.mkIf config.sysconfig.containers.rustdesk.enable {
/*networking = { /*networking = {
firewall.allowedTCPPorts = [ 21115 21116 21117 21118 21119 ]; firewall.allowedTCPPorts = [ 21115 21116 21117 21118 21119 ];

View File

@@ -1,11 +1,11 @@
{ config, lib, self, ... }: { { config, lib, self, ... }: {
options.sysconfig.virtualization.sandbox.enable = lib.mkOption { options.sysconfig.containers.sandbox.enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.sandbox.enable { config = lib.mkIf config.sysconfig.containers.sandbox.enable {
networking = { networking = {

View File

@@ -1,11 +1,11 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.traefik.enable = lib.options.mkOption { options.sysconfig.containers.traefik.enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization.traefik.enable { config = lib.mkIf config.sysconfig.containers.traefik.enable {
networking = { networking = {
hosts."192.168.100.11" = [ hosts."192.168.100.11" = [

View File

@@ -1,6 +1,6 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.wyoming = { options.sysconfig.containers.wyoming = {
enable = lib.options.mkOption { enable = lib.options.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
@@ -23,7 +23,7 @@
}; };
}; };
config = lib.mkIf config.sysconfig.virtualization.wyoming.enable { config = lib.mkIf config.sysconfig.containers.wyoming.enable {
containers.wyoming = { containers.wyoming = {
@@ -32,7 +32,7 @@
hostAddress = "192.168.100.10"; hostAddress = "192.168.100.10";
localAddress = "192.168.100.26"; 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" = { "/dev/nvidia0" = {
hostPath = "/dev/nvidia0"; hostPath = "/dev/nvidia0";
isReadOnly = false; 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"; node = "/dev/nvidia0";
modifier = "rw"; modifier = "rw";
@@ -86,7 +86,7 @@
services.wyoming = { services.wyoming = {
piper = lib.mkIf config.sysconfig.virtualization.wyoming.piper { piper = lib.mkIf config.sysconfig.containers.wyoming.piper {
servers.piper = { servers.piper = {
enable = true; enable = true;
@@ -95,7 +95,7 @@
}; };
}; };
openwakeword = lib.mkIf config.sysconfig.virtualization.wyoming.openwakeword { openwakeword = lib.mkIf config.sysconfig.containers.wyoming.openwakeword {
enable = true; enable = true;
uri = "tcp://0.0.0.0:11432"; 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 = { servers.whisper = {
enable = true; enable = true;
device = "auto"; device = "auto";
@@ -115,7 +115,7 @@
}; };
}; };
satellite = lib.mkIf config.sysconfig.virtualization.wyoming.satellite { satellite = lib.mkIf config.sysconfig.containers.wyoming.satellite {
enable = true; enable = true;
uri = "tcp://0.0.0.0:11431"; uri = "tcp://0.0.0.0:11431";
#user = "nathan"; #user = "nathan";

View File

@@ -1,4 +1,9 @@
{ ... }: { { config, lib, ... }: {
options.sysconfig.virtualization.enable = with lib; mkOption {
type = with types; bool;
default = false;
};
imports = let imports = let
dir = builtins.readDir ./.; dir = builtins.readDir ./.;
@@ -7,7 +12,7 @@
(builtins.attrNames dir) (builtins.attrNames dir)
); );
config = { config = lib.mkIf config.sysconfig.virtualisation.enable {
programs.virt-manager.enable = true; programs.virt-manager.enable = true;
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;