From 3d088d73be201edd8ccc36d5f7b24c1a846e67f8 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Tue, 3 Jan 2023 22:45:41 +0100 Subject: [PATCH] tsuki: add maunium stickerpickers --- flake.nix | 5 ++ .../services/matrix/maunium-stickerpicker.nix | 52 +++++++++++++++++++ hosts/tsuki/services/nginx/default.nix | 42 +++------------ 3 files changed, 65 insertions(+), 34 deletions(-) create mode 100644 hosts/tsuki/services/matrix/maunium-stickerpicker.nix diff --git a/flake.nix b/flake.nix index dd33017..7ca7b40 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + maunium-stickerpicker = { + url = "git+file:///home/h7x4/git/maunium-stickerpicker-nix"; + }; + vscode-server = { url = "github:msteen/nixos-vscode-server"; flake = false; @@ -61,6 +65,7 @@ vscode-server, secrets, fonts, + maunium-stickerpicker, dotfiles, website }: let diff --git a/hosts/tsuki/services/matrix/maunium-stickerpicker.nix b/hosts/tsuki/services/matrix/maunium-stickerpicker.nix new file mode 100644 index 0000000..eb86731 --- /dev/null +++ b/hosts/tsuki/services/matrix/maunium-stickerpicker.nix @@ -0,0 +1,52 @@ +# This is imported directly by the nginx config +{ lib, maunium-stickerpicker }: let + inherit (maunium-stickerpicker.outputs) createStickerPickerWithStickers; + inherit (maunium-stickerpicker.outputs.fetchers) fetchFromChatStickers; +in { + stickers-h7x4 = createStickerPickerWithStickers { + homeserver = "https://matrix.nani.wtf"; + userId = "@stickerbot1:nani.wtf"; + accessToken = "syt_c3RpY2tlcmJvdDE_KMDwLEdAdPswTXPhCoeN_3FSt8B"; + packs = [ + { + title = "Dogboy"; + sha256 = "RTyxgVzwUPSyPLeiFp7bQ4X5DgEaHB/+dPPPc5w2Cfw="; + src = fetchFromChatStickers { + name = "dog-cat-dogboy-side-1"; + sha256 = "PNqTMxm7iUFxObkAZURHxMxBMmUerugoRTA4IsO1aJ8="; + }; + } + { + title = "Frown Cat 2"; + sha256 = "pNFtjoxSRLDsL9UxwX/crRcx6qHNKmXhhYU7+ygEJHE="; + src = fetchFromChatStickers { + name = "frown-cat-vol-2-1"; + sha256 = "E2n9PfL8pxIalam7+89emqCfKsoa/emNiBS93b0q9Ro="; + }; + } + ]; + }; + stickers-pingu = createStickerPickerWithStickers { + homeserver = "https://matrix.nani.wtf"; + userId = "@stickerbot1:nani.wtf"; + accessToken = "syt_c3RpY2tlcmJvdDE_KMDwLEdAdPswTXPhCoeN_3FSt8B"; + packs = [ + { + title = "Catgirl"; + sha256 = "UBU1cNYDnhPjStHGVNcTa8MpLeYHr1qn7Ea1jmB1hJ0="; + src = fetchFromChatStickers { + name = "dog-cat-catgirl-side-1"; + sha256 = "HNU49j9ju+UH8AiN0/sQIMgTNfNuZ/Xbpli2yisighg="; + }; + } + { + title = "Frown Cat 1"; + sha256 = "uJ6O7fDLBS/I9EiU1oIieDzbyrr9IPbaWF5pGDmwYZo="; + src = fetchFromChatStickers { + name = "frown-cat-1"; + sha256 = "rapDLBSWvxrvbp4E4/zzUM0IU6OALdAk1jA/1PP3LhY="; + }; + } + ]; + }; +} diff --git a/hosts/tsuki/services/nginx/default.nix b/hosts/tsuki/services/nginx/default.nix index 1052310..007ebe3 100644 --- a/hosts/tsuki/services/nginx/default.nix +++ b/hosts/tsuki/services/nginx/default.nix @@ -62,7 +62,7 @@ subdomains: url: extraSettings: host subdomains (recursiveUpdate { locations."/".proxyPass = url; } extraSettings); - in (listToAttrs [ + in (listToAttrs ([ { name = "nani.wtf"; value = { @@ -113,40 +113,14 @@ }) # (host ["vpn"] "" {}) (proxy ["hydra"] "http://localhost:${s ports.hydra}" {}) - (proxy ["air"] "https://${ips.kansei}:${s ports.kansei}" {}) - - # (proxy ["sync" "drive"] "" {}) - # (proxy ["music" "mpd"] "" {}) - ]) // { - # Disabled for time being - # ${config.services.jitsi-meet.hostName} = { - # enableACME = true; - # forceSSL = true; - # }; + ] ++ (let + stickerpickers = pkgs.callPackage ../matrix/maunium-stickerpicker.nix { + inherit (inputs) maunium-stickerpicker; }; - - upstreams = {}; - - streamConfig = '' - upstream minecraft { - server ${ips.crafty}:${s ports.minecraft}; - } - - server { - listen 0.0.0.0:${s ports.minecraft}; - listen [::0]:${s ports.minecraft}; - proxy_pass minecraft; - } - ''; - # upstream openvpn { - # server localhost:${s ports.openvpn}; - # } - - # server { - # listen 0.0.0.0:${s ports.openvpn}; - # listen [::0]:${s ports.openvpn}; - # proxy_pass openvpn; - # } + in [ + (host ["stickers-pingu"] { root = "${stickerpickers.stickers-pingu}/"; }) + (host ["stickers-h7x4"] { root = "${stickerpickers.stickers-h7x4}/"; }) + ]))); }; networking.firewall.allowedTCPPorts = [