kilgharrah: move all zfs dataset declarations to one place

hosts/kilgharrah/default.nix

@@ -44,17 +44,6 @@
     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";
 
 }

hosts/kilgharrah/filesystems.nix

@@ -1,16 +1,12 @@
 { 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";
@@ -68,4 +64,28 @@
     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
 }

hosts/kilgharrah/ftp.nix

@@ -1,11 +1,6 @@
 { 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*

hosts/tohru/default.nix

@@ -30,7 +30,20 @@
     "networkmanager" # UI wifi configuration
     "dialout" # access to serial ports
   ];
-  home-manager.users.qenya.imports = [ ./home.nix ];
+  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
+    ];
+  };
 
   programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet
   programs.steam.enable = true;

hosts/tohru/home.nix

@@ -1,16 +0,0 @@
-{ 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
-  ];
-}