12 files changed, 1 insertions, 140 deletions
diff --git a/system/impermanence/mods/acme.nix b/system/impermanence/mods/acme.nix
deleted file mode 100644
index b16171e..0000000
--- a/system/impermanence/mods/acme.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    "/var/lib/acme"
-  ];
-}
diff --git a/system/impermanence/mods/fail2ban.nix b/system/impermanence/mods/fail2ban.nix
deleted file mode 100644
index a817876..0000000
--- a/system/impermanence/mods/fail2ban.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    {
-      directory = "/var/lib/fail2ban";
-      user = "fail2ban";
-      group = "fail2ban";
-      mode = "0700";
-    }
-  ];
-}
diff --git a/system/impermanence/mods/mastodon.nix b/system/impermanence/mods/mastodon.nix
deleted file mode 100644
index a5bdbfd..0000000
--- a/system/impermanence/mods/mastodon.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    {
-      directory = "/var/lib/mastodon";
-      user = "mastodon";
-      group = "mastodon";
-      mode = "0700";
-    }
-  ];
-}
diff --git a/system/impermanence/mods/matrix.nix b/system/impermanence/mods/matrix.nix
deleted file mode 100644
index 3af6530..0000000
--- a/system/impermanence/mods/matrix.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    {
-      directory = "/var/lib/matrix";
-      user = "matrix-synapse";
-      group = "matrix-synapse";
-      mode = "0700";
-    }
-    {
-      directory = "/var/lib/mautrix-whatsapp";
-      user = "mautrix-whatsapp";
-      group = "matrix-synapse";
-      mode = "0750";
-    }
-  ];
-  systemd.tmpfiles.rules = [
-    "d /etc/matrix 0755 matrix-synapse matrix-synapse"
-  ];
-}
diff --git a/system/impermanence/mods/minecraft.nix b/system/impermanence/mods/minecraft.nix
deleted file mode 100644
index 2a02626..0000000
--- a/system/impermanence/mods/minecraft.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    {
-      directory = "/var/lib/minecraft";
-      user = "minecraft";
-      group = "minecraft";
-      mode = "0700";
-    }
-  ];
-}
diff --git a/system/impermanence/mods/murmur.nix b/system/impermanence/mods/murmur.nix
deleted file mode 100644
index 48912e1..0000000
--- a/system/impermanence/mods/murmur.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    {
-      directory = "/var/lib/murmur";
-      user = "murmur";
-      group = "murmur";
-      mode = "0700";
-    }
-  ];
-}
diff --git a/system/impermanence/mods/nix-sync.nix b/system/impermanence/mods/nix-sync.nix
deleted file mode 100644
index 11449ea..0000000
--- a/system/impermanence/mods/nix-sync.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    {
-      directory = "/var/lib/nix-sync";
-      user = "nix-sync";
-      group = "nix-sync";
-      mode = "0700";
-    }
-  ];
-}
diff --git a/system/impermanence/mods/openssh.nix b/system/impermanence/mods/openssh.nix
deleted file mode 100644
index 0373a83..0000000
--- a/system/impermanence/mods/openssh.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{...}: {
-  /*
-   FIXME:
-    This results in a boot error, as the `/var/lib/sshd` directory is only mounted _after_ the stage 2 init and with it the system activation.
-    Agenix needs the sshd hostkey however to decrypt the secrets and such we have to ensure that this directory is mounted _before_ the system activation.
-    Alas the only way I see to achieve that is to store the ssh hostkey directly on /srv, which is mounted before (it's marked as 'neededForBoot' after all).
-
-    It should be possible to achieve this with impermanence however, as `/var/log` is mounted in the stage 1 init; The problem is that I have no idea _why_ only
-    this is mounted and nothing else.
-
-
-  environment.persistence."/srv".directories = [
-    {
-      directory = "/var/lib/sshd";
-      user = "root";
-      group = "root";
-      mode = "0755";
-    }
-  ];
-  */
-}
diff --git a/system/impermanence/mods/postgresql.nix b/system/impermanence/mods/postgresql.nix
deleted file mode 100644
index 63b02f5..0000000
--- a/system/impermanence/mods/postgresql.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    "/var/lib/postgresql"
-  ];
-}
diff --git a/system/impermanence/mods/taskserver.nix b/system/impermanence/mods/taskserver.nix
deleted file mode 100644
index 9208aa4..0000000
--- a/system/impermanence/mods/taskserver.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    "/var/lib/taskserver"
-  ];
-}
diff --git a/system/impermanence/mods/users.nix b/system/impermanence/mods/users.nix
deleted file mode 100644
index 897d4f7..0000000
--- a/system/impermanence/mods/users.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{...}: {
-  environment.persistence."/srv".directories = [
-    {
-      directory = "/home";
-      user = "root";
-      group = "root";
-      mode = "0755";
-    }
-    {
-      directory = "/home/sils";
-      user = "sils";
-      group = "sils";
-      mode = "0700";
-    }
-    {
-      directory = "/home/soispha";
-      user = "soispha";
-      group = "soispha";
-      mode = "0700";
-    }
-    {
-      directory = "/home/nightingale";
-      user = "nightingale";
-      group = "nightingale";
-      mode = "0700";
-    }
-    {
-      directory = "/root/.ssh";
-      user = "root";
-      group = "root";
-      mode = "0700";
-    }
-  ];
-}
diff --git a/system/impermanence/mods/mail.nix b/system/services/mail/impermanence.nix
index a306ccf..22a5318 100644
--- a/system/impermanence/mods/mail.nix
+++ b/system/services/mail/impermanence.nix
@@ -1,5 +1,5 @@
 {...}: {
-  environment.persistence."/srv".directories = [
+  vhack.persist.directories = [
     {
       directory = "/var/lib/mail/backup";
       user = "virtualMail";