Squash changes containing private information

There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository

2 files changed, 48 insertions, 57 deletions

diff --git a/flakes/private/peertube/flake.lock b/flakes/private/peertube/flake.lock
index 4944da7..0ecec47 100644
--- a/flakes/private/peertube/flake.lock
+++ b/flakes/private/peertube/flake.lock
@@ -32,36 +32,26 @@
     },
     "myuids": {
       "locked": {
-        "dir": "flakes/myuids",
-        "lastModified": 1628207001,
-        "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
-        "ref": "master",
-        "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
-        "revCount": 865,
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "lastModified": 1,
+        "narHash": "sha256-HkW9YCLQCNBX3Em7J7MjraVEZO3I3PizkVV2QrUdULQ=",
+        "path": "../myuids",
+        "type": "path"
       },
       "original": {
-        "dir": "flakes/myuids",
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "path": "../myuids",
+        "type": "path"
       }
     },
     "myuids_2": {
       "locked": {
-        "dir": "flakes/myuids",
-        "lastModified": 1628207001,
-        "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=",
-        "ref": "master",
-        "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3",
-        "revCount": 865,
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "lastModified": 1,
+        "narHash": "sha256-HkW9YCLQCNBX3Em7J7MjraVEZO3I3PizkVV2QrUdULQ=",
+        "path": "../myuids",
+        "type": "path"
       },
       "original": {
-        "dir": "flakes/myuids",
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+        "path": "../myuids",
+        "type": "path"
       }
     },
     "nixpkgs": {
@@ -97,12 +87,13 @@
     "peertube": {
       "flake": false,
       "locked": {
-        "lastModified": 1610436329,
-        "narHash": "sha256-bIXt5bQiBBlNDFXYzcdQA8qp4nse5epUx/XQOguDOX8=",
-        "owner": "Chocobozzz",
-        "repo": "PeerTube",
-        "rev": "69e0e678beb7f1a3b6753eeff585a14f9a61ea86",
-        "type": "github"
+        "lastModified": 1611184594,
+        "narHash": "sha256-1N59Dmo9zny+bZWRPiR7fXConECAw9OFcVIWMp2wois=",
+        "ref": "gitolite_local/open_instance",
+        "rev": "f49b8d9b697f098490e81ce0afd889ba37dcb2f3",
+        "revCount": 6316,
+        "type": "git",
+        "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git"
       },
       "original": {
         "owner": "Chocobozzz",
@@ -114,21 +105,21 @@
     "peertube_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1611184594,
-        "narHash": "sha256-1N59Dmo9zny+bZWRPiR7fXConECAw9OFcVIWMp2wois=",
-        "ref": "gitolite_local/syden",
-        "rev": "f49b8d9b697f098490e81ce0afd889ba37dcb2f3",
-        "revCount": 6316,
-        "type": "git",
-        "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git"
+        "lastModified": 1610436329,
+        "narHash": "sha256-bIXt5bQiBBlNDFXYzcdQA8qp4nse5epUx/XQOguDOX8=",
+        "owner": "Chocobozzz",
+        "repo": "PeerTube",
+        "rev": "69e0e678beb7f1a3b6753eeff585a14f9a61ea86",
+        "type": "github"
       },
       "original": {
-        "ref": "gitolite_local/syden",
-        "type": "git",
-        "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git"
+        "owner": "Chocobozzz",
+        "ref": "v3.0.1",
+        "repo": "PeerTube",
+        "type": "github"
       }
     },
-    "peertube_origin": {
+    "peertube_open_instance": {
       "inputs": {
         "flake-utils": "flake-utils",
         "myuids": "myuids",
@@ -136,16 +127,17 @@
         "peertube": "peertube"
       },
       "locked": {
-        "narHash": "sha256-ESrcCrx7QmNk8MHgws9KrPEZqIxKNQ6bcshbUPj9u88=",
-        "path": "../../peertube",
+        "lastModified": 1,
+        "narHash": "sha256-l+XpuMrH6I51hk37REAPVSLlbvCdad3kcDGioodzPR4=",
+        "path": "./../../peertube",
         "type": "path"
       },
       "original": {
-        "path": "../../peertube",
+        "path": "./../../peertube",
         "type": "path"
       }
     },
-    "peertube_syden": {
+    "peertube_origin": {
       "inputs": {
         "flake-utils": "flake-utils_2",
         "myuids": "myuids_2",
@@ -153,19 +145,20 @@
         "peertube": "peertube_2"
       },
       "locked": {
-        "narHash": "sha256-ESrcCrx7QmNk8MHgws9KrPEZqIxKNQ6bcshbUPj9u88=",
-        "path": "../../peertube",
+        "lastModified": 1,
+        "narHash": "sha256-l+XpuMrH6I51hk37REAPVSLlbvCdad3kcDGioodzPR4=",
+        "path": "./../../peertube",
         "type": "path"
       },
       "original": {
-        "path": "../../peertube",
+        "path": "./../../peertube",
         "type": "path"
       }
     },
     "root": {
       "inputs": {
-        "peertube_origin": "peertube_origin",
-        "peertube_syden": "peertube_syden"
+        "peertube_open_instance": "peertube_open_instance",
+        "peertube_origin": "peertube_origin"
       }
     }
   },
diff --git a/flakes/private/peertube/flake.nix b/flakes/private/peertube/flake.nix
index e0e0d54..8eb81e9 100644
--- a/flakes/private/peertube/flake.nix
+++ b/flakes/private/peertube/flake.nix
@@ -1,27 +1,25 @@
 {
   description = "Patched peertube";
   inputs.peertube_origin = {
-    path = "../../peertube";
-    type = "path";
+    url = "path:./../../peertube";
   };
-  inputs.peertube_syden = {
-    path = "../../peertube";
-    type = "path";
+  inputs.peertube_open_instance = {
+    url = "path:./../../peertube";
     inputs.peertube = {
       url = "https://git.immae.eu/github/Chocobozzz/PeerTube.git";
-      ref = "gitolite_local/syden";
+      ref = "gitolite_local/open_instance";
       flake = false;
       type = "git";
     };
   };
 
-  outputs = { self, peertube_origin, peertube_syden }: {
+  outputs = { self, peertube_origin, peertube_open_instance }: {
     overlays = {
-      peertube_syden = final: prev: { peertube_syden = peertube_syden.defaultPackage."${final.system}"; };
+      peertube_open_instance = final: prev: { peertube_open_instance = peertube_open_instance.defaultPackage."${final.system}"; };
       peertube_origin = final: prev: { peertube_origin = peertube_origin.defaultPackage."${final.system}"; };
     };
     packages.x86_64-linux.peertube = peertube_origin.packages.x86_64-linux.peertube;
-    packages.x86_64-linux.peertube_syden = peertube_syden.packages.x86_64-linux.peertube;
+    packages.x86_64-linux.peertube_open_instance = peertube_open_instance.packages.x86_64-linux.peertube;
     defaultPackage.x86_64-linux = peertube_origin.defaultPackage.x86_64-linux;
     nixosModule = peertube_origin.nixosModule;
   };