forked from pub-solar/infra
Merge pull request 'Put modules into uniform folders - part 2' (#179) from auto-modules into main
Reviewed-on: pub-solar/infra#179 Reviewed-by: b12f <b12f@noreply.git.pub.solar>
This commit is contained in:
commit
def76f8776
flake.nix
modules
caddy
collabora
coturn
default.nixdocker
drone
forgejo-actions-runner
forgejo
grafana
keycloak
loki
mailman
mastodon
matrix-irc
matrix-telegram
matrix
mediawiki
nextcloud
nginx-mastodon-files
nginx-mastodon
nginx-matrix
nginx-prometheus-exporters
nginx-website-miom
nginx-website
nginx
obs-portal
opensearch
owncast
postgresql
prometheus-exporters
prometheus
promtail
searx
tmate
unlock-zfs-on-boot
18
flake.nix
18
flake.nix
|
@ -42,7 +42,6 @@
|
|||
./logins
|
||||
./lib
|
||||
./overlays
|
||||
./modules
|
||||
./hosts
|
||||
];
|
||||
|
||||
|
@ -85,9 +84,20 @@
|
|||
{
|
||||
inherit username;
|
||||
|
||||
checks = builtins.mapAttrs (
|
||||
system: deployLib: deployLib.deployChecks self.deploy
|
||||
) inputs.deploy-rs.lib;
|
||||
nixosModules = builtins.listToAttrs (
|
||||
map
|
||||
(x: {
|
||||
name = x;
|
||||
value = import (./modules + "/${x}");
|
||||
})
|
||||
(builtins.attrNames (builtins.readDir ./modules))
|
||||
);
|
||||
|
||||
checks = builtins.mapAttrs
|
||||
(
|
||||
system: deployLib: deployLib.deployChecks self.deploy
|
||||
)
|
||||
inputs.deploy-rs.lib;
|
||||
|
||||
formatter."x86_64-linux" = inputs.unstable.legacyPackages."x86_64-linux".nixfmt-rfc-style;
|
||||
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
{ self, ... }:
|
||||
{
|
||||
flake = {
|
||||
nixosModules = rec {
|
||||
core = import ./core;
|
||||
|
||||
unlock-zfs-on-boot = import ./unlock-zfs-on-boot.nix;
|
||||
docker = import ./docker.nix;
|
||||
|
||||
caddy = import ./apps/caddy.nix;
|
||||
collabora = import ./apps/collabora.nix;
|
||||
coturn = import ./apps/coturn.nix;
|
||||
drone = import ./apps/drone.nix;
|
||||
forgejo-actions-runner = import ./apps/forgejo/forgejo-actions-runner.nix;
|
||||
forgejo = import ./apps/forgejo/forgejo.nix;
|
||||
grafana = import ./apps/grafana/grafana.nix;
|
||||
keycloak = import ./apps/keycloak.nix;
|
||||
loki = import ./apps/loki.nix;
|
||||
mailman = import ./apps/mailman.nix;
|
||||
mastodon = import ./apps/mastodon/mastodon.nix;
|
||||
nginx-mastodon = import ./apps/mastodon/nginx-mastodon.nix;
|
||||
nginx-mastodon-files = import ./apps/mastodon/nginx-mastodon-files.nix;
|
||||
matrix = import ./apps/matrix/synapse.nix;
|
||||
nginx-matrix = import ./apps/matrix/nginx-matrix.nix;
|
||||
matrix-telegram = import ./apps/matrix/mautrix-telegram.nix;
|
||||
matrix-irc = import ./apps/matrix/irc.nix;
|
||||
mediawiki = import ./apps/mediawiki.nix;
|
||||
nextcloud = import ./apps/nextcloud/nextcloud.nix;
|
||||
nginx-website-miom = import ./apps/nginx-website-miom.nix;
|
||||
nginx-website = import ./apps/nginx-website.nix;
|
||||
nginx = import ./apps/nginx.nix;
|
||||
obs-portal = import ./apps/obs-portal.nix;
|
||||
opensearch = import ./apps/opensearch.nix;
|
||||
owncast = import ./apps/owncast.nix;
|
||||
postgresql = import ./apps/postgresql.nix;
|
||||
prometheus = import ./apps/prometheus/prometheus.nix;
|
||||
prometheus-exporters = import ./apps/prometheus/prometheus-exporters.nix;
|
||||
nginx-prometheus-exporters = import ./apps/prometheus/nginx-prometheus-exporters.nix;
|
||||
promtail = import ./apps/promtail.nix;
|
||||
searx = import ./apps/searx.nix;
|
||||
tmate = import ./apps/tmate.nix;
|
||||
};
|
||||
};
|
||||
}
|
Before (image error) Size: 29 KiB After (image error) Size: 29 KiB |
Before (image error) Size: 8.7 KiB After (image error) Size: 8.7 KiB |
Loading…
Reference in a new issue