2 files changed, 25 insertions, 12 deletions
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index f66478d..3476e6d 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -21,7 +21,7 @@ with lib; {
     };
     android.enable = true;
     bluetooth.enable = true;
-    discord.enable = true;
+    beets.enable = true;
     libvirtd.enable = true;
     qutebrowser.enable = true;
     mpd.enable = true;
@@ -31,6 +31,8 @@ with lib; {
     home.packages = with pkgs; [obs-studio];
 
     programs = {
+      beets.settings.directory = mkForce "/mnt/udata/music";
+
       # NOTE This produces very poor performance even though RX 6750 XT should
       # handle VA-API hardware decoding for all major formats (including AV1) just
       # fine.
@@ -43,6 +45,25 @@ with lib; {
         profile = "gpu-hq";
       };
     };
+
+    services.mpd.musicDirectory = mkForce "/mnt/udata/music";
+  };
+
+  services = {
+    smartd = {
+      enable = true;
+      notifications = {
+        test = true;
+        mail = {
+          # TODO
+        };
+      };
+    };
+
+    # nullmailer = {
+    #   enable = true;
+    #   me = config.networking.fqdn;
+    # };
   };
 
   # Usually stuff that is going to be compiled on this machine is going to have
@@ -74,7 +95,7 @@ with lib; {
     # The boot drive is Samsung SSD 980 PRO 2TB.
     initrd.kernelModules = ["nvme"];
 
-    zfs.extraPools = ["vdata"];
+    zfs.extraPools = ["udata" "vdata"];
   };
 
   # Filesystem creation:
diff --git a/nixosConfigurations/manwe/mailserver.nix b/nixosConfigurations/manwe/mailserver.nix
index a4b552a..f6f8d91 100644
--- a/nixosConfigurations/manwe/mailserver.nix
+++ b/nixosConfigurations/manwe/mailserver.nix
@@ -26,8 +26,8 @@ with lib; {
       owner = "opendkim";
       group = "opendkim";
     };
-    dkim-key-shire-me = {
-      file = "${inputs.self}/secrets/dkim-key-shire-me";
+    dkim-key-shire-net = {
+      file = "${inputs.self}/secrets/dkim-key-shire-net";
       path = "/var/dkim/${my.domain.shire}.${config.mailserver.dkimSelector}.key";
       owner = "opendkim";
       group = "opendkim";
@@ -70,14 +70,6 @@ with lib; {
         aliases = ["chad@${shire}"];
         quota = "1G";
       };
-      "pippin@${shire}" = {
-        hashedPassword = "@HASHED_PASSWORD@";
-        quota = "1G";
-      };
-      "meriadoc@${shire}" = {
-        hashedPassword = "@HASHED_PASSWORD@";
-        quota = "1G";
-      };
     };
   };