Move towards impermanence on Prophet

hosts/prophet/filesystems/default.nix

@@ -4,32 +4,42 @@
     "/" = {
       device = "/dev/disk/by-uuid/e50e186d-e5bc-40b0-9cd7-43b609cde3ea";
       fsType = "btrfs";
-      options = [ "subvol=@" ];
+      options = [ "subvol=root" ];
     };
-    "/home" = {
+    "/prev" = {
       device = "/dev/disk/by-uuid/e50e186d-e5bc-40b0-9cd7-43b609cde3ea";
       fsType = "btrfs";
-      options = [ "subvol=@home" ];
+      options = [ "subvol=prev" ];
     };
     "/nix" = {
       device = "/dev/disk/by-uuid/e50e186d-e5bc-40b0-9cd7-43b609cde3ea";
       fsType = "btrfs";
-      options = [ "subvol=@nix" ];
+      options = [ "subvol=nix" ];
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/7C94-8C9A";
+      fsType = "vfat";
+      options = [ "umask=0077" ];
+    };
+
+    # To be removed
+    "/home" = {
+      device = "/dev/disk/by-uuid/e50e186d-e5bc-40b0-9cd7-43b609cde3ea";
+      fsType = "btrfs";
+      options = [ "subvol=@home" ];
     };
     "/var" = {
       device = "/dev/disk/by-uuid/e50e186d-e5bc-40b0-9cd7-43b609cde3ea";
       fsType = "btrfs";
       options = [ "subvol=@var" ];
     };
-    "/.snapshots" = {
+
+    # Impermanence and subvols
+    "/persist" = {
       device = "/dev/disk/by-uuid/e50e186d-e5bc-40b0-9cd7-43b609cde3ea";
       fsType = "btrfs";
-      options = [ "subvol=@snapshots" ];
+      neededForBoot = true;
-    };
+      options = [ "subvol=persist" ];
-    "/boot" = {
-      device = "/dev/disk/by-uuid/7C94-8C9A";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
     };
     "/export/Bulk" = {
       device = "/dev/disk/by-uuid/ef465845-cc56-4db5-9260-8ae515eb025e";

modules/system/services/server/mailserver/roundcube/default.nix

@@ -1,7 +1,8 @@
-{ config, ... }: 
+{ config, lib, ... }: 
 {
+  config = lib.mkIf config.system.mailserver.enable {
     services.roundcube = {
-    enable = config.system.mailserver.enable;
+      enable = true;
       hostName = "mail.nixfox.ca";
       extraConfig = ''
         $config['smtp_server'] = "tls://mx.nixfox.ca";
@@ -9,4 +10,7 @@
         $config['smtp_pass'] = "%p";
       '';
     };
+
+    environment.persistence."/persist".directories = [ "/var/lib/roundcube" ];
+  };
 }

modules/system/services/server/mailserver/simplenix/default.nix

@@ -1,12 +1,13 @@
-{ config, pkgs, mailserver, ... }: 
+{ config, lib, pkgs, mailserver, ... }: 
 {
   imports = [
     ./nginx
     mailserver.nixosModule
   ];
 
-  mailserver = rec {
+  config = lib.mkIf config.system.mailserver.enable {
-    enable = config.system.mailserver.enable;
+    mailserver = {
+      enable = true;
       domains = [
         "nixfox.ca"
         "bloxelcom.net"
@@ -56,5 +57,13 @@
     };
 
     # Rspamd port from earlier to avoid overlap
-  services.redis.servers.rspamd.port = 1515;
+    services.redis.servers.rspamd.port = config.mailserver.redis.port;
+
+    environment.persistence."/persist".directories = [
+      "/var/vmail"
+      "/var/lib/dovecot"
+      "/var/lib/postfix"
+      "/var/lib/redis-rspamd"
+    ];
+  };
 }

modules/system/services/server/minecraft/default.nix

@@ -1,4 +1,4 @@
-{ minecraft, config, lib, ... }:
+{ config, lib, minecraft, ... }:
 {
   imports = [
     minecraft.nixosModules.minecraft-servers