diff --git a/modules/nixos/services/glance/config/server.nix b/modules/nixos/services/glance/config/server.nix index cefc788..156a54d 100755 --- a/modules/nixos/services/glance/config/server.nix +++ b/modules/nixos/services/glance/config/server.nix @@ -1,10 +1,11 @@ -{ flake, service, ... }: +{ flake, configHelpers, ... }: let inherit (flake.config.people) user0; in { assets-path = "/home/${user0}/Files/Projects/dotfiles/modules/nixos/services/glance/assets"; - port = service.ports.port0; + host = configHelpers.service.domains.url0; + port = configHelpers.service.ports.port0; # auth = { # secret-key = config.sops.secrets."${service.name}-key".path; # users.${user0}.password = config.sops.secrets."${service.name}-${user0}-pass".path; diff --git a/modules/nixos/services/glance/default.nix b/modules/nixos/services/glance/default.nix index 5bb77f3..f78357e 100755 --- a/modules/nixos/services/glance/default.nix +++ b/modules/nixos/services/glance/default.nix @@ -12,10 +12,9 @@ let localhost = web.localhost.address0; host = configHelpers.service.domains.url0; }; - service = glance; configPath = ./config; configImports = { - server = import (configPath + /server.nix) { inherit flake service; }; + server = import (configPath + /server.nix) { inherit flake configHelpers; }; branding = import (configPath + /branding.nix); theme = import (configPath + /theme.nix); pages = import (configPath + /pages.nix) { inherit config flake; }; @@ -52,7 +51,7 @@ in sops = let sopsPath = secret: { - path = "/run/secrets/${service.name}-${secret}"; + path = "/run/secrets/${configHelpers.service.name}-${secret}"; owner = "root"; group = "root"; mode = "644"; @@ -62,7 +61,7 @@ in secrets = builtins.listToAttrs ( map (secret: { - name = "${service.name}-${secret}"; + name = "${configHelpers.service.name}-${secret}"; value = sopsPath secret; }) [ @@ -76,7 +75,7 @@ in networking = { firewall = { allowedTCPPorts = [ - service.ports.port0 + configHelpers.service.ports.port0 ]; }; };