From 473e113c4f1f6d26779a7c9d4cf84d56db5fc0b8 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sat, 4 Jan 2025 19:28:02 +0000
Subject: [PATCH] kilgharrah: replace failed HDD

---
 hosts/kilgharrah/backup.nix      |  9 ++++-----
 hosts/kilgharrah/default.nix     | 31 +++++++++++++++---------------
 hosts/kilgharrah/filesystems.nix | 33 ++++++++++++++++----------------
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/hosts/kilgharrah/backup.nix b/hosts/kilgharrah/backup.nix
index 370d9ee..efa72f9 100644
--- a/hosts/kilgharrah/backup.nix
+++ b/hosts/kilgharrah/backup.nix
@@ -1,9 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
-  # FIXME: failing drive
-  # services.sanoid.datasets."rpool_albion/state" = {
-  #   useTemplate = [ "production" ];
-  #   recursive = "zfs";
-  # };
+  services.sanoid.datasets."rpool_albion/state" = {
+    useTemplate = [ "production" ];
+    recursive = "zfs";
+  };
 }
\ No newline at end of file
diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index e07b21e..63e6840 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -9,8 +9,7 @@ in
     ./filesystems.nix
     ./hardware.nix
     ./networking.nix
-    # FIXME: failing drive
-    # ./ftp.nix
+    ./ftp.nix
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
@@ -49,20 +48,20 @@ in
     ];
   };
 
-  # programs.steam.enable = true;
-  # qenya.services.audiobookshelf = {
-  #   enable = true;
-  #   domain = "audiobookshelf.qenya.tel";
-  # };
-  # qenya.services.jellyfin = {
-  #   enable = true;
-  #   domain = "jellyfin.qenya.tel";
-  # };
-  # qenya.services.navidrome = {
-  #   enable = true;
-  #   domain = "music.qenya.tel";
-  #   dataDir = "/srv/music";
-  # };
+  programs.steam.enable = true;
+  qenya.services.audiobookshelf = {
+    enable = true;
+    domain = "audiobookshelf.qenya.tel";
+  };
+  qenya.services.jellyfin = {
+    enable = true;
+    domain = "jellyfin.qenya.tel";
+  };
+  qenya.services.navidrome = {
+    enable = true;
+    domain = "music.qenya.tel";
+    dataDir = "/srv/music";
+  };
 
   system.stateVersion = "24.05";
 
diff --git a/hosts/kilgharrah/filesystems.nix b/hosts/kilgharrah/filesystems.nix
index 0cad432..dbafb05 100644
--- a/hosts/kilgharrah/filesystems.nix
+++ b/hosts/kilgharrah/filesystems.nix
@@ -67,25 +67,24 @@
 
 
   # HDD in bay
-  # FIXME: failing drive
 
-  # environment.etc.crypttab.text = ''
-  #   albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
-  # '';
+  environment.etc.crypttab.text = ''
+    albion UUID=8a924f24-9b65-4f05-aeda-5b4080cc7aa1 /root/luks-albion.key
+  '';
 
-  # randomcat.services.zfs.datasets = {
-  #   "rpool_albion/data" = { mountpoint = "none"; };
-  #   "rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
-  #   "rpool_albion/state" = { mountpoint = "none"; };
-  #   "rpool_albion/state/audiobookshelf" = { mountpoint = "/var/lib/audiobookshelf"; };
-  #   "rpool_albion/state/jellyfin" = { mountpoint = "/var/lib/jellyfin"; };
-  #   "rpool_albion/state/navidrome" = { mountpoint = "/var/lib/navidrome"; };
-  #   "rpool_albion/srv" = { mountpoint = "none"; };
-  #   "rpool_albion/srv/audiobookshelf" = { mountpoint = "/srv/audiobookshelf"; };
-  #   "rpool_albion/srv/ftp" = { mountpoint = "/srv/ftp"; };
-  #   "rpool_albion/srv/jellyfin" = { mountpoint = "/srv/jellyfin"; };
-  #   "rpool_albion/srv/music" = { mountpoint = "/srv/music"; };
-  # };
+  randomcat.services.zfs.datasets = {
+    "rpool_albion/data" = { mountpoint = "none"; };
+    "rpool_albion/data/steam" = { mountpoint = "/home/qenya/.local/share/Steam"; };
+    "rpool_albion/state" = { mountpoint = "none"; };
+    "rpool_albion/state/audiobookshelf" = { mountpoint = "/var/lib/audiobookshelf"; };
+    "rpool_albion/state/jellyfin" = { mountpoint = "/var/lib/jellyfin"; };
+    "rpool_albion/state/navidrome" = { mountpoint = "/var/lib/navidrome"; };
+    "rpool_albion/srv" = { mountpoint = "none"; };
+    "rpool_albion/srv/audiobookshelf" = { mountpoint = "/srv/audiobookshelf"; };
+    "rpool_albion/srv/ftp" = { mountpoint = "/srv/ftp"; };
+    "rpool_albion/srv/jellyfin" = { mountpoint = "/srv/jellyfin"; };
+    "rpool_albion/srv/music" = { mountpoint = "/srv/music"; };
+  };
 
 
   # Other