summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2023-07-28 12:32:43 +0200
committerlassulus <git@lassul.us>2023-07-28 12:32:43 +0200
commitcbfcc890e3b76d942b927809bf981a5fa7289e6a (patch)
tree6886096a48089a6d80098650de41b64ff06f86c2
parent447a000e0426e7356d65661425299c2406980126 (diff)
l yellow.r: migrate to airvpn
-rw-r--r--lass/1systems/yellow/config.nix98
-rw-r--r--lass/2configs/zsh.nix12
2 files changed, 23 insertions, 87 deletions
diff --git a/lass/1systems/yellow/config.nix b/lass/1systems/yellow/config.nix
index fb28fb029..2da93b8fd 100644
--- a/lass/1systems/yellow/config.nix
+++ b/lass/1systems/yellow/config.nix
@@ -1,5 +1,6 @@
{ config, lib, pkgs, ... }: let
- vpnIp = "85.202.81.161";
+ vpnPort = 1637;
+ torrentport = 56709; # port forwarded in airvpn webinterface
in {
imports = [
<stockholm/lass>
@@ -18,99 +19,22 @@ in {
networking.useHostResolvConf = false;
networking.useNetworkd = true;
- services.openvpn.servers.nordvpn.config = ''
- client
- dev tun
- proto udp
- remote ${vpnIp} 1194
- resolv-retry infinite
- remote-random
- nobind
- tun-mtu 1500
- tun-mtu-extra 32
- mssfix 1450
- persist-key
- persist-tun
- ping 15
- ping-restart 15
- ping-timer-rem
- reneg-sec 0
- comp-lzo no
-
- remote-cert-tls server
-
- auth-user-pass ${toString <secrets/nordvpn.txt>}
- verb 3
- pull
- fast-io
- cipher AES-256-CBC
- auth SHA512
-
- <ca>
- -----BEGIN CERTIFICATE-----
- MIIFCjCCAvKgAwIBAgIBATANBgkqhkiG9w0BAQ0FADA5MQswCQYDVQQGEwJQQTEQ
- MA4GA1UEChMHTm9yZFZQTjEYMBYGA1UEAxMPTm9yZFZQTiBSb290IENBMB4XDTE2
- MDEwMTAwMDAwMFoXDTM1MTIzMTIzNTk1OVowOTELMAkGA1UEBhMCUEExEDAOBgNV
- BAoTB05vcmRWUE4xGDAWBgNVBAMTD05vcmRWUE4gUm9vdCBDQTCCAiIwDQYJKoZI
- hvcNAQEBBQADggIPADCCAgoCggIBAMkr/BYhyo0F2upsIMXwC6QvkZps3NN2/eQF
- kfQIS1gql0aejsKsEnmY0Kaon8uZCTXPsRH1gQNgg5D2gixdd1mJUvV3dE3y9FJr
- XMoDkXdCGBodvKJyU6lcfEVF6/UxHcbBguZK9UtRHS9eJYm3rpL/5huQMCppX7kU
- eQ8dpCwd3iKITqwd1ZudDqsWaU0vqzC2H55IyaZ/5/TnCk31Q1UP6BksbbuRcwOV
- skEDsm6YoWDnn/IIzGOYnFJRzQH5jTz3j1QBvRIuQuBuvUkfhx1FEwhwZigrcxXu
- MP+QgM54kezgziJUaZcOM2zF3lvrwMvXDMfNeIoJABv9ljw969xQ8czQCU5lMVmA
- 37ltv5Ec9U5hZuwk/9QO1Z+d/r6Jx0mlurS8gnCAKJgwa3kyZw6e4FZ8mYL4vpRR
- hPdvRTWCMJkeB4yBHyhxUmTRgJHm6YR3D6hcFAc9cQcTEl/I60tMdz33G6m0O42s
- Qt/+AR3YCY/RusWVBJB/qNS94EtNtj8iaebCQW1jHAhvGmFILVR9lzD0EzWKHkvy
- WEjmUVRgCDd6Ne3eFRNS73gdv/C3l5boYySeu4exkEYVxVRn8DhCxs0MnkMHWFK6
- MyzXCCn+JnWFDYPfDKHvpff/kLDobtPBf+Lbch5wQy9quY27xaj0XwLyjOltpiST
- LWae/Q4vAgMBAAGjHTAbMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqG
- SIb3DQEBDQUAA4ICAQC9fUL2sZPxIN2mD32VeNySTgZlCEdVmlq471o/bDMP4B8g
- nQesFRtXY2ZCjs50Jm73B2LViL9qlREmI6vE5IC8IsRBJSV4ce1WYxyXro5rmVg/
- k6a10rlsbK/eg//GHoJxDdXDOokLUSnxt7gk3QKpX6eCdh67p0PuWm/7WUJQxH2S
- DxsT9vB/iZriTIEe/ILoOQF0Aqp7AgNCcLcLAmbxXQkXYCCSB35Vp06u+eTWjG0/
- pyS5V14stGtw+fA0DJp5ZJV4eqJ5LqxMlYvEZ/qKTEdoCeaXv2QEmN6dVqjDoTAo
- k0t5u4YRXzEVCfXAC3ocplNdtCA72wjFJcSbfif4BSC8bDACTXtnPC7nD0VndZLp
- +RiNLeiENhk0oTC+UVdSc+n2nJOzkCK0vYu0Ads4JGIB7g8IB3z2t9ICmsWrgnhd
- NdcOe15BincrGA8avQ1cWXsfIKEjbrnEuEk9b5jel6NfHtPKoHc9mDpRdNPISeVa
- wDBM1mJChneHt59Nh8Gah74+TM1jBsw4fhJPvoc7Atcg740JErb904mZfkIEmojC
- VPhBHVQ9LHBAdM8qFI2kRK0IynOmAZhexlP/aT/kpEsEPyaZQlnBn3An1CRz8h0S
- PApL8PytggYKeQmRhl499+6jLxcZ2IegLfqq41dzIjwHwTMplg+1pKIOVojpWA==
- -----END CERTIFICATE-----
- </ca>
- key-direction 1
- <tls-auth>
- #
- # 2048 bit OpenVPN static key
- #
- -----BEGIN OpenVPN Static key V1-----
- e685bdaf659a25a200e2b9e39e51ff03
- 0fc72cf1ce07232bd8b2be5e6c670143
- f51e937e670eee09d4f2ea5a6e4e6996
- 5db852c275351b86fc4ca892d78ae002
- d6f70d029bd79c4d1c26cf14e9588033
- cf639f8a74809f29f72b9d58f9b8f5fe
- fc7938eade40e9fed6cb92184abb2cc1
- 0eb1a296df243b251df0643d53724cdb
- 5a92a1d6cb817804c4a9319b57d53be5
- 80815bcfcb2df55018cc83fc43bc7ff8
- 2d51f9b88364776ee9d12fc85cc7ea5b
- 9741c4f598c485316db066d52db4540e
- 212e1518a9bd4828219e24b20d88f598
- a196c9de96012090e333519ae18d3509
- 9427e7b372d348d352dc4c85e18cd4b9
- 3f8a56ddb2e64eb67adfc9b337157ff4
- -----END OpenVPN Static key V1-----
- </tls-auth>
- '';
+ networking.wg-quick.interfaces.airvpn.configFile = "/var/src/secrets/airvpn.conf";
+ services.transmission.settings.peer-port = torrentport;
+ # only allow traffic through openvpn
krebs.iptables = {
enable = true;
+ tables.filter.INPUT.rules = [
+ { predicate = "-i airvpn -p tcp --dport ${toString torrentport}"; target = "ACCEPT"; }
+ { predicate = "-i airvpn -p udp --dport ${toString torrentport}"; target = "ACCEPT"; }
+ ];
tables.filter.OUTPUT = {
policy = "DROP";
rules = [
{ predicate = "-o lo"; target = "ACCEPT"; }
- { v6 = false; predicate = "-d ${vpnIp}/32"; target = "ACCEPT"; }
- { predicate = "-o tun0"; target = "ACCEPT"; }
+ { predicate = "-p udp --dport ${toString vpnPort}"; target = "ACCEPT"; }
+ { predicate = "-o airvpn"; target = "ACCEPT"; }
{ predicate = "-o retiolum"; target = "ACCEPT"; }
{ v6 = false; predicate = "-d 1.1.1.1/32"; target = "ACCEPT"; }
{ v6 = false; predicate = "-d 1.0.0.1/32"; target = "ACCEPT"; }
diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix
index a7b0c372c..f77aa258b 100644
--- a/lass/2configs/zsh.nix
+++ b/lass/2configs/zsh.nix
@@ -51,6 +51,18 @@
#enable automatic rehashing of $PATH
zstyle ':completion:*' rehash true
+ # fancy mv which interactively gets the second argument if not given
+ function mv() {
+ if [[ "$#" -ne 1 ]] || [[ ! -e "$1" ]]; then
+ command mv -v "$@"
+ return
+ fi
+
+ newfilename="$1"
+ vared newfilename
+ command mv -v -- "$1" "$newfilename"
+ }
+
#beautiful colors
eval $(dircolors -b ${pkgs.fetchFromGitHub {
owner = "trapd00r";