From c5f644a26a76ceebe7d59970b598217b6d242dc3 Mon Sep 17 00:00:00 2001 From: Ashelyn Rose Date: Sun, 17 Sep 2023 11:04:59 -0600 Subject: [PATCH] Add config to test Seance --- flake.lock | 161 ++++++++++++++++++++++++++--------- flake.nix | 5 +- hosts/nyx/include/seance.nix | 20 +++++ 3 files changed, 147 insertions(+), 39 deletions(-) create mode 100644 hosts/nyx/include/seance.nix diff --git a/flake.lock b/flake.lock index 92474b5..0e51026 100644 --- a/flake.lock +++ b/flake.lock @@ -84,7 +84,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1679567394, @@ -146,6 +146,21 @@ } }, "nix-filter_4": { + "locked": { + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_5": { "locked": { "lastModified": 1681154353, "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", @@ -160,7 +175,7 @@ "type": "github" } }, - "nix-filter_5": { + "nix-filter_6": { "locked": { "lastModified": 1681154353, "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", @@ -175,7 +190,7 @@ "type": "github" } }, - "nix-filter_6": { + "nix-filter_7": { "locked": { "lastModified": 1681154353, "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", @@ -207,6 +222,20 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1684759798, + "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c7eb65213bd7d95eafb8c5e2e181f04da103d054", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1684759798, "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=", @@ -288,11 +317,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1687026603, - "narHash": "sha256-4uVirBZbSgpVtkoRXD4IxTe9UXRcIKhxT4CUK+3Bby8=", + "lastModified": 1694928810, + "narHash": "sha256-M/3+pRQmM+FeBeSKRp0b01pncbNiiC2ggJE4Wpi7c1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bbce166d72307eda55c9a62b9d70e1f42d887ec8", + "rev": "948e8754755a9f27587d5bd109af2cfad313add8", "type": "github" }, "original": { @@ -304,11 +333,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1686979235, - "narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=", + "lastModified": 1687026603, + "narHash": "sha256-4uVirBZbSgpVtkoRXD4IxTe9UXRcIKhxT4CUK+3Bby8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7cc30fd5372ddafb3373c318507d9932bd74aafe", + "rev": "bbce166d72307eda55c9a62b9d70e1f42d887ec8", "type": "github" }, "original": { @@ -320,11 +349,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1685005470, - "narHash": "sha256-Nw+4uivzCwyZcEB71YH58zYk4N5UgcNeqb+D52bjlhI=", + "lastModified": 1686979235, + "narHash": "sha256-gBlBtk+KrezFkfMrZw6uwTuA7YWtbFciiS14mEoTCo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60a2bc32e7369caf2f009f701ca98a8622abfdb3", + "rev": "7cc30fd5372ddafb3373c318507d9932bd74aafe", "type": "github" }, "original": { @@ -336,16 +365,18 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1684759798, - "narHash": "sha256-Kpbf5yKvKcj/yPqE1zYC6gju4JwTsYxTIZEvOII0jr4=", + "lastModified": 1685005470, + "narHash": "sha256-Nw+4uivzCwyZcEB71YH58zYk4N5UgcNeqb+D52bjlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7eb65213bd7d95eafb8c5e2e181f04da103d054", + "rev": "60a2bc32e7369caf2f009f701ca98a8622abfdb3", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" } }, "private": { @@ -354,11 +385,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1694552009, - "narHash": "sha256-j9D+zQBZ8GPP5udeEIX04XOrYduGg4smBfQOy02AF7o=", + "lastModified": 1694970110, + "narHash": "sha256-k/AA4qK1H7m8Lwal6W1sY2+7iyjg6p7BJOctKtbD4O0=", "ref": "refs/heads/main", - "rev": "6175184982d8ef71e2147cc53bc58f415e33c4ff", - "revCount": 11, + "rev": "86361e2fc09e0c288b212100008bd07434bd539a", + "revCount": 12, "type": "git", "url": "ssh://git@git.tempest.dev/ashe/nixos-config-private" }, @@ -375,12 +406,33 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs_4", "private": "private", + "seance": "seance", "tempest-contact": "tempest-contact", "tempest-secret": "tempest-secret", "tempestdev": "tempestdev", "tmpfiles": "tmpfiles" } }, + "seance": { + "inputs": { + "nix-filter": "nix-filter_4", + "nixpkgs": "nixpkgs_6", + "utils": "utils_6" + }, + "locked": { + "lastModified": 1694937094, + "narHash": "sha256-6Ce7Q7V+eo92eUPEMeQ+2dWGdqDtlXxCLiEYT4fp80U=", + "ref": "refs/heads/nix", + "rev": "4ff992755fe5b4cfabad83f373cc1e4e912f5de6", + "revCount": 80, + "type": "git", + "url": "ssh://git@git.tempest.dev/ashe/seance" + }, + "original": { + "type": "git", + "url": "ssh://git@git.tempest.dev/ashe/seance" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -396,6 +448,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -518,9 +585,9 @@ }, "tempest-contact": { "inputs": { - "nix-filter": "nix-filter_4", - "nixpkgs": "nixpkgs_6", - "utils": "utils_6" + "nix-filter": "nix-filter_5", + "nixpkgs": "nixpkgs_7", + "utils": "utils_7" }, "locked": { "lastModified": 1687029231, @@ -538,9 +605,9 @@ }, "tempest-secret": { "inputs": { - "nix-filter": "nix-filter_5", - "nixpkgs": "nixpkgs_7", - "utils": "utils_7" + "nix-filter": "nix-filter_6", + "nixpkgs": "nixpkgs_8", + "utils": "utils_8" }, "locked": { "lastModified": 1685398072, @@ -558,9 +625,9 @@ }, "tempestdev": { "inputs": { - "nix-filter": "nix-filter_6", - "nixpkgs": "nixpkgs_8", - "utils": "utils_8" + "nix-filter": "nix-filter_7", + "nixpkgs": "nixpkgs_9", + "utils": "utils_9" }, "locked": { "lastModified": 1692434292, @@ -579,8 +646,8 @@ "tmpfiles": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_10", - "utils": "utils_9" + "nixpkgs": "nixpkgs_11", + "utils": "utils_10" }, "locked": { "lastModified": 1684903753, @@ -614,6 +681,24 @@ "type": "github" } }, + "utils_10": { + "inputs": { + "systems": "systems_10" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "utils_2": { "inputs": { "systems": "systems_2" @@ -691,11 +776,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -727,11 +812,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 233ef0c..dccc4f2 100644 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,10 @@ gotosocial.url = "git+http://git.tempest.dev/ashe/nixos-wrapper-gotosocial"; ashen-earth.url = "git+ssh://git@git.tempest.dev/ashe/ashen-earth"; drowning.url = "git+http://git.tempest.dev/ashe/drowning-among-stars"; + seance.url = "git+ssh://git@git.tempest.dev/ashe/seance"; }; - outputs = { self, nixpkgs, home-manager, private, tmpfiles, tempestdev, tempest-secret, tempest-contact, gotosocial, ashen-earth, drowning }: { + outputs = { self, nixpkgs, home-manager, private, tmpfiles, tempestdev, tempest-secret, tempest-contact, gotosocial, ashen-earth, drowning, seance }: { nixosConfigurations = { nyx = nixpkgs.lib.nixosSystem { @@ -30,11 +31,13 @@ tempest-contact.nixosModule gotosocial.nixosModule drowning.nixosModule + seance.nixosModule ./hosts/nyx/include/acme.nix ./hosts/nyx/include/nginx.nix ./hosts/nyx/include/services.nix ./hosts/nyx/include/proxy.nix + ./hosts/nyx/include/seance.nix ]; }; diff --git a/hosts/nyx/include/seance.nix b/hosts/nyx/include/seance.nix new file mode 100644 index 0000000..00a8ac7 --- /dev/null +++ b/hosts/nyx/include/seance.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ...}: { + config.services.seance = { + enable = true; + + systems.ashe = { + referenceUserID = "193109872240361472"; + peerPattern = "[a-zA-Z](#|,|:-) ?.*"; + autoproxyLatchScope = "global"; + autoproxyLatchTimeout = 900; + autoproxyLatchStartEnabled = true; + defaultPresence = "latch"; + forwardPings = true; + + members.test = { + messagePattern = "[tT](#|,|:-) ?(?P.*)"; + commandPrefix = "t"; + }; + }; + }; +}