From b0da60cdab0ebc6715dcdca22e73a2ef19fd042f Mon Sep 17 00:00:00 2001 From: andromeda Date: Mon, 5 Jan 2026 13:48:06 +0100 Subject: [PATCH] evaluates --- flake.lock | 17 +++++++++++++++++ flake.nix | 18 ++++++++++++++---- machines/109-199-104-83/configuration.nix | 15 +++++++++++++++ 3 files changed, 46 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 2927be9..1eb8499 100644 --- a/flake.lock +++ b/flake.lock @@ -412,6 +412,22 @@ "type": "github" } }, + "nix-zulip": { + "flake": false, + "locked": { + "lastModified": 1764583012, + "narHash": "sha256-6ht4dtI1TBDAaB/Tatq+FcPexaZTBWuRiJGnioCDx5c=", + "ref": "refs/heads/main", + "rev": "a9dd0f80d775745f1d88055f24d944562db97c5e", + "revCount": 67, + "type": "git", + "url": "https://git.afnix.fr/nix-zulip/nix-zulip" + }, + "original": { + "type": "git", + "url": "https://git.afnix.fr/nix-zulip/nix-zulip" + } + }, "nixos-mailserver": { "inputs": { "blobs": "blobs", @@ -583,6 +599,7 @@ "agenix": "agenix", "home-manager": "home-manager_2", "impermanence": "impermanence", + "nix-zulip": "nix-zulip", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", "noshell": "noshell", diff --git a/flake.nix b/flake.nix index 8e53f66..8bd44d7 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nix-zulip = { + url = "git+https://git.afnix.fr/nix-zulip/nix-zulip"; + flake = false; + }; noshell = { url = "github:viperML/noshell"; inputs.nixpkgs.follows = "nixpkgs"; @@ -41,6 +45,7 @@ impermanence, nixos-mailserver, nixpkgs, + nix-zulip, noshell, nur, nvf, @@ -48,6 +53,7 @@ stylix, ... }: let + nix-zulip' = (import "${nix-zulip}/nix/default.nix" {}).output; machines = import ./machines.nix; configuration = machine: modules: nixpkgs.lib.nixosSystem { @@ -63,16 +69,20 @@ agenix.nixosModules.default nixos-mailserver.nixosModule phoenix.nixosModules.default + nix-zulip'.nixosModules.zulip + { + nixpkgs.overlays = [ + agenix.overlays.default + nur.overlays.default + nix-zulip'.overlays.default + ]; + } ]; }; configurationWithHomeManager = machine: (configuration machine [ home-manager.nixosModules.home-manager { - nixpkgs.overlays = [ - agenix.overlays.default - nur.overlays.default - ]; home-manager.useGlobalPkgs = true; home-manager.extraSpecialArgs = {inherit machine;}; home-manager.users = diff --git a/machines/109-199-104-83/configuration.nix b/machines/109-199-104-83/configuration.nix index 2699370..6aa4b4e 100644 --- a/machines/109-199-104-83/configuration.nix +++ b/machines/109-199-104-83/configuration.nix @@ -4,6 +4,21 @@ machine, ... }: { + # zulip config + services.zulip = { + enable = true; + host = "chat.${config.networking.domain}"; + camoKeyFile = builtins.toFile "camoKeyFile" "key"; + rabbitmqPasswordFile = builtins.toFile "rabbitmqPasswordFile" "password"; + secretKeyFile = builtins.toFile "secretKeyFile" "secret key"; + sharedSecretKeyFile = builtins.toFile "sharedSecretKeyFile" "shared secret key"; + avatarSaltKeyFile = builtins.toFile "avatarSaltKeyFile" "avatar salt key"; + zulipSettings = { + EXTERNAL_HOST = "EXTERNAL_HOST"; + ZULIP_ADMINISTRATOR = "ZULIP_ADMINISTRATOR"; + }; + }; + # roundcube config services.roundcube = { enable = true;