From cacb29b419447dd307fddedec472d08740e87e9f Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Fri, 7 Aug 2020 16:10:48 +0300 Subject: [PATCH] Add jitsi meet --- flake.lock | 20 +++++++++++--------- flake.nix | 1 + modules/applications/packages.nix | 3 --- modules/services.nix | 13 +++++++++---- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index 16c6532..93f85be 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1596549673, - "narHash": "sha256-1wQvqbDFWxO53ZsNHv3CFxjoCwjQ3HTFhitGIh3/a88=", + "lastModified": 1596706841, + "narHash": "sha256-PmETx1tgC93F/WU7zOX6UeA6hHbGN6KYRuEDe3z46/w=", "owner": "NixOS", "repo": "nix", - "rev": "4e7f1c7f11fb22d7954b2dacbe87c61548fab82d", + "rev": "59067f0f587f75908c4f990bcbab29340c7f7652", "type": "github" }, "original": { @@ -229,16 +229,18 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1596185210, - "narHash": "sha256-Dj9rN3OxZ/j0XH00bwe/4teq9DN4Q0mynKm46BKulFM=", - "owner": "NixOS", + "lastModified": 1596571799, + "narHash": "sha256-NlJ8rSNODhje8t4RVS+Jos+3rpohguqZWmP93niWKFc=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "b0edcfd09bbf9e8571704cf5df8d68956c79af44", + "rev": "c253216595572930316f2be737dc288a1da22558", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c253216595572930316f2be737dc288a1da22558", + "type": "github" } }, "nixpkgs_5": { diff --git a/flake.nix b/flake.nix index c56006c..a9b959b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ "A collection of crap, hacks and copy-paste to make my localhosts boot"; inputs = { + nixpkgs.url = github:nixos/nixpkgs/c253216595572930316f2be737dc288a1da22558; nixpkgs-mesa.url = github:nixos/nixpkgs-channels/bdac777becdbb8780c35be4f552c9d4518fe0bdb; lambda-launcher.url = github:balsoft/lambda-launcher; NUR = { diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index 747374b..3c7d974 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -32,7 +32,6 @@ breeze-icons kde-cli-tools xdg_utils - nheko git-crypt inputs.yt-utilities.defaultPackage.x86_64-linux lambda-launcher @@ -46,9 +45,7 @@ gwenview kcachegrind kcolorchooser - kdenlive kolourpaint - marble okular print-manager ])); diff --git a/modules/services.nix b/modules/services.nix index 1ed4907..07fe255 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -44,12 +44,17 @@ enable = config.deviceSpecific.isHost; }; - services.vsftpd = { - enable = true; - anonymousUser = true; - }; networking.firewall.trustedInterfaces = [ "eth0" ]; services.nginx.enable = config.device == "AMD-Workstation"; + services.jitsi-meet = { + enable = true; + hostName = "meet.balsoft.ru"; + }; + + services.nginx.virtualHosts.${config.services.jitsi-meet.hostName} = { + enableACME = true; + forceSSL = true; + }; }