diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index eb7bf49..3d0129c 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -44,6 +44,17 @@
     dataDir = "/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/jellyfin" = { mountpoint = "/var/lib/jellyfin"; };
+    "rpool_albion/state/navidrome" = { mountpoint = "/var/lib/navidrome"; };
+    "rpool_albion/srv" = { mountpoint = "none"; };
+    "rpool_albion/srv/jellyfin" = { mountpoint = "/srv/jellyfin"; };
+    "rpool_albion/srv/music" = { mountpoint = "/srv/music"; };
+  };
+
   system.stateVersion = "24.05";
 
 }
diff --git a/hosts/kilgharrah/filesystems.nix b/hosts/kilgharrah/filesystems.nix
index b69c72e..a1d990c 100644
--- a/hosts/kilgharrah/filesystems.nix
+++ b/hosts/kilgharrah/filesystems.nix
@@ -1,12 +1,16 @@
 { config, lib, pkgs, ... }:
 
 {
-  # SSD on board
-
   boot.initrd.luks.devices = {
     "cryptroot".device = "/dev/disk/by-uuid/b414aaba-0a36-4135-a7e1-dc9489286acd";
   };
 
+  environment.etc.crypttab.text = ''
+    albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /root/luks-albion.key
+  '';
+
+  boot.supportedFilesystems = [ "ntfs" ]; # for USB drives
+
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/ad4cbc18-8849-40ed-b0bf-097f8f46346b";
@@ -64,28 +68,4 @@
     device = "/swap/swapfile";
     size = 32 * 1024;
   }];
-
-
-  # HDD in bay
-
-  environment.etc.crypttab.text = ''
-    albion UUID=acda0e7a-069f-47c7-8e37-ec00e7cdde0f /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/jellyfin" = { mountpoint = "/var/lib/jellyfin"; };
-    "rpool_albion/state/navidrome" = { mountpoint = "/var/lib/navidrome"; };
-    "rpool_albion/srv" = { mountpoint = "none"; };
-    "rpool_albion/srv/ftp" = { mountpoint = "/srv/ftp"; };
-    "rpool_albion/srv/jellyfin" = { mountpoint = "/srv/jellyfin"; };
-    "rpool_albion/srv/music" = { mountpoint = "/srv/music"; };
-  };
-
-
-  # Other
-
-  boot.supportedFilesystems = [ "ntfs" ]; # for USB drives
 }
diff --git a/hosts/kilgharrah/ftp.nix b/hosts/kilgharrah/ftp.nix
index 4164679..23fe390 100644
--- a/hosts/kilgharrah/ftp.nix
+++ b/hosts/kilgharrah/ftp.nix
@@ -1,6 +1,11 @@
 { config, lib, pkgs, ... }:
 
 {
+  randomcat.services.zfs.datasets = {
+    "rpool_albion/srv" = { mountpoint = "none"; };
+    "rpool_albion/srv/ftp" = { mountpoint = "/srv/ftp"; };
+  };
+
   age.secrets.ftp-userDb-qenya = {
     # To update this, see the nixos docs for services.vsftpd.userDbPath. Note
     # that the command it gives to create a userDb, if applied to an *existing*
diff --git a/hosts/tohru/default.nix b/hosts/tohru/default.nix
index 8d6f7b2..2a183f5 100644
--- a/hosts/tohru/default.nix
+++ b/hosts/tohru/default.nix
@@ -30,20 +30,7 @@
     "networkmanager" # UI wifi configuration
     "dialout" # access to serial ports
   ];
-  home-manager.users.qenya = { pkgs, ... }: {
-    home.packages = with pkgs; [
-      keepassxc
-      amberol
-      foliate
-      nicotine-plus
-
-      # games
-      openttd
-      prismlauncher
-      nur.repos.qenya.digital-a-love-story
-      nur.repos.qenya.dont-take-it-personally-babe
-    ];
-  };
+  home-manager.users.qenya.imports = [ ./home.nix ];
 
   programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet
   programs.steam.enable = true;
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
new file mode 100644
index 0000000..f1a62ba
--- /dev/null
+++ b/hosts/tohru/home.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    keepassxc
+    amberol
+    foliate
+    nicotine-plus
+
+    # games
+    openttd
+    prismlauncher
+    nur.repos.qenya.digital-a-love-story
+    nur.repos.qenya.dont-take-it-personally-babe
+  ];
+}