Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Blunkall-Technologies:86272d668d726b0d6709c1fab0fc9dd71a63df07
Branches Tags
Blunkall-Technologies:master
...
compare: Blunkall-Technologies:83f48b3403063abdab6024b72f887522db56db1f
Branches Tags
Blunkall-Technologies:master

2 Commits
86272d668d ... 83f48b3403

Author SHA1 Message Date
Nathan
83f48b3403 fix 2025-11-08 12:22:32 -06:00
Nathan
9d56a9bd10 change domain name 2025-11-08 12:22:32 -06:00
11 changed files with 72 additions and 69 deletions
Expand all files Collapse all files

18
flake.lock generated
View File

@@ -655,11 +655,11 @@
}, },
"nixpkgs-us": { "nixpkgs-us": {
"locked": { "locked": {
"lastModified": 1757068644, "lastModified": 1762363567,
"narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -740,17 +740,17 @@
"nixvim": "nixvim_2" "nixvim": "nixvim_2"
}, },
"locked": { "locked": {
"lastModified": 1756234794, "lastModified": 1760575893,
"narHash": "sha256-objBSkdkrn6BpQ1mH1tkvXmipfJ+mONHuydefPhdNSs=", "narHash": "sha256-u6eyhxtlxgG29uI2VCSt5Ir6/BW9hkhglCTfbJ14Hgg=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "50ffcb48e2bc7e18fd7123c876158b913300b177", "rev": "bcc5185ef433a77b18f5aa585ee79d97f9a8e69c",
"revCount": 35, "revCount": 36,
"type": "git", "type": "git",
"url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai" "url": "ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai" "url": "ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai"
} }
}, },
"nixvim_2": { "nixvim_2": {

4
flake.nix
View File

@@ -39,8 +39,8 @@
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
#nixvim.url = "git+https://gitea.blunkall.us/Blunkall-Technologies/Moirai"; #nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
nixvim.url = "git+ssh://gitea@gitea.blunkall.us/Blunkall-Technologies/Moirai"; nixvim.url = "git+ssh://gitea@gitea.esotericbytes.com/Blunkall-Technologies/Moirai";
}; };

2
system-config/configuration/homebox/default.nix
View File

@@ -173,7 +173,7 @@
virtualization = { virtualization = {
traefik.enable = true; traefik.enable = true;
jellyfin.enable = true; jellyfin.enable = true;
"blunkall.us".enable = true; "esotericbytes.com".enable = true;
nextcloud.enable = true; nextcloud.enable = true;
ntfy.enable = false; ntfy.enable = false;
gitea.enable = true; gitea.enable = true;

6
system-config/services/containers/gitea/default.nix
View File

@@ -8,7 +8,7 @@
config = lib.mkIf config.sysconfig.virtualization.gitea.enable { config = lib.mkIf config.sysconfig.virtualization.gitea.enable {
networking = { networking = {
hosts."192.168.100.20" = [ "gitea.blunkall.us" ]; hosts."192.168.100.20" = [ "gitea.esotericbytes.com" ];
nat.internalInterfaces = [ "ve-gitea" ]; nat.internalInterfaces = [ "ve-gitea" ];
}; };
@@ -77,9 +77,9 @@
settings = { settings = {
server = { server = {
DOMAIN = "gitea.blunkall.us"; DOMAIN = "gitea.esotericbytes.com";
HTTP_PORT = 3000; HTTP_PORT = 3000;
ROOT_URL = "https://gitea.blunkall.us/"; ROOT_URL = "https://gitea.esotericbytes.com/";
}; };
service = { service = {
DISABLE_REGISTRATION = false; DISABLE_REGISTRATION = false;

2
system-config/services/containers/keycloak/default.nix
View File

@@ -62,7 +62,7 @@
database.passwordFile = "/etc/keycloak/dbpass"; database.passwordFile = "/etc/keycloak/dbpass";
settings = { settings = {
hostname = "auth.blunkall.us"; hostname = "auth.esotericbytes.com";
http-enabled = true; http-enabled = true;

15
system-config/services/containers/n8n/default.nix
View File

@@ -28,14 +28,21 @@
enable = true; enable = true;
openFirewall = true; openFirewall = true;
environment = {
N8N_DIAGNOSTICS_ENABLED = "false";
N8N_VERSION_NOTIFICATIONS_ENABLED = "false";
N8N_TEMPLATES_ENABLED = "false";
settings = { EXTERNAL_FRONTEND_HOOKS_URLS = "";
N8N_DIAGNOSTICS_CONFIG_FRONTEND = "";
N8N_DIAGNOSTICS_CONFIG_BACKEND = "";
N8N_SECURE_COOKIE = "false";
}; };
#webhookUrl = "https://n8n.blunkall.us/"; #webhookUrl = "https://n8n.blunkall.us/";
}; };
/*
systemd.services.n8n = { systemd.services.n8n = {
environment = { environment = {
N8N_DIAGNOSTICS_ENABLED = "false"; N8N_DIAGNOSTICS_ENABLED = "false";
@@ -49,7 +56,7 @@
N8N_SECURE_COOKIE = "false"; N8N_SECURE_COOKIE = "false";
}; };
}; };
*/
system.stateVersion = "25.05"; system.stateVersion = "25.05";
}; };
}; };

40
system-config/services/containers/netbird/default.nix
View File

@@ -16,7 +16,7 @@
}; };
config = let config = let
pkgs-us = import inputs.nixpkgs-us { pkgs-com = import inputs.nixpkgs-us {
system = "x86_64-linux"; system = "x86_64-linux";
config.allowUnfree = true; config.allowUnfree = true;
}; };
@@ -26,9 +26,9 @@
enable = config.sysconfig.services.netbird.enable; enable = config.sysconfig.services.netbird.enable;
ui = { ui = {
enable = true; enable = true;
#package = pkgs-us.netbird-ui; #package = pkgs-com.netbird-ui;
}; };
#package = pkgs-us.netbird; #package = pkgs-com.netbird;
}; };
networking = { networking = {
@@ -67,7 +67,7 @@
config = { config = {
services.nginx.virtualHosts."vpn.blunkall.us" = { services.nginx.virtualHosts."vpn.esotericbytes.com" = {
listen = [ listen = [
{ {
addr = "0.0.0.0"; addr = "0.0.0.0";
@@ -82,13 +82,13 @@
server = { server = {
enable = true; enable = true;
enableNginx = true; enableNginx = true;
domain = "vpn.blunkall.us"; domain = "vpn.esotericbytes.com";
dashboard = { dashboard = {
enable = true; enable = true;
enableNginx = true; enableNginx = true;
settings = { settings = {
AUTH_AUTHORITY = "https://auth.blunkall.us/realms/General"; AUTH_AUTHORITY = "https://auth.esotericbytes.com/realms/General";
AUTH_CLIENT_ID = "netbird"; AUTH_CLIENT_ID = "netbird";
AUTH_SUPPORTED_SCOPES = "openid profile email offline_access api"; AUTH_SUPPORTED_SCOPES = "openid profile email offline_access api";
AUTH_AUDIENCE = "netbird"; AUTH_AUDIENCE = "netbird";
@@ -96,7 +96,7 @@
NETBIRD_TOKEN_SOURCE = "accessToken"; NETBIRD_TOKEN_SOURCE = "accessToken";
}; };
package = pkgs-us.netbird-dashboard; package = pkgs-com.netbird-dashboard;
}; };
management = { management = {
enable = true; enable = true;
@@ -107,19 +107,19 @@
dnsDomain = "vpn"; dnsDomain = "vpn";
turnDomain = "vpn.blunkall.us"; turnDomain = "vpn.esotericbytes.com";
turnPort = 3478; turnPort = 3478;
logLevel = "DEBUG"; logLevel = "DEBUG";
oidcConfigEndpoint = "https://auth.blunkall.us/realms/General/.well-known/openid-configuration"; oidcConfigEndpoint = "https://auth.esotericbytes.com/realms/General/.well-known/openid-configuration";
settings = { settings = {
"TURNConfig" = { "TURNConfig" = {
"Turns" = [ "Turns" = [
{ {
"Proto" = "udp"; "Proto" = "udp";
"URI" = "turn:vpn.blunkall.us:3478"; "URI" = "turn:vpn.esotericbytes.com:3478";
"Username" = "netbird"; "Username" = "netbird";
"Password"._secret = "/etc/netbird/coturnPass"; "Password"._secret = "/etc/netbird/coturnPass";
} }
@@ -132,14 +132,14 @@
"HttpConfig" = { "HttpConfig" = {
"Address" = "0.0.0.0:443"; "Address" = "0.0.0.0:443";
"AuthIssuer" = "https://auth.blunkall.us/realms/General"; "AuthIssuer" = "https://auth.esotericbytes.com/realms/General";
"AuthAudience" = "netbird"; "AuthAudience" = "netbird";
"AuthKeysLocation" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/certs"; "AuthKeysLocation" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/certs";
"AuthUserIDClaim" = ""; "AuthUserIDClaim" = "";
"CertFile" = ""; "CertFile" = "";
"CertKey" = ""; "CertKey" = "";
"IdpSignKeyRefreshEnabled" = false; "IdpSignKeyRefreshEnabled" = false;
"OIDCConfigEndpoint" = "https://auth.blunkall.us/realms/General/.well-known/openid-configuration"; "OIDCConfigEndpoint" = "https://auth.esotericbytes.com/realms/General/.well-known/openid-configuration";
}; };
"DeviceAuthorizationFlow" = { "DeviceAuthorizationFlow" = {
@@ -150,8 +150,8 @@
"Domain" = ""; "Domain" = "";
"ClientID" = ""; "ClientID" = "";
"ClientSecret" = ""; "ClientSecret" = "";
"TokenEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/token"; "TokenEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/token";
"DeviceAuthEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/auth/device"; "DeviceAuthEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/auth/device";
"Scope" = "openid"; "Scope" = "openid";
"UseIDToken" = false; "UseIDToken" = false;
"RedirectURLs" = null; "RedirectURLs" = null;
@@ -161,15 +161,15 @@
"IdpManagerConfig" = { "IdpManagerConfig" = {
"ManagerType" = "keycloak"; "ManagerType" = "keycloak";
"ClientConfig" = { "ClientConfig" = {
"Issuer" = "https://auth.blunkall.us/realms/General"; "Issuer" = "https://auth.esotericbytes.com/realms/General";
"TokenEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/token"; "TokenEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/token";
"ClientID" = "netbird-backend"; "ClientID" = "netbird-backend";
"ClientSecret" = "QuqjTOAHKE6N6jJqkB1F1RGo3kqUhEdg"; "ClientSecret" = "QuqjTOAHKE6N6jJqkB1F1RGo3kqUhEdg";
"GrantType" = "client_credentials"; "GrantType" = "client_credentials";
}; };
"ExtraConfig" = { "ExtraConfig" = {
"AdminEndpoint" = "https://auth.blunkall.us/admin/realms/General"; "AdminEndpoint" = "https://auth.esotericbytes.com/admin/realms/General";
}; };
"Auth0ClientCredentials" = null; "Auth0ClientCredentials" = null;
"AzureClientCredentials" = null; "AzureClientCredentials" = null;
@@ -183,8 +183,8 @@
"ClientID" = "netbird"; "ClientID" = "netbird";
"ClientSecret" = ""; "ClientSecret" = "";
"Domain" = ""; "Domain" = "";
"AuthorizationEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/auth"; "AuthorizationEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/auth";
"TokenEndpoint" = "https://auth.blunkall.us/realms/General/protocol/openid-connect/token"; "TokenEndpoint" = "https://auth.esotericbytes.com/realms/General/protocol/openid-connect/token";
"Scope" = "openid profile email offline_access api"; "Scope" = "openid profile email offline_access api";
"RedirectURLs" = [ "RedirectURLs" = [
"http://localhost:53000" "http://localhost:53000"

2
system-config/services/containers/nextcloud/default.nix
View File

@@ -67,7 +67,7 @@
extraAppsEnable = true; extraAppsEnable = true;
settings = { settings = {
overwriteprotocol = "https"; overwriteprotocol = "https";
trusted_domains = [ "nextcloud.blunkall.us" ]; trusted_domains = [ "nextcloud.esotericbytes.com" ];
trusted_proxies = [ "192.168.100.11" ]; trusted_proxies = [ "192.168.100.11" ];
default_phone_region = "US"; default_phone_region = "US";
}; };

12
system-config/services/containers/nginx/default.nix
View File

@@ -1,13 +1,13 @@
{ config, lib, ... }: { { config, lib, ... }: {
options.sysconfig.virtualization."blunkall.us".enable = lib.mkOption { options.sysconfig.virtualization."esotericbytes.com".enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
}; };
config = lib.mkIf config.sysconfig.virtualization."blunkall.us".enable { config = lib.mkIf config.sysconfig.virtualization."esotericbytes.com".enable {
containers.blunkall-us = { containers.esotericbytes-com = {
autoStart = true; autoStart = true;
privateNetwork = true; privateNetwork = true;
@@ -16,7 +16,7 @@
bindMounts = { bindMounts = {
"/var/www/data" = { "/var/www/data" = {
hostPath = "/ssd1/blunkall_us/data"; hostPath = "/ssd1/esotericbytes-com/data";
isReadOnly = false; isReadOnly = false;
}; };
}; };
@@ -26,12 +26,12 @@
services.nginx = { services.nginx = {
enable = true; enable = true;
virtualHosts = { virtualHosts = {
"blunkall.us" = { "esotericbytes.com" = {
enableACME = false; enableACME = false;
forceSSL = false; forceSSL = false;
root = "/var/www/data"; root = "/var/www/data";
}; };
"homebox.vpn/blunkall" = { "homebox.vpn/esotericbytes" = {
enableACME = false; enableACME = false;
forceSSL = false; forceSSL = false;
root = "/var/www/data"; root = "/var/www/data";

34
system-config/services/containers/traefik/default.nix
View File

@@ -8,7 +8,7 @@
config = lib.mkIf config.sysconfig.virtualization.traefik.enable { config = lib.mkIf config.sysconfig.virtualization.traefik.enable {
networking = { networking = {
hosts."192.168.100.11" = [ "blunkall.us" "*.blunkall.us" "traefik.local" ]; hosts."192.168.100.11" = [ "esotericbytes.com" "*.esotericbytes.com" "traefik.local" ];
firewall.allowedTCPPorts = [ 22 80 443]; firewall.allowedTCPPorts = [ 22 80 443];
nat.internalInterfaces = [ "ve-traefik" ]; nat.internalInterfaces = [ "ve-traefik" ];
@@ -74,8 +74,8 @@
http.tls = { http.tls = {
certResolver = "cloudflare"; certResolver = "cloudflare";
domains = { domains = {
main = "blunkall.us"; main = "esotericbytes.com";
sans = [ "*.blunkall.us" "blunkall.us" ]; sans = [ "*.esotericbytes.com" "esotericbytes.com" ];
}; };
}; };
}; };
@@ -105,51 +105,51 @@
routers = { routers = {
homepageSecure = { homepageSecure = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`blunkall.us`) || Host(`www.blunkall.us`) || (Host(`homebox.vpn`) && PathPrefix(`/blunkall`))"; rule = "Host(`esotericbytes.com`) || Host(`www.esotericbytes.com`) || (Host(`homebox.vpn`) && PathPrefix(`/esotericbytes`))";
service = "homepage"; service = "homepage";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
}; };
/*remote = { /*remote = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`remote.blunkall.us`)"; rule = "Host(`remote.esotericbytes.com`)";
service = "novnc"; service = "novnc";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
#middlewares = [ "authentik" ]; #middlewares = [ "authentik" ];
};*/ };*/
/*homeassistant = { /*homeassistant = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`hass.blunkall.us`)"; rule = "Host(`hass.esotericbytes.com`)";
service = "homeassistant"; service = "homeassistant";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
};*/ };*/
jellyfin = { jellyfin = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`jellyfin.blunkall.us`)"; rule = "Host(`jellyfin.esotericbytes.com`)";
service = "jellyfin"; service = "jellyfin";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
}; };
auth = { auth = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`auth.blunkall.us`)"; rule = "Host(`auth.esotericbytes.com`)";
service = "keycloak"; service = "keycloak";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
}; };
/*gitlab = { /*gitlab = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`gitlab.blunkall.us`)"; rule = "Host(`gitlab.esotericbytes.com`)";
service = "gitlab"; service = "gitlab";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
};*/ };*/
gitea = { gitea = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`gitea.blunkall.us`)"; rule = "Host(`gitea.esotericbytes.com`)";
service = "gitea"; service = "gitea";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
}; };
nextcloud = { nextcloud = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`nextcloud.blunkall.us`)"; rule = "Host(`nextcloud.esotericbytes.com`)";
service = "nextcloud"; service = "nextcloud";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
middlewares = [ middlewares = [
@@ -165,28 +165,28 @@
}; };
/*ntfy = { /*ntfy = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`ntfy.blunkall.us`)"; rule = "Host(`ntfy.esotericbytes.com`)";
service = "ntfy"; service = "ntfy";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
};*/ };*/
/*pihole = { /*pihole = {
entryPoints = [ "localsecure" ]; entryPoints = [ "localsecure" ];
rule = "Host(`pihole.blunkall.us`)"; rule = "Host(`pihole.esotericbytes.com`)";
service = "pihole"; service = "pihole";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
};*/ };*/
netbird = { netbird = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`vpn.blunkall.us`)"; rule = "Host(`vpn.esotericbytes.com`)";
service = "netbird"; service = "netbird";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
}; };
/*n8n = { /*n8n = {
entryPoints = [ "websecure" ]; entryPoints = [ "websecure" ];
rule = "Host(`n8n.blunkall.us`)"; rule = "Host(`n8n.esotericbytes.com`)";
service = "n8n"; service = "n8n";
tls.certResolver = "cloudflare"; tls.certResolver = "cloudflare";
};*/ };*/
@@ -197,8 +197,8 @@
nextcloud_redirectregex.redirectregex = { nextcloud_redirectregex.redirectregex = {
permanent = true; permanent = true;
regex = "https://nextcloud.blunkall.us/.well-known/(?:card|cal)dav"; regex = "https://nextcloud.esotericbytes.com/.well-known/(?:card|cal)dav";
replacement = "https://nextcloud.blunkall.us/remote.php/dav"; replacement = "https://nextcloud.esotericbytes.com/remote.php/dav";
}; };
}; };

6
system-config/services/containers/wyoming/default.nix
View File

@@ -98,11 +98,7 @@
openwakeword = lib.mkIf config.sysconfig.virtualization.wyoming.openwakeword { openwakeword = lib.mkIf config.sysconfig.virtualization.wyoming.openwakeword {
enable = true; enable = true;
uri = "tcp://0.0.0.0:11432"; uri = "tcp://0.0.0.0:11432";
preloadModels = [
"alexa"
"hey_jarvis"
"ok_nabu"
];
threshold = 0.5; threshold = 0.5;
customModelsDirectories = [ customModelsDirectories = [
#./wake_words #./wake_words