diff --git a/flake.nix b/flake.nix index af4845ae..0b658d39 100644 --- a/flake.nix +++ b/flake.nix @@ -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 diff --git a/nixos/common/desktop/home.nix b/nixos/common/desktop/home.nix index befc9265..fcd9e33e 100644 --- a/nixos/common/desktop/home.nix +++ b/nixos/common/desktop/home.nix @@ -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 diff --git a/nixos/hosts/hades/rtorrent/configuration.nix b/nixos/hosts/hades/rtorrent/configuration.nix index 1bc021e4..30cb7afd 100644 --- a/nixos/hosts/hades/rtorrent/configuration.nix +++ b/nixos/hosts/hades/rtorrent/configuration.nix @@ -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"; - persistentKeepalive = 25; - }]; + 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; + # } + ]; }; }; }