This commit is contained in:
Vivian 2023-06-05 10:20:08 +02:00
parent 6b1e3fefd8
commit c8ae35f293
3 changed files with 17 additions and 7 deletions

View file

@ -47,7 +47,7 @@
};
outputs = { self, nixpkgs, nixpkgs_22-11, vault-secrets, colmena
, nixos-generators, nur, ... }@inputs:
, nixos-generators, nur, attic, ... }@inputs:
let
inherit (nixpkgs) lib;
@ -125,6 +125,7 @@
devShells.${system}.default = pkgs.mkShell {
VAULT_ADDR = "http://vault.olympus:8200/";
buildInputs = with pkgs; [
attic.packages.${pkgs.system}.attic
apply-local
colmena.packages.${system}.colmena
cachix

View file

@ -15,6 +15,7 @@ in {
fusee-launcher
gcc
gimp
inputs.attic.packages.${pkgs.system}.attic
inputs.comma.packages.${pkgs.system}.default
inputs.webcord.packages.${pkgs.system}.default
kdenlive

View file

@ -34,12 +34,20 @@ in {
privateKeyFile = "${vs.rtorrent}/wireguardKey";
postUp = "${postUpScript}/bin/post_up || true";
peers = [{
publicKey = "DVui+5aifNFRIVDjH3v2y+dQ+uwI+HFZOd21ajbEpBo=";
allowedIPs = [ "0.0.0.0/0" "::/0" ];
endpoint = "185.65.134.82:51820";
peers = [
{
publicKey = "33BoONMGCm2vknq2eq72eozRsHmHQY6ZHEEZ4851TkY=";
allowedIPs = [ "0.0.0.0/0" "::/0"];
endpoint = "193.32.249.70:51820";
persistentKeepalive = 25;
}];
}
# {
# publicKey = "DVui+5aifNFRIVDjH3v2y+dQ+uwI+HFZOd21ajbEpBo=";
# allowedIPs = [ "0.0.0.0/0" "::/0" ];
# endpoint = "185.65.134.82:51820";
# persistentKeepalive = 25;
# }
];
};
};
}