diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index d0ed9a8..80c203f 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -6,13 +6,10 @@ { age.secrets = { - thor_wg_priv = { - file = ../../secrets/thor_wg_priv.age; - }; - ntfy-thor = { - file = ../../secrets/ntfy-thor.age; - owner = "bertof"; - }; + # thor_wg_priv = { + # file = ../../secrets/thor_wg_priv.age; + # }; + ntfy-thor = { file = ../../secrets/ntfy-thor.age; owner = "bertof"; }; }; boot = { @@ -121,61 +118,61 @@ firewall.enable = false; - wg-quick.interfaces = { - wg0 = { - autostart = false; - address = [ - "10.0.0.4/24" - "fdc9:281f:04d7:9ee9::4/64" - ]; - dns = [ - "10.0.0.1" - "fdc9:281f:04d7:9ee9::1" - ]; - privateKeyFile = config.age.secrets.thor_wg_priv.path; - - peers = [ - { - # baldur - # allowedIPs = [ "10.0.0.3/32" "fdc9:281f:04d7:9ee9::3/128" ]; - allowedIPs = [ - "0.0.0.0/0" - "::/0" - ]; - endpoint = "baldur.bertof.net:51820"; - presharedKeyFile = config.age.secrets.wg_psk.path; - publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc="; - } - { - # odin - publicKey = "LDBhvzeYmHJ0z5ch+N559GWjT3It1gZvGR/9WtCfURw="; - presharedKeyFile = config.age.secrets.wg_psk.path; - allowedIPs = [ - "10.0.0.2/24" - "fdc9:281f:04d7:9ee9::2/128" - ]; - } - { - # oppo - publicKey = "OBk6bHKuIYLwD7cwjmAuMn57jXqbDwCL52jhQxiHnnA="; - presharedKeyFile = config.age.secrets.wg_psk.path; - allowedIPs = [ - "10.0.0.3/24" - "fdc9:281f:04d7:9ee9::3/128" - ]; - } - { - # thor - publicKey = "rpwR6n4IE96VZAmQDBufsWE/a9G7d8fpkvY1OwsbOhk="; - presharedKeyFile = config.age.secrets.wg_psk.path; - allowedIPs = [ - "10.0.0.4/24" - "fdc9:281f:04d7:9ee9::4/128" - ]; - } - ]; - }; - }; + # wg-quick.interfaces = { + # wg0 = { + # autostart = false; + # address = [ + # "10.0.0.4/24" + # "fdc9:281f:04d7:9ee9::4/64" + # ]; + # dns = [ + # "10.0.0.1" + # "fdc9:281f:04d7:9ee9::1" + # ]; + # privateKeyFile = config.age.secrets.thor_wg_priv.path; + # + # peers = [ + # { + # # baldur + # # allowedIPs = [ "10.0.0.3/32" "fdc9:281f:04d7:9ee9::3/128" ]; + # allowedIPs = [ + # "0.0.0.0/0" + # "::/0" + # ]; + # endpoint = "baldur.bertof.net:51820"; + # presharedKeyFile = config.age.secrets.wg_psk.path; + # publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc="; + # } + # { + # # odin + # publicKey = "LDBhvzeYmHJ0z5ch+N559GWjT3It1gZvGR/9WtCfURw="; + # presharedKeyFile = config.age.secrets.wg_psk.path; + # allowedIPs = [ + # "10.0.0.2/24" + # "fdc9:281f:04d7:9ee9::2/128" + # ]; + # } + # { + # # oppo + # publicKey = "OBk6bHKuIYLwD7cwjmAuMn57jXqbDwCL52jhQxiHnnA="; + # presharedKeyFile = config.age.secrets.wg_psk.path; + # allowedIPs = [ + # "10.0.0.3/24" + # "fdc9:281f:04d7:9ee9::3/128" + # ]; + # } + # { + # # thor + # publicKey = "rpwR6n4IE96VZAmQDBufsWE/a9G7d8fpkvY1OwsbOhk="; + # presharedKeyFile = config.age.secrets.wg_psk.path; + # allowedIPs = [ + # "10.0.0.4/24" + # "fdc9:281f:04d7:9ee9::4/128" + # ]; + # } + # ]; + # }; + # }; }; time.timeZone = "Europe/Rome"; diff --git a/modules/nixos/torrentbox.nix b/modules/nixos/torrentbox.nix index de24b9b..d3e7d72 100644 --- a/modules/nixos/torrentbox.nix +++ b/modules/nixos/torrentbox.nix @@ -1,4 +1,4 @@ -{ +{ pkgs, ... }: { services = { # ombi = { enable = true; openFirewall = true; group = "users"; }; @@ -36,6 +36,7 @@ enable = true; openFirewall = true; group = "users"; + package = pkgs.transmission_3; settings.download-dir = "/mnt/raid/condiviso/Torrent"; }; };