Compare commits

..

No commits in common. "ecc088db2d4f27ffa180842d42d20fe42d8e95ff" and "b067bbc8c004af4780f8306c3ad7de466a9d823f" have entirely different histories.

6 changed files with 814 additions and 136 deletions
configuration/services
flake.lockflake.nix
modules/crowdsec

View file

@ -1,5 +1,6 @@
{ {
pkgs, pkgs,
flake-inputs,
config, config,
lib, lib,
... ...
@ -20,7 +21,7 @@ in
services = { services = {
matrix-conduit = { matrix-conduit = {
enable = true; enable = true;
package = pkgs.matrix-continuwuity; package = flake-inputs.continuwuity.packages.${pkgs.system}.default;
settings.global = { settings.global = {
address = "127.0.0.1"; address = "127.0.0.1";
server_name = domain; server_name = domain;

View file

@ -1,4 +1,9 @@
{ pkgs, config, ... }: {
pkgs,
config,
flake-inputs,
...
}:
let let
domain = "metrics.${config.services.nginx.domain}"; domain = "metrics.${config.services.nginx.domain}";
in in
@ -30,7 +35,7 @@ in
declarativePlugins = [ declarativePlugins = [
pkgs.grafanaPlugins.victoriametrics-metrics-datasource pkgs.grafanaPlugins.victoriametrics-metrics-datasource
pkgs.grafanaPlugins.victoriametrics-logs-datasource flake-inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.grafanaPlugins.victoriametrics-logs-datasource
]; ];
provision = { provision = {

View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
nextcloud = pkgs.nextcloud31; nextcloud = pkgs.nextcloud30;
hostName = "nextcloud.${config.services.nginx.domain}"; hostName = "nextcloud.${config.services.nginx.domain}";
in in
{ {
@ -19,10 +19,10 @@ in
packageOverrides = _: prev: { packageOverrides = _: prev: {
extensions = prev.extensions // { extensions = prev.extensions // {
pgsql = prev.extensions.pgsql.overrideAttrs (_: { pgsql = prev.extensions.pgsql.overrideAttrs (_: {
configureFlags = [ "--with-pgsql=${lib.getDev config.services.postgresql.package.pg_config}" ]; configureFlags = [ "--with-pgsql=${lib.getDev config.services.postgresql.package}" ];
}); });
pdo_pgsql = prev.extensions.pdo_pgsql.overrideAttrs (_: { pdo_pgsql = prev.extensions.pdo_pgsql.overrideAttrs (_: {
configureFlags = [ "--with-pdo-pgsql=${lib.getDev config.services.postgresql.package.pg_config}" ]; configureFlags = [ "--with-pdo-pgsql=${lib.getDev config.services.postgresql.package}" ];
}); });
}; };
}; };

920
flake.lock generated

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,12 @@
description = "tlater.net host configuration"; description = "tlater.net host configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05-small"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11-small";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small";
continuwuity = {
url = "git+https://forgejo.ellis.link/continuwuation/continuwuity.git?ref=refs/tags/v0.5.0-rc.5";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -247,7 +247,10 @@ in
online_client = { online_client = {
# By default, we don't let crowdsec phone home, since # By default, we don't let crowdsec phone home, since
# this is usually within NixOS users' concerns. # this is usually within NixOS users' concerns.
sharing = lib.mkDefault false; #
# TODO: Enable when this option becomes available
# (1.6.4, current nixpkgs-unstable)
# sharing = lib.mkDefault false;
credentials_path = cfg.centralApiCredentials; credentials_path = cfg.centralApiCredentials;
}; };
}; };