SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-03-22 21:19:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: SebastianStork:286388294db4eb815d52898f913c8ec6587c5105
Branches Tags
SebastianStork:main
SebastianStork:dependabot/github_actions/cachix/cachix-action-17
SebastianStork:deploy
SebastianStork:deployed/srv-core
SebastianStork:deployed/vps-ns
SebastianStork:deployed/vps-www
SebastianStork:testing-srv-core
..
compare: SebastianStork:2f11b4eec2b472ac8d4ba43f899980101434fc5f
Branches Tags
SebastianStork:dependabot/github_actions/cachix/cachix-action-17
SebastianStork:deploy
SebastianStork:deployed/srv-core
SebastianStork:deployed/vps-ns
SebastianStork:deployed/vps-www
SebastianStork:main
SebastianStork:testing-srv-core

No commits in common. "286388294db4eb815d52898f913c8ec6587c5105" and "2f11b4eec2b472ac8d4ba43f899980101434fc5f" have entirely different histories.
286388294d ... 2f11b4eec2

2 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/nixos/networking/overlay.nix
View file

@ -78,12 +78,7 @@ in
dnsServers = lib.mkOption {
type = lib.types.listOf lib.types.nonEmptyStr;
default =
{
"client" = if (blocking-nameservers != [ ]) then blocking-nameservers else recursive-nameservers;
"server" = recursive-nameservers;
}
.${cfg.role};
default = if (blocking-nameservers != [ ]) then blocking-nameservers else recursive-nameservers;
};
implementation = lib.mkOption {

26
modules/nixos/web-services/glance.nix
View file

@ -8,9 +8,6 @@
let
cfg = config.custom.web-services.glance;
perHostDomains =
perHostSitesWidget.widgets |> lib.concatMap (widget: widget.sites) |> lib.map (site: site.domain);
perHostSitesWidget =
allHosts
|> lib.attrValues
@ -21,7 +18,8 @@ let
sites =
host.config.custom.meta.sites
|> lib.attrValues
|> lib.filter (site: site.domain |> lib.hasSuffix host.config.custom.networking.overlay.fqdn);
|> lib.filter (site: site.domain |> lib.hasSuffix host.config.custom.networking.overlay.fqdn)
|> lib.map (site: site // { timeout = "5s"; });
})
|> lib.filter ({ sites, ... }: sites != [ ])
|> (widgets: {
@ -30,6 +28,9 @@ let
inherit widgets;
});
perHostDomains =
perHostSitesWidget.widgets |> lib.concatMap (widget: widget.sites) |> lib.map (site: site.domain);
applicationSitesWidget =
allHosts
|> lib.attrValues
@ -44,7 +45,7 @@ let
type = "monitor";
cache = "1m";
title = "${name} Services";
sites = value;
sites = value |> lib.map (site: site // { timeout = "5s"; });
}
)
|> (widgets: {
@ -91,17 +92,6 @@ let
</div>
'';
};
dnsWidgets =
allHosts
|> lib.attrValues
|> lib.filter (host: host.config.custom.services.blocking-nameserver.enable)
|> lib.map (host: {
type = "dns-stats";
title = host.config.networking.hostName;
service = "adguard";
url = "https://${host.config.custom.services.blocking-nameserver.gui.domain}/";
});
in
{
options.custom.web-services.glance = {
@ -134,7 +124,7 @@ in
{
type = "search";
search-engine = "https://search.splitleaf.de/search?q={QUERY}";
autofocus = true;
autofocus = false;
}
applicationSitesWidget
perHostSitesWidget
@ -142,7 +132,7 @@ in
}
{
size = "small";
widgets = [ githubBadgeWidget ] ++ dnsWidgets;
widgets = [ githubBadgeWidget ];
}
];
};