maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

riot -> element

Browse source
This commit is contained in:
Malte Brandy 2020-07-17 12:56:15 +02:00
parent b4dd1d4a2e
commit 66cf9ce777
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home-manager/machines.nix
View file

@ -38,7 +38,7 @@ in {
"*.nixos.org"
"nixos.org"
"matrix.org"
"riot.im"
"element.io"
"youtube.de"
"youtube.com"
];

2
home-manager/roles/chat.nix
View file

@ -2,7 +2,7 @@
{
home.packages = builtins.attrValues {
inherit (pkgs.unfree) discord;
inherit (pkgs) signal-desktop tdesktop dino riot-desktop;
inherit (pkgs) signal-desktop tdesktop dino element-desktop;
weechat = pkgs.writeShellScriptBin "weechat" "ssh -t hera 'tmux -L weechat attach'";
};
}

2
nixos/machines/hera/configuration.nix
View file

@ -15,7 +15,7 @@ in {
../../roles/standalone
../../roles/server
../../roles/git.nix
../../roles/riot.nix
../../roles/element.nix
../../roles/mathechor.de.nix
../../roles/monitoring
../../roles/blog.nix

6
nixos/roles/riot.nix → nixos/roles/element.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }:
let
riot_config = {
elementConfig = {
default_server_config."m.homeserver" = {
server_name = "maralorn.de";
base_url = "https://matrix.maralorn.de";
@ -16,10 +16,10 @@ let
in {
services.nginx = {
enable = true;
virtualHosts."riot.maralorn.de" = {
virtualHosts."element.maralorn.de" = {
enableACME = true;
forceSSL = true;
root = pkgs.riot-web.override (old: { conf = riot_config; });
root = pkgs.element-web.override (old: { conf = element_config; });
};
};

2
nixos/roles/monitoring/probes.nix
View file

@ -46,7 +46,7 @@ in {
"https://www.mathechor.de"
"https://cloud.mathechor.de"
"https://cloud.maralorn.de"
"https://riot.maralorn.de"
"https://element.maralorn.de"
"https://wiki.vocalensemble-darmstadt.de"
"https://cloud.vocalensemble-darmstadt.de"
"https://www.vocalensemble-darmstadt.de"

2
overlays/10-previews.nix
View file

@ -7,5 +7,5 @@ in {
inherit (unstable.gnome3) gnome-keyring seahorse gdm;
};
inherit (unstable)
aqbanking neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb; # riot-desktop;
aqbanking neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb element-web element-desktop;
}