switch vpn
This commit is contained in:
parent
462663b498
commit
a715bf6664
4 changed files with 37 additions and 36 deletions
54
flake.lock
54
flake.lock
|
@ -687,11 +687,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700419052,
|
"lastModified": 1700847865,
|
||||||
"narHash": "sha256-U6a5f9ynbzcp8PMIHULbHPkbwp7YfPKOYmTcLqlalD4=",
|
"narHash": "sha256-uWaOIemGl9LF813MW0AEgCBpKwFo2t1Wv3BZc6e5Frw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "993fb02d20760067b8ee19c713d94cee07037759",
|
"rev": "8cedd63eede4c22deb192f1721dd67e7460e1ebe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -713,11 +713,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699973284,
|
"lastModified": 1700811440,
|
||||||
"narHash": "sha256-eqic6t1+yd3JXqByexLdZiuyLBzy9KSAOvDBet6yr5Q=",
|
"narHash": "sha256-wrJpW3JCJ9egZpYUMne4c3PFEp+vmkTj5VFpPAT4xdY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "lanzaboote",
|
"repo": "lanzaboote",
|
||||||
"rev": "2123d3a0e1ae16d0a9d1858464edfd34db653653",
|
"rev": "cbafc8f8fe388fba6f2c27224276f5f984f9ae47",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -898,11 +898,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700392353,
|
"lastModified": 1700559156,
|
||||||
"narHash": "sha256-KARn8aVJu5fdW0jdJYoOQ1SPqWlNdz4l7r90NbArWSY=",
|
"narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "2b00bc76dc893cd996a3d76a2f059d657a5ef37a",
|
"rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1089,11 +1089,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700419998,
|
"lastModified": 1700775652,
|
||||||
"narHash": "sha256-aXh4adx9x9RlRMSykzR+bY8AOVjcwMEJO1ZeQROwbcE=",
|
"narHash": "sha256-877vMwiT+6G1bHLBW0sv0yJo8SET/5E8da2xB4WZUm8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "12a0ade5e458984675b9789a4b260ebabdd2d1ab",
|
"rev": "f974988b730c68f9c19de534dd832985776d3044",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1104,11 +1104,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699781429,
|
"lastModified": 1700612854,
|
||||||
"narHash": "sha256-UYefjidASiLORAjIvVsUHG6WBtRhM67kTjEY4XfZOFs=",
|
"narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e44462d6021bfe23dfb24b775cc7c390844f773d",
|
"rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1184,11 +1184,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_stable": {
|
"nixpkgs_stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700403855,
|
"lastModified": 1700678569,
|
||||||
"narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=",
|
"narHash": "sha256-2Ki+2UvOidxEb3xB4ADqlbPQ2BZOF4uZMR094O8or2I=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0c5678df521e1407884205fe3ce3cf1d7df297db",
|
"rev": "8f1180704ac35baded1a74164365ac7cdfba6f38",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1205,11 +1205,11 @@
|
||||||
"pre-commit-hooks": "pre-commit-hooks"
|
"pre-commit-hooks": "pre-commit-hooks"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700392689,
|
"lastModified": 1700831612,
|
||||||
"narHash": "sha256-5eHyyjJjWOORscfN6byD4wuV6qH2g0kN+N3OP8MybL4=",
|
"narHash": "sha256-4rjt03g847UpPYshwItJqFqxHJ6l4aoXqDVT9CNOCu4=",
|
||||||
"owner": "pta2002",
|
"owner": "pta2002",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "c2ccb2dfabbac067193119cae4fd46d78acc03a2",
|
"rev": "bacdae2c508defccdff1af8511e4d639d26d3d47",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1220,11 +1220,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700482126,
|
"lastModified": 1700847898,
|
||||||
"narHash": "sha256-4zLW96revlLur8prOh1t+Ka4yIzWge+3B2Cgg89sOQk=",
|
"narHash": "sha256-TDZlLBNL6mNP0y+fQ0beDsnlRPRK/ziHWJ5e588kJCw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "5400c2b8e6cad21911ee8d7258319dbadac87879",
|
"rev": "6a73c040a4b9cf6c8c2a11dddd3d98e8f56a7b70",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1289,11 +1289,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_3"
|
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699271226,
|
"lastModified": 1700064067,
|
||||||
"narHash": "sha256-8Jt1KW3xTjolD6c6OjJm9USx/jmL+VVmbooADCkdDfU=",
|
"narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "ea758da1a6dcde6dc36db348ed690d09b9864128",
|
"rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -20,7 +20,6 @@ in {
|
||||||
|
|
||||||
vault-secrets.secrets.rtorrent = { services = [ "wg-quick-wg0" ]; };
|
vault-secrets.secrets.rtorrent = { services = [ "wg-quick-wg0" ]; };
|
||||||
|
|
||||||
# Mullvad VPN
|
|
||||||
networking.wg-quick.interfaces =
|
networking.wg-quick.interfaces =
|
||||||
let
|
let
|
||||||
postUpScript = pkgs.writeScriptBin "post_up" ''
|
postUpScript = pkgs.writeScriptBin "post_up" ''
|
||||||
|
@ -31,17 +30,19 @@ in {
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
wg0 = {
|
wg0 = {
|
||||||
address = [ "10.66.153.191/32" "fc00:bbbb:bbbb:bb01::3:99be/128" ];
|
address = [ "10.129.112.89/32, fd7d:76ee:e68f:a993:edd1:668b:49f7:b7c3/128" ];
|
||||||
dns = [ "10.64.0.1" ];
|
mtu = 1320;
|
||||||
|
dns = [ "10.128.0.1" "fd7d:76ee:e68f:a993::1" ];
|
||||||
privateKeyFile = "${vs.rtorrent}/wireguardKey";
|
privateKeyFile = "${vs.rtorrent}/wireguardKey";
|
||||||
postUp = "${postUpScript}/bin/post_up || true";
|
postUp = "${postUpScript}/bin/post_up || true";
|
||||||
|
|
||||||
peers = [
|
peers = [
|
||||||
{
|
{
|
||||||
publicKey = "HQHCrq4J6bSpdW1fI5hR/bvcrYa6HgGgwaa5ZY749ik=";
|
publicKey = "PyLCXAQT8KkM4T+dUsOQfn+Ub3pGxfGlxkIApuig+hk=";
|
||||||
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
||||||
endpoint = "185.213.155.73:51820";
|
endpoint = "europe3.vpn.airdns.org:1637";
|
||||||
# persistentKeepalive = 25;
|
presharedKeyFile = "${vs.rtorrent}/presharedKey";
|
||||||
|
persistentKeepalive = 15;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ config, lib, pkgs, ... }: {
|
{ config, pkgs, ... }: {
|
||||||
services.rtorrent = {
|
services.rtorrent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 54945; # Port Forwarded in mullvad
|
port = 14764; # port forwarded
|
||||||
downloadDir = "/mnt/storage/torrents/r";
|
downloadDir = "/mnt/storage/torrents/r";
|
||||||
package = pkgs.jesec-rtorrent;
|
package = pkgs.jesec-rtorrent;
|
||||||
configText =
|
configText =
|
||||||
|
|
|
@ -76,7 +76,7 @@ let
|
||||||
inherit tags;
|
inherit tags;
|
||||||
targetHost = ip;
|
targetHost = ip;
|
||||||
allowLocalDeployment = type == "local";
|
allowLocalDeployment = type == "local";
|
||||||
targetUser = null; # Defaults to $USER
|
targetUser = "victor"; # Defaults to $USER
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue