From 5e8821dd77be3e5b2e566cbf1c17db6fb092b167 Mon Sep 17 00:00:00 2001 From: Xe Date: Wed, 16 Mar 2022 14:20:45 -0400 Subject: [PATCH] update nixos Signed-off-by: Xe --- flake.lock | 55 +++++++++++++++-------------- flake.nix | 20 +++++------ hosts/firgu/matrix.nix | 78 ++++++++++++++++++++++-------------------- 3 files changed, 79 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 4d81ef8..38b5d97 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1646105662, - "narHash": "sha256-jdXCZbGZL0SWWi29GnAOFHUh/QvvP0IyaVLv1ZTDkBI=", + "lastModified": 1646845404, + "narHash": "sha256-JENXFCI2HVqi0whBzt7MAW9PX3ziEaYqBhMux+4g+VM=", "owner": "ryantm", "repo": "agenix", - "rev": "297cd58b418249240b9f1f155d52b1b17f292884", + "rev": "764c975e74bce2f89a5106b68ec48e2b586f893c", "type": "github" }, "original": { @@ -59,11 +59,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1645970334, - "narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=", + "lastModified": 1647210221, + "narHash": "sha256-mUWwEq+ReRQjIqj28ClqmBDyKV4fr6C5ufqlXLzZFsk=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25", + "rev": "8eb7c009f09f1f7b1ec151e5d537104acf42213a", "type": "github" }, "original": { @@ -161,15 +161,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1618628710, - "narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=", - "path": "/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source", - "rev": "7919518f0235106d050c77837df5e338fb94de5d", - "type": "path" + "lastModified": 1638587357, + "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e34c5379866833f41e2a36f309912fa675d687c7", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-21.11", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { @@ -190,11 +193,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1645937171, - "narHash": "sha256-n9f9GZBNMe8UMhcgmmaXNObkH01jjgp7INMrUgBgcy4=", + "lastModified": 1647350163, + "narHash": "sha256-OcMI+PFEHTONthXuEQNddt16Ml7qGvanL3x8QOl2Aao=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "22dc22f8cedc58fcb11afe1acb08e9999e78be9c", + "rev": "3eb07eeafb52bcbf02ce800f032f18d666a9498d", "type": "github" }, "original": { @@ -204,11 +207,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1645433236, - "narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", + "lastModified": 1647297614, + "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", + "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58", "type": "github" }, "original": { @@ -335,11 +338,11 @@ ] }, "locked": { - "lastModified": 1645307663, - "narHash": "sha256-96cDS0TaDJf4eklu1RJ+CBWei0yRnVUGXh6AOf+mBRE=", + "lastModified": 1646790985, + "narHash": "sha256-Mt1hBO4CpTrpGD6Y0Vts2SdpiEZ3jygIdiijprhDeCg=", "ref": "main", - "rev": "e8aa792abd6de941ff473a49bc39134d042050e8", - "revCount": 6, + "rev": "4b0416555b41ea370e905d99d24d8f13331331c7", + "revCount": 9, "type": "git", "url": "https://tulpa.dev/cadey/snoo2nebby.git" }, @@ -405,11 +408,11 @@ ] }, "locked": { - "lastModified": 1645888800, - "narHash": "sha256-p7s9CPWypDPZ6t6FVTeSzeK006nhrkGcHx9kLUnohwk=", + "lastModified": 1646425650, + "narHash": "sha256-Vn5PKtG6l+tjGmDfAsdyxdqv1QSLFt42Ousd3/FREGg=", "owner": "Xe", "repo": "waifud", - "rev": "db1aa3b5cd9df617e76bd89342f22a18a1fdf4d9", + "rev": "58690168f6ec65d704b1d64e8dad89b91d98d780", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9dc651a..905d849 100644 --- a/flake.nix +++ b/flake.nix @@ -124,17 +124,17 @@ }; }; - deploy.nodes.hugo = { - hostname = "10.77.129.6"; - sshUser = "root"; - fastConnection = true; + # deploy.nodes.hugo = { + # hostname = "10.77.129.6"; + # sshUser = "root"; + # fastConnection = true; - profiles.system = { - user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos - self.nixosConfigurations.hugo; - }; - }; + # profiles.system = { + # user = "root"; + # path = deploy-rs.lib.x86_64-linux.activate.nixos + # self.nixosConfigurations.hugo; + # }; + # }; # This is highly advised, and will prevent many possible mistakes checks = builtins.mapAttrs diff --git a/hosts/firgu/matrix.nix b/hosts/firgu/matrix.nix index 531d5a2..6312b45 100644 --- a/hosts/firgu/matrix.nix +++ b/hosts/firgu/matrix.nix @@ -4,49 +4,51 @@ let extraLegoFlags = [ "--dns.resolvers=8.8.8.8:53" ]; in { services.matrix-synapse = { enable = true; - server_name = "within.website"; + settings = { + server_name = "within.website"; - enable_metrics = true; - url_preview_enabled = true; + enable_metrics = true; + url_preview_enabled = true; - max_upload_size = "100M"; + max_upload_size = "100M"; - enable_registration = true; + enable_registration = true; - listeners = [ - { - bind_address = "127.0.0.1"; - port = 8448; - type = "http"; - tls = false; - x_forwarded = true; - resources = [{ - compress = false; - names = [ "client" "federation" ]; - }]; - } - { - bind_address = "100.77.196.9"; - port = 8448; - type = "http"; - tls = false; - resources = [{ - compress = false; - names = [ "client" "federation" ]; - }]; - } - { - bind_address = "100.77.196.9"; - port = 9000; - type = "metrics"; - tls = false; - resources = [ ]; - } - ]; + listeners = [ + { + bind_addresses = [ "127.0.0.1" "::1" ]; + port = 8448; + type = "http"; + tls = false; + x_forwarded = true; + resources = [{ + compress = false; + names = [ "client" "federation" ]; + }]; + } + { + bind_addresses = [ "100.77.196.9" ]; + port = 8448; + type = "http"; + tls = false; + resources = [{ + compress = false; + names = [ "client" "federation" ]; + }]; + } + { + bind_addresses = [ "100.77.196.9" ]; + port = 9000; + type = "metrics"; + tls = false; + resources = [ ]; + } + ]; - extraConfig = '' - registration_requires_token: true - ''; + extraConfig = '' + registration_requires_token: true + ''; + }; }; services.nginx.virtualHosts = {