6 files changed, 23 insertions, 16 deletions
diff --git a/hosts/apzu/hardware/default.nix b/hosts/apzu/hardware/default.nix
index 137b2d02..a208c94c 100644
--- a/hosts/apzu/hardware/default.nix
+++ b/hosts/apzu/hardware/default.nix
@@ -8,6 +8,7 @@
   nixpkgs.hostPlatform = "x86_64-linux";
 
   soispha.disks = {
+    enable = true;
     disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1";
     ssd = true;
     swap = {
diff --git a/hosts/isimud/default.nix b/hosts/isimud/default.nix
index 8c5387ef..ec4e623c 100644
--- a/hosts/isimud/default.nix
+++ b/hosts/isimud/default.nix
@@ -2,18 +2,20 @@
   imports = [
     ./hardware
     ./networking.nix
+    ../../system
   ];
 
-  console = {
-    keyMap = "dvorak";
-  };
-
-  # enable gnome
-  services.xserver = {
-    enable = true;
-    layout = "dvorak";
-    displayManager.gdm.enable = true;
-    desktopManager.gnome.enable = true;
+  soispha = {
+    locale = {
+      enable = true;
+      keyMap = "dvorak";
+    };
+    fs.backup = {
+      enable = false;
+    };
+    users = {
+      hashedPassword = "$y$jFT$YvneNBxEtbrysV2OMG0X30$eKHdzZxJkjD3pXuGOuqbnTaeym5.4ik6kxhE.rJxs3.";
+    };
   };
 
   system.stateVersion = "23.05";
diff --git a/hosts/isimud/hardware/default.nix b/hosts/isimud/hardware/default.nix
index da4ded8d..f55365b3 100644
--- a/hosts/isimud/hardware/default.nix
+++ b/hosts/isimud/hardware/default.nix
@@ -13,9 +13,12 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
+  soispha.disks = {
+    enable = false;
+  };
+
   boot = {
     kernelModules = [];
-    kernelPackages = pkgs.linuxPackages_6_1; # use this kernel, as it's supported by zfs
-    zfs.enableUnstable = true; # Default zfs is "broken" (to nixos) on the newest kernel
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_6_1; # use this kernel, as it's supported by zfs
   };
 }
diff --git a/hosts/isimud/networking.nix b/hosts/isimud/networking.nix
index 3dfd7e84..58c84ee5 100644
--- a/hosts/isimud/networking.nix
+++ b/hosts/isimud/networking.nix
@@ -1,7 +1,4 @@
-{
-  lib,
-  ...
-}: {
+{lib, ...}: {
   # Disable networking
   networking.useDHCP = lib.mkForce false;
   networking.interfaces = lib.mkForce {};
diff --git a/hosts/tiamat/default.nix b/hosts/tiamat/default.nix
index 73c04606..3aa291c2 100644
--- a/hosts/tiamat/default.nix
+++ b/hosts/tiamat/default.nix
@@ -7,6 +7,9 @@
   ];
 
   soispha = {
+    services.steam = {
+      enable = true;
+    };
     locale = {
       enable = true;
       keyMap = "us";
diff --git a/hosts/tiamat/hardware/default.nix b/hosts/tiamat/hardware/default.nix
index dd0dd7d9..95a3ce43 100644
--- a/hosts/tiamat/hardware/default.nix
+++ b/hosts/tiamat/hardware/default.nix
@@ -8,6 +8,7 @@
   nixpkgs.hostPlatform = "x86_64-linux";
 
   soispha.disks = {
+    enable = true;
     disk = "/dev/disk/by-id/nvme-CT1000P5SSD8_21032C857568";
     ssd = true;
     swap = {