From d1b10def28ede3d47d172e0891b997273407717e Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Sat, 15 Nov 2025 17:47:00 +0100 Subject: [PATCH] move disqalculate file to corect owner and group --- hosts/nuos/configuration.nix | 34 +++++++++++++++++++------------ packages/default.nix | 1 + packages/stoat-server/default.nix | 30 +++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 packages/stoat-server/default.nix diff --git a/hosts/nuos/configuration.nix b/hosts/nuos/configuration.nix index 3288998..6c7f577 100644 --- a/hosts/nuos/configuration.nix +++ b/hosts/nuos/configuration.nix @@ -309,19 +309,27 @@ age = { identityPaths = [ "${config.users.users.noa.home}/.ssh/id_ed25519" ]; - secrets = { - "secrets/token-flurry".file = ../../secrets/github/flurry.age; - "secrets/token-anstml".file = ../../secrets/github/anstml.age; - "secrets/token-nixconf".file = ../../secrets/github/nixconf.age; - "discord/disqalculate".file = ../../secrets/discord/disqalculate.age; - "factorio/solrunners".file = ../../secrets/factorio/solrunners.age; - "authentik/env".file = ../../secrets/authentik/env.age; - "rsecrets/radicale" = { - file = ../../secrets/radicale/htpasswd.age; - owner = "radicale"; - group = "radicale"; - }; - }; + secrets = lib.mkMerge [ + { + "secrets/token-flurry".file = ../../secrets/github/flurry.age; + "secrets/token-anstml".file = ../../secrets/github/anstml.age; + "secrets/token-nixconf".file = ../../secrets/github/nixconf.age; + "factorio/solrunners".file = ../../secrets/factorio/solrunners.age; + "authentik/env".file = ../../secrets/authentik/env.age; + "rsecrets/radicale" = { + file = ../../secrets/radicale/htpasswd.age; + owner = "radicale"; + group = "radicale"; + }; + } + { + "discord/disqalculate".file = { + file = ../../secrets/discord/disqalculate.age; + owner = "disqalculate"; + group = "disqalculate"; + }; + } + ]; }; services = { diff --git a/packages/default.nix b/packages/default.nix index cd08d87..2411c50 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -27,5 +27,6 @@ forAllSystems ( fuzzel-launch = call ./fuzzel-launch.nix; fuzzel-power = call ./fuzzel-power.nix; vvvvvv-ap = call ./vvvvvv-ap; + stoat-server = call ./stoat-server; } ) diff --git a/packages/stoat-server/default.nix b/packages/stoat-server/default.nix new file mode 100644 index 0000000..476a68a --- /dev/null +++ b/packages/stoat-server/default.nix @@ -0,0 +1,30 @@ +{ + pkgs, + ... +}: +pkgs.rustPlatform.buildRustPackage { + name = "stoatchat"; + version = "0.8.8-1"; + + src = pkgs.fetchFromGitHub { + owner = "stoatchat"; + repo = "stoatchat"; + tag = "20250807-1"; + hash = "sha256-HrhucXy6NywgH7iPEfR28mwp6qEmCXIGBcKBSEzOCsY="; + }; + + nativeBuildInputs = with pkgs; [ + pkg-config + ]; + + buildInputs = with pkgs; [ + openssl + ]; + + cargoHash = "sha256-inlB/U97XKjLbX0nPyu/ddLvPiZEET3pOYm6R+tJeSM="; + + meta = { + description = "Open source discord alternative"; + homepage = "https://stoat.chat/"; + }; +}