From 1afb6c09898e5cd837fdfc9ed7996eeca7ebd13b Mon Sep 17 00:00:00 2001 From: Maxiem Geldhof Date: Fri, 31 Oct 2025 19:35:04 +0100 Subject: [PATCH] Add mullvad --- keys/mullvad | 9 +++++++++ keys/secrets.nix | 1 + modules/servermodules/arr/arr.nix | 11 +++-------- systems/ren/system.nix | 1 + 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 keys/mullvad diff --git a/keys/mullvad b/keys/mullvad new file mode 100644 index 0000000..2518a52 --- /dev/null +++ b/keys/mullvad @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 CJLJQg XUBaAf9KX0Ult6W3R7XuQ98NWj+5B2s+p5trfPXruB8 +AWyu3fmSxkRnmXwJLuu90sTaZ6rFSeeCwgpbEWm4bx8 +-> ssh-ed25519 pvX1bw hmRs8NMgtjMTHofPgS34bdFWnFFXGC9PnOcbSamNAR8 +k+LnfbyRTarH4ZIlrqQdhmMeK1+KZBLT5gkFnTBDWs4 +-> ssh-ed25519 M7OTMg 1USWDfFjCtxQIAilMUknDi9KM4g3WXOQVDP0Vu1O3QM +8wWkeDNFNcX1yGieJQa0SjTRx4dx3rdUILNVUJuNFG8 +--- WcMtQ7HqULtJgzGesYnHfmMA4XfuQrhFIriEoJzAwY8 +⪟$Db-osc,1˖tٝ@-KjV(wёð_ɇq\"2ؾ7PIsFg/U7A`m4v"023d]'/J(WX|SsI ؇W5 \ No newline at end of file diff --git a/keys/secrets.nix b/keys/secrets.nix index c10637d..48e931b 100644 --- a/keys/secrets.nix +++ b/keys/secrets.nix @@ -14,4 +14,5 @@ in "hetzner.priv".publicKeys = macbook ++ selene ++ master ++ ren; "wg-ren.priv".publicKeys = macbook++master++ren; "ren.priv".publicKeys = master ++ ren; + "mullvad".publicKeys = master ++ ren ++ macbook; } \ No newline at end of file diff --git a/modules/servermodules/arr/arr.nix b/modules/servermodules/arr/arr.nix index c6bff65..88a1804 100644 --- a/modules/servermodules/arr/arr.nix +++ b/modules/servermodules/arr/arr.nix @@ -1,11 +1,6 @@ { - fileSystems."/mnt/volume-hel1-2" = { - device = "/dev/disk/by-id/scsi-0HC_Volume_103422022"; - fsType = "ext4"; - options = [ - "defaults" - "discard" - "nofail" - ]; + age.secrets.mullvad = { + file = ../../../keys/mullvad; + path = "/etc/wireguard/mullvad.conf"; }; } diff --git a/systems/ren/system.nix b/systems/ren/system.nix index 77af17a..428bddb 100644 --- a/systems/ren/system.nix +++ b/systems/ren/system.nix @@ -35,5 +35,6 @@ nixpkgs.lib.nixosSystem { agenix.nixosModules.default ./volumes.nix (import ./wireguard.nix).systemModule + ../../modules/servermodules/arr/arr.nix ]; }