diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix
index aaf03b0..272dd30 100644
--- a/hosts/kirk/default.nix
+++ b/hosts/kirk/default.nix
@@ -1,7 +1,7 @@
 {
   fleetModules,
   lib,
-  config,
+  pkgs,
   ...
 }:
 {
@@ -27,13 +27,13 @@
       "printing"
       "pam"
       "wireguard-client"
-      "restic"
       "greetd"
       "syncthing"
-      "mount-rock5b"
+      "mount-sisko"
       "adb"
       "binfmt"
       "prometheus-exporters"
+      "promtail"
       "syncthing"
     ]
     ++ [
@@ -72,6 +72,9 @@
       "zathura"
       "imv"
       "catppuccin"
+      "libreoffice"
+      "logseq"
+      "emacs"
     ];
     extraGroups = [ ];
     backupPaths = [ ];
@@ -88,7 +91,7 @@
     "kvm-intel"
   ];
 
-  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10;
 
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot = {
@@ -102,8 +105,13 @@
   powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil";
   hardware.enableRedistributableFirmware = lib.mkDefault true;
 
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
+  };
+
+  zramSwap = {
+    enable = true;
+    algorithm = "zstd";
   };
 }
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index c4128f7..faa6571 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -31,13 +31,13 @@
       "wireguard-client"
       "binfmt"
       "greetd"
-      # "syncthing"
+      "syncthing"
       "hass-poweroff"
       "forgejo-runners"
       "teamviewer"
       "macos-ventura"
       "sunshine"
-      "mount-rock5b"
+      "mount-sisko"
       "adb"
       "guix"
       "prometheus-exporters"
@@ -91,6 +91,7 @@
       "imv"
       "libreoffice"
       "logseq"
+      "emacs"
     ];
     extraGroups = [ ];
     backupPaths = [ ];
diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix
index 9e97a42..6295c63 100644
--- a/hosts/sisko/default.nix
+++ b/hosts/sisko/default.nix
@@ -15,10 +15,10 @@
       "home-assistant"
       "adguard-home"
       "cloudflare-dyndns"
-      "rock5b-proxy"
+      "sisko-proxy"
       "invidious"
       "searx"
-      "rock5b-samba"
+      "sisko-nfs"
       "forgejo"
       "prometheus"
       "grafana"
@@ -30,6 +30,7 @@
       "atuin"
       "immich"
       "paperless"
+      "syncthing"
     ]
     ++ [
       ./disko.nix