muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2025-12-06 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge

Browse source
This commit is contained in:
muon 2024-08-27 22:18:31 +00:00
parent 7b47eb5d1b
commit 8cd38b29a3
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/nixos/core/network.nix
View file

@ -33,26 +33,15 @@
privateKeyFile = "/home/muon/wireguard-keys/private"; privateKeyFile = "/home/muon/wireguard-keys/private";
<<<<<<< HEAD
peers = [ peers = [
{ {
publicKey = "2RF8GmTZwQdzVm2l2piYy6U0qiMU3wSxC7Lt8urAjwA="; publicKey = "2RF8GmTZwQdzVm2l2piYy6U0qiMU3wSxC7Lt8urAjwA=";
allowedIPs = [ "0.0.0.0/0" ]; allowedIPs = [ "0.0.0.0/0" ];
endpoint = "{server ip}:51820"; endpoint = "93.95.230.11:51820";
persistentKeepalive = 25; persistentKeepalive = 25;
} }
]; ];
======= };
peers = [
{
publicKey = "2RF8GmTZwQdzVm2l2piYy6U0qiMU3wSxC7Lt8urAjwA=";
allowedIPs = [ "0.0.0.0/0" ];
endpoint = "93.95.230.11:51820";
persistentKeepalive = 25;
}
];
};
>>>>>>> 72a6e123de1f980f2e2e2bc6dbbf666b396660eb
}; };
}; };