diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 394da9a3889..c310c2dac78 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -346,6 +346,7 @@ in
       paperless = 315;
       #mailman = 316;  # removed 2019-08-30
       zigbee2mqtt = 317;
+      peertube = 318;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -647,6 +648,7 @@ in
       paperless = 315;
       #mailman = 316;  # removed 2019-08-30
       zigbee2mqtt = 317;
+      peertube = 318;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/web-apps/peertube/default.nix b/nixos/modules/services/web-apps/peertube/default.nix
index 19e3d5baaba..9cbeaf4aa6b 100644
--- a/nixos/modules/services/web-apps/peertube/default.nix
+++ b/nixos/modules/services/web-apps/peertube/default.nix
@@ -31,31 +31,40 @@ in
       '';
     };
 
+    database = lib.mkOption {
+      type = lib.types.str;
+      default = "peertube_prod";
+      description = ''
+        The Postgres database where Peertube stores its data.
+      '';
+    };
+
     configFile = lib.mkOption {
       type = lib.types.path;
       description = ''
         The configuration file path for Peertube.
-        '';
+      '';
     };
 
     package = lib.mkOption {
       type = lib.types.package;
-      default = pkgs.webapps.peertube;
+      # default = pkgs.webapps.peertube;
+      default = pkgs.peertube;
       description = ''
         Peertube package to use.
-        '';
+      '';
     };
 
     # Output variables
     systemdStateDirectory = lib.mkOption {
       type = lib.types.str;
 
       # Use ReadWritePaths= instead if varDir is outside of /var/lib
       default = assert lib.strings.hasPrefix "/var/lib/" cfg.dataDir;
-        lib.strings.removePrefix "/var/lib/" cfg.dataDir;
+      lib.strings.removePrefix "/var/lib/" cfg.dataDir;
 
       description = ''
-      Adjusted Peertube data directory for systemd
+        Adjusted Peertube data directory for systemd
       '';
 
       readOnly = true;
@@ -70,6 +88,8 @@ in
         description = "Peertube user";
         home = cfg.dataDir;
         useDefaultShell = true;
+        # todo: fix this. needed for postgres authentication
+        password = "peertube";
       };
     };
     users.groups = lib.optionalAttrs (cfg.group == name) {
@@ -78,17 +98,46 @@ in
       };
     };
 
+    services.redis = {
+      enable = true;
+    };
+
+    services.postgresql = {
+      enable = true;
+      package = pkgs.postgresql_12;
+      # requires sudo -u postgres createdb -O peertube -E UTF8 -T template0 ${cfg.database}
+      # so this may not suffice
+      # ensureDatabases = [ "${cfg.database}" ];
+      ensureUsers = [
+        {
+          name = "${cfg.user}";
+          # we create database with `peertube` as owner in `preStart`
+          # ensurePermissions = {
+            #   "DATABASE ${cfg.database}" = "ALL PRIVILEGES";
+            # };
+        }
+      ];
+      authentication = ''
+        host ${cfg.database} ${cfg.user} 127.0.0.1/32 trust
+        host ${cfg.database} ${cfg.user} 127.0.0.1/32 md5
+      '';
+
+    };
+
+    systemd.tmpfiles.rules = [
+      "d \"${cfg.dataDir}\" - ${cfg.user} ${cfg.group} - -"
+    ];
+
     systemd.services.peertube = {
       description = "Peertube";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "postgresql.service" ];
-      wants = [ "postgresql.service" ];
+      after = [ "network.target" "postgresql.service" "redis.service" ];
+      wants = [ "postgresql.service" "redis.service" ];
 
       environment.NODE_CONFIG_DIR = "${cfg.dataDir}/config";
       environment.NODE_ENV = "production";
       environment.HOME = cfg.package;
 
-      path = [ pkgs.nodejs pkgs.bashInteractive pkgs.ffmpeg pkgs.openssl ];
+      path = [ pkgs.nodejs pkgs.bashInteractive pkgs.ffmpeg pkgs.openssl pkgs.sudo ];
 
       script = ''
         install -m 0750 -d ${cfg.dataDir}/config
@@ -108,6 +157,26 @@ in
         Restart = "always";
         Type = "simple";
         TimeoutSec = 60;
+        ExecStartPre = let script = pkgs.writeScript "peertube-pre-start.sh" ''
+          #!/bin/sh
+          set -e
+
+          if ! [ -e "${cfg.dataDir}/.first_run" ]; then
+          set -v
+          if [ -e "${cfg.dataDir}/.first_run_partial" ]; then
+          echo "Warn: first run was interrupted"
+          fi
+          touch "${cfg.dataDir}/.first_run_partial"
+
+          sudo -u postgres "${config.services.postgresql.package}/bin/createdb" -O ${cfg.user} -E UTF8 -T template0 ${cfg.database}
+          sudo -u postgres "${config.services.postgresql.package}/bin/psql" -c "CREATE EXTENSION pg_trgm;" ${cfg.database}
+          sudo -u postgres "${config.services.postgresql.package}/bin/psql" -c "CREATE EXTENSION unaccent;" ${cfg.database}
+
+          touch "${cfg.dataDir}/.first_run"
+          rm "${cfg.dataDir}/.first_run_partial"
+          fi
+        '';
+        in "+${script}";
       };
 
       unitConfig.RequiresMountsFor = cfg.dataDir;
diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix
index 52ddfb44dac..9ce5183d8b1 100644
--- a/pkgs/servers/peertube/default.nix
+++ b/pkgs/servers/peertube/default.nix
@@ -4,16 +4,20 @@
 let
   nodeHeaders = fetchurl {
     url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-    sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c";
+    sha256 = "17kf05a92r4y4n1lj78265wr6zhkpzbr1k8nbwrl8sq71npd6n5j";
+    # node 10 sha256 = "0i69flgrj59200nkkmj64d29j1jildvflc1dngbqv9dkawd47bpg";
+# 15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c";
   };
   source = rec {
-    version = "v2.3.0";
+    # version = "v2.3.0";
+    version = "v2.1.1";
     name = "peertube-${version}";
     src = fetchFromGitHub {
       owner = "Chocobozzz";
       repo = "PeerTube";
       rev = version;
-      sha256 = "1si4adhdd7c4avgm9qvva2f77x2bmfq0gx5ibnhlxr9bsc8s4ran";
+      # sha256 = "1si4adhdd7c4avgm9qvva2f77x2bmfq0gx5ibnhlxr9bsc8s4ran";
+      sha256 = "147gm1j657fkpv2ix1bmkhl7ld5h224q7hgdj9ffj3z14mqgk8hj";
       fetchSubmodules = true;
     };
   };
@@ -44,8 +48,10 @@ let
       buildInputs = [ nodePackages.node-pre-gyp ];
       postInstall = let
         bcrypt_lib = fetchurl {
-          url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.7/bcrypt_lib-v3.0.7-node-v64-linux-x64-glibc.tar.gz";
-          sha256 = "0gbq4grhp5wl0f9yqb4y43kjfh8nivfd6y0nkv1x6gfvs2v23wb0";
+          # url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.7/bcrypt_lib-v3.0.7-node-v64-linux-x64-glibc.tar.gz";
+          # sha256 = "0gbq4grhp5wl0f9yqb4y43kjfh8nivfd6y0nkv1x6gfvs2v23wb0";
+          url = "https://github.com/kelektiv/node.bcrypt.js/releases/download/v3.0.7/bcrypt_lib-v3.0.7-node-v72-linux-x64-glibc.tar.gz";
+          sha256 = "0kpm9j0yc4lqsafldfsql3m72rr1fapljlb6ddxvy3zi13rb7ppx";
         };
       in
         ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10f18ccc68a..ec017c01b58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22375,7 +22375,7 @@ in
   peek = callPackage ../applications/video/peek { };
 
   peertube = callPackage ../servers/peertube {
-    nodejs = pkgs.nodejs-10_x;
+    nodejs = pkgs.nodejs-12_x;
   };
 
   pflask = callPackage ../os-specific/linux/pflask {};