From ddeaf0170d4ced0276de0d29a9be1479da3077a6 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:56:42 +0200 Subject: [PATCH] update --- flake.nix | 5 ---- hosts/server/modules/jackflix/default.nix | 25 ++----------------- .../server/modules/jackflix/transmission.nix | 1 - hosts/server/secrets/default.nix | 2 +- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/flake.nix b/flake.nix index b3a981c..455fea3 100644 --- a/flake.nix +++ b/flake.nix @@ -30,10 +30,6 @@ inputs.hyprland.follows = "hyprland"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - vpnconfinement = { - url = "github:Maroka-chan/VPN-Confinement"; - follows = "nixpkgs"; - }; }; outputs = inputs@{ nixpkgs, ... }: { @@ -55,7 +51,6 @@ { _module.args = { inherit inputs; }; } inputs.sops-nix.nixosModules.sops inputs.home-manager.nixosModules.home-manager - inputs.vpnconfinement.nixosModules.default ./hosts/server/configuration.nix ]; }; diff --git a/hosts/server/modules/jackflix/default.nix b/hosts/server/modules/jackflix/default.nix index b27eed6..e2a9689 100644 --- a/hosts/server/modules/jackflix/default.nix +++ b/hosts/server/modules/jackflix/default.nix @@ -71,30 +71,9 @@ in { user = "nixarr"; group = "nixarr"; openFirewall = true; - settings = { - "rpc-bind-address" = "192.168.15.1"; # Bind RPC/WebUI to bridge address - }; }; }; - # Define VPN network namespace - vpnnamespaces.wg = { - enable = true; - wireguardConfigFile = "/data/.secret/wg.conf"; - accessibleFrom = [ "192.168.1.0/24" ]; - portMappings = [{ - from = 9091; - to = 9091; - }]; - openVPNPorts = [{ - port = 60729; - protocol = "both"; - }]; - }; - - # Add systemd service to VPN network namespace. - systemd.services.transmission.vpnconfinement = { - enable = true; - vpnnamespace = "wg"; - }; + # Transmission port + networking.firewall.allowedTCPPorts = [ 9091 ]; } diff --git a/hosts/server/modules/jackflix/transmission.nix b/hosts/server/modules/jackflix/transmission.nix index f71521e..b1738a4 100644 --- a/hosts/server/modules/jackflix/transmission.nix +++ b/hosts/server/modules/jackflix/transmission.nix @@ -18,5 +18,4 @@ # ''; # }; - networking.firewall.allowedTCPPorts = [ 9091 ]; } diff --git a/hosts/server/secrets/default.nix b/hosts/server/secrets/default.nix index 66be226..1a3c2bd 100644 --- a/hosts/server/secrets/default.nix +++ b/hosts/server/secrets/default.nix @@ -27,7 +27,7 @@ }; transmission-script = { mode = "0755"; - path = "/home/jackflix/transmission-script.sh"; + path = "/data/transmission-script.sh"; }; pia-wg = { mode = "0755";