fixup! WIP: upgrade to 24.11
This commit is contained in:
parent
5b452f154a
commit
7af612b606
2 changed files with 61 additions and 63 deletions
|
|
@ -6,13 +6,10 @@
|
||||||
{
|
{
|
||||||
|
|
||||||
age.secrets = {
|
age.secrets = {
|
||||||
thor_wg_priv = {
|
# thor_wg_priv = {
|
||||||
file = ../../secrets/thor_wg_priv.age;
|
# file = ../../secrets/thor_wg_priv.age;
|
||||||
};
|
# };
|
||||||
ntfy-thor = {
|
ntfy-thor = { file = ../../secrets/ntfy-thor.age; owner = "bertof"; };
|
||||||
file = ../../secrets/ntfy-thor.age;
|
|
||||||
owner = "bertof";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
|
|
@ -121,61 +118,61 @@
|
||||||
|
|
||||||
firewall.enable = false;
|
firewall.enable = false;
|
||||||
|
|
||||||
wg-quick.interfaces = {
|
# wg-quick.interfaces = {
|
||||||
wg0 = {
|
# wg0 = {
|
||||||
autostart = false;
|
# autostart = false;
|
||||||
address = [
|
# address = [
|
||||||
"10.0.0.4/24"
|
# "10.0.0.4/24"
|
||||||
"fdc9:281f:04d7:9ee9::4/64"
|
# "fdc9:281f:04d7:9ee9::4/64"
|
||||||
];
|
# ];
|
||||||
dns = [
|
# dns = [
|
||||||
"10.0.0.1"
|
# "10.0.0.1"
|
||||||
"fdc9:281f:04d7:9ee9::1"
|
# "fdc9:281f:04d7:9ee9::1"
|
||||||
];
|
# ];
|
||||||
privateKeyFile = config.age.secrets.thor_wg_priv.path;
|
# privateKeyFile = config.age.secrets.thor_wg_priv.path;
|
||||||
|
#
|
||||||
peers = [
|
# peers = [
|
||||||
{
|
# {
|
||||||
# baldur
|
# # baldur
|
||||||
# allowedIPs = [ "10.0.0.3/32" "fdc9:281f:04d7:9ee9::3/128" ];
|
# # allowedIPs = [ "10.0.0.3/32" "fdc9:281f:04d7:9ee9::3/128" ];
|
||||||
allowedIPs = [
|
# allowedIPs = [
|
||||||
"0.0.0.0/0"
|
# "0.0.0.0/0"
|
||||||
"::/0"
|
# "::/0"
|
||||||
];
|
# ];
|
||||||
endpoint = "baldur.bertof.net:51820";
|
# endpoint = "baldur.bertof.net:51820";
|
||||||
presharedKeyFile = config.age.secrets.wg_psk.path;
|
# presharedKeyFile = config.age.secrets.wg_psk.path;
|
||||||
publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc=";
|
# publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc=";
|
||||||
}
|
# }
|
||||||
{
|
# {
|
||||||
# odin
|
# # odin
|
||||||
publicKey = "LDBhvzeYmHJ0z5ch+N559GWjT3It1gZvGR/9WtCfURw=";
|
# publicKey = "LDBhvzeYmHJ0z5ch+N559GWjT3It1gZvGR/9WtCfURw=";
|
||||||
presharedKeyFile = config.age.secrets.wg_psk.path;
|
# presharedKeyFile = config.age.secrets.wg_psk.path;
|
||||||
allowedIPs = [
|
# allowedIPs = [
|
||||||
"10.0.0.2/24"
|
# "10.0.0.2/24"
|
||||||
"fdc9:281f:04d7:9ee9::2/128"
|
# "fdc9:281f:04d7:9ee9::2/128"
|
||||||
];
|
# ];
|
||||||
}
|
# }
|
||||||
{
|
# {
|
||||||
# oppo
|
# # oppo
|
||||||
publicKey = "OBk6bHKuIYLwD7cwjmAuMn57jXqbDwCL52jhQxiHnnA=";
|
# publicKey = "OBk6bHKuIYLwD7cwjmAuMn57jXqbDwCL52jhQxiHnnA=";
|
||||||
presharedKeyFile = config.age.secrets.wg_psk.path;
|
# presharedKeyFile = config.age.secrets.wg_psk.path;
|
||||||
allowedIPs = [
|
# allowedIPs = [
|
||||||
"10.0.0.3/24"
|
# "10.0.0.3/24"
|
||||||
"fdc9:281f:04d7:9ee9::3/128"
|
# "fdc9:281f:04d7:9ee9::3/128"
|
||||||
];
|
# ];
|
||||||
}
|
# }
|
||||||
{
|
# {
|
||||||
# thor
|
# # thor
|
||||||
publicKey = "rpwR6n4IE96VZAmQDBufsWE/a9G7d8fpkvY1OwsbOhk=";
|
# publicKey = "rpwR6n4IE96VZAmQDBufsWE/a9G7d8fpkvY1OwsbOhk=";
|
||||||
presharedKeyFile = config.age.secrets.wg_psk.path;
|
# presharedKeyFile = config.age.secrets.wg_psk.path;
|
||||||
allowedIPs = [
|
# allowedIPs = [
|
||||||
"10.0.0.4/24"
|
# "10.0.0.4/24"
|
||||||
"fdc9:281f:04d7:9ee9::4/128"
|
# "fdc9:281f:04d7:9ee9::4/128"
|
||||||
];
|
# ];
|
||||||
}
|
# }
|
||||||
];
|
# ];
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
time.timeZone = "Europe/Rome";
|
time.timeZone = "Europe/Rome";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{
|
{ pkgs, ... }: {
|
||||||
services = {
|
services = {
|
||||||
# ombi = { enable = true; openFirewall = true; group = "users"; };
|
# ombi = { enable = true; openFirewall = true; group = "users"; };
|
||||||
|
|
||||||
|
|
@ -36,6 +36,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
group = "users";
|
group = "users";
|
||||||
|
package = pkgs.transmission_3;
|
||||||
settings.download-dir = "/mnt/raid/condiviso/Torrent";
|
settings.download-dir = "/mnt/raid/condiviso/Torrent";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue