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

bump: Update to NixOS 24.11

Browse source
This commit is contained in:
Tristan Daniël Maat 2025-01-19 00:09:40 +08:00
parent 34f88ee8d5
commit b3be7bd88f
Signed by: tlater
GPG key ID: 49670FD774E43268
12 changed files with 66 additions and 243 deletions
configuration
default.nix
hardware-specific/hetzner
default.nix
services
metrics
options.nix
nextcloud.nixwireguard.nix

2
configuration/default.nix
View file

@ -35,13 +35,11 @@
(final: prev: {
local = import ../pkgs {
pkgs = prev;
lib = prev.lib;
};
})
];
nix = {
package = pkgs.nixFlakes;
extraOptions = ''
experimental-features = nix-command flakes
'';

8
configuration/hardware-specific/hetzner/default.nix
View file

@ -19,13 +19,11 @@
addresses = [
# IPv4
{
addressConfig = {
Address = "116.202.158.55/32";
Peer = "116.202.158.1/32"; # Gateway
};
Address = "116.202.158.55/32";
Peer = "116.202.158.1/32"; # Gateway
}
# IPv6
{ addressConfig.Address = "2a01:4f8:10b:3c85::2/64"; }
{ Address = "2a01:4f8:10b:3c85::2/64"; }
];
networkConfig = {

10
configuration/services/metrics/options.nix
View file

@ -213,7 +213,15 @@ in
let
allExporters = lib.mapAttrs (name: exporter: { inherit (exporter) listenAddress port; }) (
(lib.filterAttrs (
_: exporter: builtins.isAttrs exporter && exporter.enable
name: exporter:
# A bunch of deprecated exporters that need to be ignored
!(builtins.elem name [
"minio"
"tor"
"unifi-poller"
])
&& builtins.isAttrs exporter
&& exporter.enable
) config.services.prometheus.exporters)
// config.services.prometheus.extraExporters
);

6
configuration/services/nextcloud.nix
View file

@ -18,10 +18,10 @@ in
packageOverrides = final: prev: {
extensions = prev.extensions // {
pgsql = prev.extensions.pgsql.overrideAttrs (old: {
configureFlags = [ "--with-pgsql=${config.services.postgresql.package}" ];
configureFlags = [ "--with-pgsql=${lib.getDev config.services.postgresql.package}" ];
});
pdo_pgsql = prev.extensions.pdo_pgsql.overrideAttrs (old: {
configureFlags = [ "--with-pdo-pgsql=${config.services.postgresql.package}" ];
configureFlags = [ "--with-pdo-pgsql=${lib.getDev config.services.postgresql.package}" ];
});
};
};
@ -51,7 +51,7 @@ in
};
extraApps = {
inherit (pkgs.local)
inherit (config.services.nextcloud.package.packages.apps)
bookmarks
calendar
contacts

22
configuration/services/wireguard.nix
View file

@ -24,12 +24,10 @@
};
wireguardPeers = [
# yui
{
# yui
wireguardPeerConfig = {
AllowedIPs = [ "10.45.249.2/32" ];
PublicKey = "5mlnqEVJWks5OqgeFA2bLIrvST9TlCE81Btl+j4myz0=";
};
AllowedIPs = [ "10.45.249.2/32" ];
PublicKey = "5mlnqEVJWks5OqgeFA2bLIrvST9TlCE81Btl+j4myz0=";
}
];
};
@ -40,23 +38,23 @@
matchConfig.Name = "wg0";
networkConfig = {
Description = "VLAN";
Address = [
"10.45.249.1/32"
# TODO(tlater): Add IPv6 whenever that becomes relevant
];
IPForward = "yes";
IPv4Forwarding = "yes";
IPv4ProxyARP = "yes";
};
routes = [
{
routeConfig = {
Source = "10.45.249.0/24";
Destination = "10.45.249.0/24";
Gateway = "10.45.249.1";
GatewayOnLink = "no";
};
Source = "10.45.249.0/24";
Destination = "10.45.249.0/24";
Gateway = "10.45.249.1";
GatewayOnLink = "no";
}
];