diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix
index e2321fa..ec647ef 100644
--- a/hosts/kirk/default.nix
+++ b/hosts/kirk/default.nix
@@ -1,44 +1,34 @@
-{
-  fleetModules,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  imports =
-    fleetModules [
-      "common"
-      "ssh"
-      "ccr"
-      "nix"
-      "networkmanager"
-      "bluetooth"
-      "dbus"
-      "docker"
-      "fonts"
-      "qmk-udev"
-      "mosh"
-      "udisks2"
-      "xdg"
-      "pipewire"
-      "nix-development"
-      "virt-manager"
-      "ssh-initrd"
-      "printing"
-      "pam"
-      "wireguard-client"
-      "greetd"
-      "syncthing"
-      "mount-sisko"
-      "adb"
-      "binfmt"
-      "prometheus-exporters"
-      "promtail"
-      "syncthing"
-    ]
-    ++ [
-      ./disko.nix
-    ];
+{ fleetModules, lib, pkgs, ... }: {
+  imports = fleetModules [
+    "common"
+    "ssh"
+    "ccr"
+    "nix"
+    "networkmanager"
+    "bluetooth"
+    "dbus"
+    "docker"
+    "fonts"
+    "qmk-udev"
+    "mosh"
+    "udisks2"
+    "xdg"
+    "pipewire"
+    "nix-development"
+    "virt-manager"
+    "ssh-initrd"
+    "printing"
+    "pam"
+    "wireguard-client"
+    "greetd"
+    "syncthing"
+    "mount-sisko"
+    "adb"
+    "binfmt"
+    "prometheus-exporters"
+    "promtail"
+    "syncthing"
+  ] ++ [ ./disko.nix ];
 
   ccr = {
     enable = true;
@@ -80,17 +70,11 @@
   };
 
   boot.initrd.kernelModules = [ "i915" ];
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "usb_storage"
-    "sd_mod"
-  ];
-  boot.kernelModules = [
-    "kvm-intel"
-  ];
+  boot.initrd.availableKernelModules =
+    [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
+  boot.kernelModules = [ "kvm-intel" ];
 
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10;
+  boot.kernelPackages = pkgs.linuxPackages;
 
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot = {
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 0501993..3ecc2ef 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -1,51 +1,40 @@
-{
-  fleetModules,
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-{
-  imports =
-    fleetModules [
-      "common"
-      "ssh"
-      "ccr"
-      "nix"
-      "networkmanager"
-      "bluetooth"
-      "dbus"
-      "docker"
-      "fonts"
-      "qmk-udev"
-      "mosh"
-      "udisks2"
-      "xdg"
-      "pipewire"
-      "nix-development"
-      "waydroid"
-      "virt-manager"
-      "ssh-initrd"
-      "printing"
-      "pam"
-      "wireguard-client"
-      "binfmt"
-      "greetd"
-      "syncthing"
-      "hass-poweroff"
-      "forgejo-runners"
-      "teamviewer"
-      "macos-ventura"
-      "sunshine"
-      "mount-sisko"
-      "adb"
-      "guix"
-      "prometheus-exporters"
-      "promtail"
-    ]
-    ++ [
-      ./disko.nix
-    ];
+{ fleetModules, lib, config, pkgs, ... }: {
+  imports = fleetModules [
+    "common"
+    "ssh"
+    "ccr"
+    "nix"
+    "networkmanager"
+    "bluetooth"
+    "dbus"
+    "docker"
+    "fonts"
+    "qmk-udev"
+    "mosh"
+    "udisks2"
+    "xdg"
+    "pipewire"
+    "nix-development"
+    "waydroid"
+    "virt-manager"
+    "ssh-initrd"
+    "printing"
+    "pam"
+    "wireguard-client"
+    "binfmt"
+    "greetd"
+    "syncthing"
+    "hass-poweroff"
+    "forgejo-runners"
+    "teamviewer"
+    "macos-ventura"
+    "sunshine"
+    "mount-sisko"
+    "adb"
+    "guix"
+    "prometheus-exporters"
+    "promtail"
+  ] ++ [ ./disko.nix ];
 
   ccr = {
     enable = true;
@@ -99,13 +88,8 @@
 
   boot.kernelParams = [ "ip=dhcp" ];
   boot.initrd.kernelModules = [ "amdgpu" ];
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usbhid"
-    "r8169"
-  ];
+  boot.initrd.availableKernelModules =
+    [ "nvme" "xhci_pci" "ahci" "usbhid" "r8169" ];
   boot.kernelModules = [
     "kvm-amd"
     "ddcci"
@@ -126,17 +110,17 @@
     }))
   ];
 
-  systemd.services.ddcci = {
-    script = ''
-      echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
-    '';
-    wantedBy = [ "graphical.target" ];
-    restartIfChanged = false;
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = true;
-    };
-  };
+  # systemd.services.ddcci = {
+  #   script = ''
+  #     echo 'ddcci 0x37' > /sys/bus/i2c/devices/i2c-2/new_device
+  #   '';
+  #   wantedBy = [ "graphical.target" ];
+  #   restartIfChanged = false;
+  #   serviceConfig = {
+  #     Type = "oneshot";
+  #     RemainAfterExit = true;
+  #   };
+  # };
 
   boot.loader.efi.canTouchEfiVariables = true;
   boot.loader.systemd-boot = {
@@ -148,13 +132,14 @@
     configurationLimit = 20;
   };
 
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10;
+  boot.kernelPackages = pkgs.linuxPackages;
 
   networking.hostId = "5b02e763";
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   powerManagement.cpuFreqGovernor = lib.mkDefault "schedutil";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.enableRedistributableFirmware = lib.mkDefault true;
 
   hardware.graphics = {