tlaternet/tlaternet-server
1
0
Fork 0
Code Issues10 Pull requests Releases Activity

chore(treewide): Upgrade to NixOS 25.05

Browse source
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
conduit
default.nix
metrics
grafana.nix
nextcloud.nix
flake.nix
modules/crowdsec
default.nix

3
configuration/services/conduit/default.nix
View file

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

9
configuration/services/metrics/grafana.nix
View file

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

6
configuration/services/nextcloud.nix
View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
nextcloud = pkgs.nextcloud30; nextcloud = pkgs.nextcloud31;
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}" ]; configureFlags = [ "--with-pgsql=${lib.getDev config.services.postgresql.package.pg_config}" ];
}); });
pdo_pgsql = prev.extensions.pdo_pgsql.overrideAttrs (_: { 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}" ];
}); });
}; };
}; };

7
flake.nix
View file

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

5
modules/crowdsec/default.nix
View file

@ -247,10 +247,7 @@ 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;
}; };
}; };