chore(treewide): Upgrade to NixOS 25.05

This commit is contained in:
Tristan Daniël Maat 2025-05-24 22:53:33 +08:00
parent b067bbc8c0
commit 42ca657795
Signed by: tlater
GPG key ID: 49670FD774E43268
5 changed files with 8 additions and 22 deletions
configuration/services
flake.nix
modules/crowdsec

View file

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

View file

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

View file

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

View file

@ -2,12 +2,7 @@
description = "tlater.net host configuration";
inputs = {
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";
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05-small";
disko = {
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";

View file

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