diff --git a/common/default.nix b/common/default.nix
index 81a7423..aed2093 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -4,12 +4,12 @@
     ./base-server
     ./users
     ./boot.nix
+    ./environment.nix
     ./home-manager.nix
     ./misc.nix
     ./nginx.nix
     ./nix.nix
     ./openssh.nix
-    ./packages.nix
     ./sanoid.nix
     ./security.nix
     ./steam.nix
diff --git a/common/packages.nix b/common/environment.nix
similarity index 84%
rename from common/packages.nix
rename to common/environment.nix
index 8b46129..08e3fc4 100644
--- a/common/packages.nix
+++ b/common/environment.nix
@@ -4,12 +4,9 @@
   environment.systemPackages = with pkgs; [
     btop
     git
-    wget
-
-    # hardware troubleshooting
     lshw
     parted
-    smartmontools
+    wget
 
     # network troubleshooting
     inetutils
diff --git a/home/qenya/packages.nix b/home/qenya/packages.nix
index c7cbec5..125f7ba 100644
--- a/home/qenya/packages.nix
+++ b/home/qenya/packages.nix
@@ -6,8 +6,6 @@ let
 in
 {
   home.packages = with pkgs; [
-    eza # like `ls` but fancier
-    hexyl # like `xxd` but cooler
     tree # like `ls -R` but nicer
     units
     zip unzip
diff --git a/hosts/kilgharrah/backup.nix b/hosts/kilgharrah/backup.nix
index efa72f9..370d9ee 100644
--- a/hosts/kilgharrah/backup.nix
+++ b/hosts/kilgharrah/backup.nix
@@ -1,8 +1,9 @@
 { config, lib, pkgs, ... }:
 
 {
-  services.sanoid.datasets."rpool_albion/state" = {
-    useTemplate = [ "production" ];
-    recursive = "zfs";
-  };
+  # FIXME: failing drive
+  # 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 63e6840..e07b21e 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -9,7 +9,8 @@ in
     ./filesystems.nix
     ./hardware.nix
     ./networking.nix
-    ./ftp.nix
+    # FIXME: failing drive
+    # ./ftp.nix
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
@@ -48,20 +49,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 dbafb05..0cad432 100644
--- a/hosts/kilgharrah/filesystems.nix
+++ b/hosts/kilgharrah/filesystems.nix
@@ -67,24 +67,25 @@
 
 
   # HDD in bay
+  # FIXME: failing drive
 
-  environment.etc.crypttab.text = ''
-    albion UUID=8a924f24-9b65-4f05-aeda-5b4080cc7aa1 /root/luks-albion.key
-  '';
+  # 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/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