feat: changed config module names

This commit is contained in:
Nick 2024-11-04 20:49:43 -06:00
parent 95346caae6
commit 7a6685cbc2
34 changed files with 123 additions and 123 deletions

View file

@ -1,5 +1,5 @@
{flake, ...}: let
inherit (flake.config.service.instance) ollama web;
inherit (flake.config.services.instances) ollama web;
service = ollama;
localhost = web.localhost.address0;
in {

View file

@ -1,5 +1,5 @@
{flake, ...}: let
inherit (flake.config.system.device) printer0 printer1;
inherit (flake.config.machines.devices) printer0 printer1;
genericPPD = "drv:///sample.drv/generic.ppd";
pageSize = "Letter";
in {

View file

@ -4,18 +4,18 @@
...
}: let
inherit (flake.config.people) user0;
inherit (flake.config.people.user.${user0}) email;
inherit (flake.config.service) instance;
inherit (flake.config.people.users.${user0}) email;
inherit (flake.config.services) instances;
domain0 = instance.web.domains.url0;
domain1 = instance.web.domains.url1;
dns = instance.web.dns.provider0;
domain0 = instances.web.domains.url0;
domain1 = instances.web.domains.url1;
dns = instances.web.dns.provider0;
instanceName = service: (instance.${service}.subdomain);
instanceName = service: (instances.${service}.subdomain);
dnsConfig = {
dnsProvider = dns;
directory = instance.acme.paths.path0;
directory = instances.acme.paths.path0;
environmentFile = config.sops.secrets."dns/namecheap".path;
};
in {
@ -68,7 +68,7 @@ in {
sops = let
sopsSecrets = ["pass"];
sopsPath = secret: {
path = "/var/lib/secrets/${instance.acme.name}/${dns}-${secret}";
path = "/var/lib/secrets/${instances.acme.name}/${dns}-${secret}";
owner = "root";
mode = "600";
};

View file

@ -1,5 +1,5 @@
{flake, ...}: let
inherit (flake.config.service.instance) caddy web;
inherit (flake.config.services.instances) caddy web;
domain0 = web.domains.url0;

View file

@ -3,8 +3,8 @@
config,
...
}: let
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) castopod nginx web;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) castopod nginx web;
service = castopod;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url1}";

View file

@ -3,8 +3,8 @@
config,
...
}: let
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) forgejo web;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) forgejo web;
service = forgejo;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url1}";

View file

@ -1,7 +1,7 @@
{flake, ...}: let
inherit (flake.config.people) user0;
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) jellyfin web;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) jellyfin web;
service = jellyfin;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url0}";

View file

@ -5,8 +5,8 @@
lib,
...
}: let
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) mastodon web;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) mastodon web;
service = mastodon;
host = web.domains.url1;
localhost = web.localhost.address0;

View file

@ -3,8 +3,8 @@
flake,
...
}: let
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) minecraft;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) minecraft;
service = minecraft;
in {
services = {

View file

@ -5,9 +5,9 @@
...
}: let
inherit (flake.config.people) user0;
inherit (flake.config.people.user.${user0}) name;
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) nextcloud nginx web;
inherit (flake.config.people.users.${user0}) name;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) nextcloud nginx web;
service = nextcloud;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url1}";

View file

@ -1,6 +1,6 @@
{flake, ...}: let
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) ollama web;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) ollama web;
service = ollama;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url0}";

View file

@ -1,5 +1,5 @@
{flake, ...}: let
inherit (flake.config.service.instance) owncast web;
inherit (flake.config.services.instances) owncast web;
service = owncast;
localhost = web.localhost.address1;
host = "${service.subdomain}.${web.domains.url1}";

View file

@ -4,8 +4,8 @@
pkgs,
...
}: let
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) caddy peertube web;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) caddy peertube web;
service = peertube;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url1}";

View file

@ -1,6 +1,6 @@
{flake, ...}: let
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) postgresql;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) postgresql;
service = postgresql;
in {

View file

@ -3,7 +3,7 @@
flake,
...
}: let
inherit (flake.config.service.instance) samba jellyfin;
inherit (flake.config.services.instances) samba jellyfin;
service = samba;
in {
# If you ever need to start fresh, you need to add yourself to the Samba users database:

View file

@ -3,7 +3,7 @@
config,
...
}: let
inherit (flake.config.service.instance) vaultwarden web;
inherit (flake.config.services.instances) vaultwarden web;
service = vaultwarden;
localhost = web.localhost.address0;
host = "${service.subdomain}.${web.domains.url0}";

View file

@ -3,8 +3,8 @@
config,
...
}: let
inherit (flake.config.system.device) server;
inherit (flake.config.service.instance) web wiki;
inherit (flake.config.machines.devices) server;
inherit (flake.config.services.instances) web wiki;
service = wiki;
localhost = web.localhost.address1;
host = "${service.subdomain}.${web.domains.url1}";

View file

@ -1,6 +1,6 @@
{flake, ...}: let
inherit (flake.config.people) user0;
inherit (flake.config.people.user.${user0}) sshKeys;
inherit (flake.config.people.users.${user0}) sshKeys;
in {
users.users.${user0} = {
openssh.authorizedKeys.keys = sshKeys;

View file

@ -1,6 +1,6 @@
{flake, ...}: let
inherit (flake.config.system.device) nas phone tablet;
inherit (flake.config.service.instance) syncthing web;
inherit (flake.config.machines.devices) nas phone tablet;
inherit (flake.config.services.instances) syncthing web;
service = syncthing;
localhost = web.localhost.address0;
in {