diff options
Diffstat (limited to 'host/Rory-nginx/services/containers/draupnir-cme')
3 files changed, 15 insertions, 55 deletions
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/container.nix b/host/Rory-nginx/services/containers/draupnir-cme/container.nix index 75ce709..6ea20a4 100755 --- a/host/Rory-nginx/services/containers/draupnir-cme/container.nix +++ b/host/Rory-nginx/services/containers/draupnir-cme/container.nix @@ -1,9 +1,4 @@ -{ - pkgs, - lib, - nixpkgs-Draupnir, - ... -}: +{ nixpkgs-Draupnir, ... }: { privateNetwork = true; @@ -12,21 +7,15 @@ inherit nixpkgs-Draupnir; }; config = + { lib, pkgs, ... }: { - lib, - pkgs, - ... - }: - { - imports = [ + imports = [ + ../shared.nix ./root.nix + ./services/draupnir.nix "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix" ]; - nixpkgs.overlays = [ - (final: prev: { - draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; - }) - ]; + nixpkgs.overlays = [ (final: prev: { draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir; }) ]; }; hostAddress = "192.168.100.16"; localAddress = "192.168.100.17"; diff --git a/host/Rory-nginx/services/containers/draupnir-cme/root.nix b/host/Rory-nginx/services/containers/draupnir-cme/root.nix index cf6f8c0..aa9bae8 100755 --- a/host/Rory-nginx/services/containers/draupnir-cme/root.nix +++ b/host/Rory-nginx/services/containers/draupnir-cme/root.nix @@ -1,31 +1,6 @@ -{ - config, - pkgs, - lib, - ... -}: +{ ... }: { - imports = [ - ./services/draupnir.nix - ]; - - environment.systemPackages = with pkgs; [ - neofetch - lnav - zsh - lsd - htop - btop - duf - kitty.terminfo - neovim - jq - yq - pv - dig - ]; - environment.etc."resolv.conf".text = '' nameserver 8.8.8.8 nameserver 8.4.4.8 @@ -34,9 +9,12 @@ ''; networking.hosts = { - "192.168.100.16" = [ "matrix.rory.gay" "rory.gay" ]; + "192.168.100.16" = [ + "matrix.rory.gay" + "rory.gay" + ]; }; - + networking.firewall = { enable = true; }; diff --git a/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix b/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix index c23680c..cf59809 100755 --- a/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix +++ b/host/Rory-nginx/services/containers/draupnir-cme/services/draupnir.nix @@ -1,14 +1,10 @@ -{ - config, - pkgs, - lib, - ... -}: +{ ... }: { services.draupnir = { enable = true; accessTokenFile = "/etc/draupnir-access-token"; + homeserverUrl = "https://matrix.rory.gay"; settings = { managementRoom = "#draupnir-cme:rory.gay"; @@ -16,15 +12,12 @@ autojoinOnlyIfManager = true; # ... but we don't want the bot to be invited to eg. Matrix HQ... automaticallyRedactForReasons = [ "*" ]; # Always autoredact fasterMembershipChecks = true; - homeserverUrl = "https://matrix.rory.gay"; backgroundDelayMS = 10; # delay isn't needed, I don't mind the performance hit pollReports = false; admin.enableMakeRoomAdminCommand = false; - commands.ban.defaultReasons = [ - "spam" - ]; + commands.ban.defaultReasons = [ "spam" ]; }; }; } |