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, 52 insertions, 116 deletions

diff --git a/flakes/private/openarc/flake.lock b/flakes/private/openarc/flake.lock
index be75993..60b0fdf 100644
--- a/flakes/private/openarc/flake.lock
+++ b/flakes/private/openarc/flake.lock
@@ -2,7 +2,8 @@
   "nodes": {
     "files-watcher": {
       "locked": {
-        "narHash": "sha256-6urOJuzXsu4HJHyVmrZHd40SMzzTeHiOiDOM40q53Y0=",
+        "lastModified": 1,
+        "narHash": "sha256-ZsdumUVoSPkV/DB6gO6dNDttjzalye0ToVBF9bl5W0k=",
         "path": "../../files-watcher",
         "type": "path"
       },
@@ -26,69 +27,20 @@
         "type": "github"
       }
     },
-    "my-lib": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
+    "myuids": {
       "locked": {
-        "narHash": "sha256-HGNP1eH7b42BxViYx/F3ZPO9CM1X+5qfA9JoP2ArN+s=",
-        "path": "../../lib",
+        "lastModified": 1,
+        "narHash": "sha256-HkW9YCLQCNBX3Em7J7MjraVEZO3I3PizkVV2QrUdULQ=",
+        "path": "../myuids",
         "type": "path"
       },
       "original": {
-        "path": "../../lib",
+        "path": "../myuids",
         "type": "path"
       }
     },
-    "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"
-      },
-      "original": {
-        "dir": "flakes/myuids",
-        "type": "git",
-        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
-      }
-    },
-    "nix-lib": {
-      "locked": {
-        "lastModified": 1633008342,
-        "narHash": "sha256-wZV5YidnsqV/iufDIhaZip3LzwUGeIt8wtdiGS5+cXc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "6eae8a116011f4db0aa5146f364820024411d6bb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1631570365,
-        "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "df7113c0727881519248d4c7d080324e0ee3327b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
         "lastModified": 1597943282,
         "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=",
         "owner": "NixOS",
@@ -106,11 +58,12 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "myuids": "myuids",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "openarc": "openarc_2"
       },
       "locked": {
-        "narHash": "sha256-ilrfNs6jpi1OceDE3y1atkovECx6PKNWubwLc0Sjx+s=",
+        "lastModified": 1,
+        "narHash": "sha256-+X3x0t7DSYBvgFAUGNnMV4F/vQOUWE+9Q4Az6V8/iTw=",
         "path": "../../openarc",
         "type": "path"
       },
@@ -138,15 +91,14 @@
     "root": {
       "inputs": {
         "files-watcher": "files-watcher",
-        "my-lib": "my-lib",
-        "nix-lib": "nix-lib",
         "openarc": "openarc",
         "secrets": "secrets"
       }
     },
     "secrets": {
       "locked": {
-        "narHash": "sha256-w3u1bMEJHCg9SqErJ5Qi0sTX2xx7mk+HrHZXzpjQd1w=",
+        "lastModified": 1,
+        "narHash": "sha256-5AakznhrJFmwCD7lr4JEh55MtdAJL6WA/YuBks6ISSE=",
         "path": "../../secrets",
         "type": "path"
       },
diff --git a/flakes/private/openarc/flake.nix b/flakes/private/openarc/flake.nix
index b4ab4c8..56c3a1a 100644
--- a/flakes/private/openarc/flake.nix
+++ b/flakes/private/openarc/flake.nix
@@ -1,63 +1,47 @@
 {
-  inputs.openarc = {
-    path = "../../openarc";
-    type = "path";
-  };
-  inputs.secrets = {
-    path = "../../secrets";
-    type = "path";
-  };
-  inputs.files-watcher = {
-    path = "../../files-watcher";
-    type = "path";
-  };
-  inputs.my-lib = {
-    path = "../../lib";
-    type = "path";
-  };
-  inputs.nix-lib.url = "github:NixOS/nixpkgs";
+  inputs.openarc.url = "path:../../openarc";
+  inputs.secrets.url = "path:../../secrets";
+  inputs.files-watcher.url = "path:../../files-watcher";
 
   description = "Private configuration for openarc";
-  outputs = { self, nix-lib, my-lib, files-watcher, openarc, secrets }:
-    let
-      cfg = name': { config, lib, pkgs, name, ... }: {
-        imports = [
-          (my-lib.lib.withNarKey files-watcher "nixosModule")
-          (my-lib.lib.withNarKey openarc "nixosModule")
-          (my-lib.lib.withNarKey secrets "nixosModule")
-        ];
-        config = lib.mkIf (name == name') {
-          services.openarc = {
-            enable = true;
-            user = "opendkim";
-            socket = "/run/openarc/openarc.sock";
-            group = config.services.postfix.group;
-            configFile = pkgs.writeText "openarc.conf" ''
-              AuthservID              mail.immae.eu
-              Domain                  mail.immae.eu
-              KeyFile                 ${config.secrets.fullPaths."opendkim/eldiron.private"}
-              Mode                    sv
-              Selector                eldiron
-              SoftwareHeader          yes
-              Syslog                  Yes
-              '';
-          };
-          systemd.services.openarc.serviceConfig.Slice = "mail.slice";
-          systemd.services.openarc.postStart = ''
-            while [ ! -S ${config.services.openarc.socket} ]; do
-              sleep 0.5
-            done
-            chmod g+w ${config.services.openarc.socket}
+  outputs = { self, files-watcher, openarc, secrets }: {
+    nixosModule = self.nixosModules.openarc;
+    nixosModules.openarc = { config, pkgs, ... }: {
+      imports = [
+        files-watcher.nixosModule
+        openarc.nixosModule
+        secrets.nixosModule
+      ];
+      config = {
+        services.openarc = {
+          enable = true;
+          user = "opendkim";
+          socket = "/run/openarc/openarc.sock";
+          group = config.services.postfix.group;
+          configFile = pkgs.writeText "openarc.conf" ''
+            AuthservID              mail.immae.eu
+            Domain                  mail.immae.eu
+            KeyFile                 ${config.secrets.fullPaths."opendkim/eldiron.private"}
+            Mode                    sv
+            Selector                eldiron
+            SoftwareHeader          yes
+            Syslog                  Yes
             '';
-          services.filesWatcher.openarc = {
-            restart = true;
-            paths = [
-              config.secrets.fullPaths."opendkim/eldiron.private"
-            ];
-          };
+        };
+        systemd.services.openarc.serviceConfig.Slice = "mail.slice";
+        systemd.services.openarc.postStart = ''
+          while [ ! -S ${config.services.openarc.socket} ]; do
+            sleep 0.5
+          done
+          chmod g+w ${config.services.openarc.socket}
+          '';
+        services.filesWatcher.openarc = {
+          restart = true;
+          paths = [
+            config.secrets.fullPaths."opendkim/eldiron.private"
+          ];
         };
       };
-    in
-      openarc.outputs //
-      { nixosModules = openarc.nixosModules or {} // nix-lib.lib.genAttrs ["eldiron" "backup-2"] cfg; };
+    };
+  };
 }