diff --git a/flake.lock b/flake.lock index cbcc073..a5b9e4b 100644 --- a/flake.lock +++ b/flake.lock @@ -323,35 +323,10 @@ "nixpkgs": "nixpkgs_4", "printerfacts": "printerfacts", "rhea": "rhea", - "snoo2nebby": "snoo2nebby", "utils": "utils_3", "waifud": "waifud" } }, - "snoo2nebby": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "utils": [ - "utils" - ] - }, - "locked": { - "lastModified": 1646790985, - "narHash": "sha256-Mt1hBO4CpTrpGD6Y0Vts2SdpiEZ3jygIdiijprhDeCg=", - "ref": "main", - "rev": "4b0416555b41ea370e905d99d24d8f13331331c7", - "revCount": 9, - "type": "git", - "url": "https://tulpa.dev/cadey/snoo2nebby.git" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://tulpa.dev/cadey/snoo2nebby.git" - } - }, "utils": { "locked": { "lastModified": 1648297722, diff --git a/flake.nix b/flake.nix index a8e3943..5025e6e 100644 --- a/flake.nix +++ b/flake.nix @@ -19,11 +19,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.utils.follows = "utils"; }; - snoo2nebby = { - url = "git+https://tulpa.dev/cadey/snoo2nebby.git?ref=main"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.utils.follows = "utils"; - }; rhea = { url = "github:Xe/rhea"; inputs.nixpkgs.follows = "nixpkgs"; @@ -36,7 +31,7 @@ }; outputs = { self, nixpkgs, deploy-rs, home-manager, agenix, printerfacts, mara - , snoo2nebby, rhea, waifud, ... }: + , rhea, waifud, ... }: let pkgs = nixpkgs.legacyPackages."x86_64-linux"; mkSystem = extraModules: @@ -58,7 +53,6 @@ printerfacts.nixosModules.${system}.printerfacts mara.nixosModules.${system}.bot - snoo2nebby.nixosModule.${system} rhea.nixosModule.${system} ] ++ extraModules; @@ -104,7 +98,7 @@ ]; # cloud - firgu = mkSystem [ ./hosts/firgu ]; + firgu = mkSystem [ ./hosts/firgu ./hardware/location/YYZ ]; # vms ## logos diff --git a/hardware/location/YYZ/default.nix b/hardware/location/YYZ/default.nix new file mode 100644 index 0000000..4e9eeca --- /dev/null +++ b/hardware/location/YYZ/default.nix @@ -0,0 +1,16 @@ +{ config, pkgs, ... }: + +{ + services.yggdrasil = { + enable = true; + persistentKeys = true; + openMulticastPort = true; + config = { + IfName = "yggdrasil0"; + Peers = [ + "tcp://kusoneko.moe:9002" + "tcp://yyz.yuetau.net:6642" + ]; + }; + }; +} diff --git a/hosts/firgu/default.nix b/hosts/firgu/default.nix index de11376..273875e 100644 --- a/hosts/firgu/default.nix +++ b/hosts/firgu/default.nix @@ -32,13 +32,6 @@ in { system.stateVersion = "20.09"; # Did you read the comment? - within.services.snoo2nebby.enable = true; - age.secrets.snoo2nebby = { - file = ./secret/snoo2nebby.age; - path = "/var/lib/snoo2nebby/whurl.txt"; - owner = "snoo2nebby"; - group = "snoo2nebby"; - }; within.users.enableSystem = true; boot.kernel.sysctl = { diff --git a/hosts/firgu/matrix.nix b/hosts/firgu/matrix.nix index 6312b45..a0da336 100644 --- a/hosts/firgu/matrix.nix +++ b/hosts/firgu/matrix.nix @@ -12,7 +12,7 @@ in { max_upload_size = "100M"; - enable_registration = true; + enable_registration = false; listeners = [ {