diff --git a/hosts/gpdPocket3/configuration.nix b/hosts/gpdPocket3/configuration.nix
index 55e9fca..5a31361 100644
--- a/hosts/gpdPocket3/configuration.nix
+++ b/hosts/gpdPocket3/configuration.nix
@@ -1,22 +1,27 @@
-{ config, lib, pkgs, settings, ... } @ args:
 {
-  imports =
-    [
-      # TODO revisit
-      (settings.hostsDir + "/_common/components/neovim.nix")
-      # Common components this machine uses
-      (settings.hostsDir + "/_common/components/systemd_boot.nix")
-      (settings.hostsDir + "/_common/components/ssh.nix")
-      (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
-      (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix")
-      (settings.hostsDir + "/_common/components/home_manager.nix")
-      (settings.hostsDir + "/_common/components/gnome_wayland.nix")
-      # Users this machine has
-      (settings.usersDir + "/root/configuration.nix")
-      (settings.usersDir + "/josh/configuration.nix")
-      # Our custom stuff
-      ./stupid-keyboard.nix
-    ];
+  config,
+  lib,
+  pkgs,
+  settings,
+  ...
+}@args:
+{
+  imports = [
+    # Common components this machine uses
+    (settings.hostsDir + "/_common/components/neovim.nix")
+    (settings.hostsDir + "/_common/components/systemd_boot.nix")
+    (settings.hostsDir + "/_common/components/ssh.nix")
+    (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
+    (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix")
+    (settings.hostsDir + "/_common/components/home_manager.nix")
+    (settings.hostsDir + "/_common/components/gnome_wayland.nix")
+    (settings.hostsDir + "/_common/components/nebula.nix")
+    # Users this machine has
+    (settings.usersDir + "/root/configuration.nix")
+    (settings.usersDir + "/josh/configuration.nix")
+    # Our custom stuff
+    ./stupid-keyboard.nix
+  ];
 
   # machine specific configuration
   # ==============================
@@ -68,7 +73,12 @@
     "mem_sleep_default=s2idel"
   ];
   boot.kernelModules = [ "btusb" ];
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "thunderbolt" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "usbhid"
+    "thunderbolt"
+  ];
   services.xserver.videoDrivers = [ "intel" ];
   hardware.opengl = {
     enable = true;
@@ -81,9 +91,10 @@
   # Stuff from https://github.com/NixOS/nixos-hardware/blob/9a763a7acc4cfbb8603bb0231fec3eda864f81c0/gpd/pocket-3/default.nix
   services.fstrim.enable = true;
   services.xserver.libinput.enable = true;
-  services.tlp.enable = lib.mkDefault ((lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
-    || !config.services.power-profiles-daemon.enable);
-
+  services.tlp.enable = lib.mkDefault (
+    (lib.versionOlder (lib.versions.majorMinor lib.version) "21.05")
+    || !config.services.power-profiles-daemon.enable
+  );
 
   # KVM module video
 
diff --git a/hosts/h002/configuration.nix b/hosts/h002/configuration.nix
index 93c29c2..12ff7ed 100644
--- a/hosts/h002/configuration.nix
+++ b/hosts/h002/configuration.nix
@@ -1,22 +1,28 @@
-{ config, lib, pkgs, settings, ... } @ args:
 {
-  imports =
-    [
-      (settings.hostsDir + "/_common/components/neovim.nix")
-      # Common components this machine uses
-      (settings.hostsDir + "/_common/components/ssh.nix")
-      (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
-     # (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix")
-      (settings.hostsDir + "/_common/components/home_manager.nix")
-     # (settings.hostsDir + "/_common/components/gnome_xorg.nix")
-      (settings.hostsDir + "/_common/components/docker.nix")
-      # Users this machine has
+  config,
+  lib,
+  pkgs,
+  settings,
+  ...
+}@args:
+{
+  imports = [
+    # Common components this machine uses
+    (settings.hostsDir + "/_common/components/neovim.nix")
+    (settings.hostsDir + "/_common/components/ssh.nix")
+    (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
+    (settings.hostsDir + "/_common/components/home_manager.nix")
+    (settings.hostsDir + "/_common/components/docker.nix")
+    (settings.hostsDir + "/_common/components/nebula.nix")
+    # Users this machine has
+    (settings.usersDir + "/root/configuration.nix")
+    (settings.usersDir + "/luser/configuration.nix")
+  ];
 
-      (settings.usersDir + "/root/configuration.nix")
-      (settings.usersDir + "/luser/configuration.nix")
-    ];
-
-boot.loader.grub = { enable = true; device = "/dev/sdb" ; };
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sdb";
+  };
 
   # machine specific configuration
   # ==============================
@@ -46,33 +52,33 @@ boot.loader.grub = { enable = true; device = "/dev/sdb" ; };
   # Load nvidia driver for Xorg and Wayland
   #services.xserver.videoDrivers = [ "nvidia" ];
   #hardware.nvidia = {
-    # Modesetting is required.
+  # Modesetting is required.
   #  modesetting.enable = true;
 
-    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-    # Enable this if you have graphical corruption issues or application crashes after waking
-    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead 
-    # of just the bare essentials.
+  # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+  # Enable this if you have graphical corruption issues or application crashes after waking
+  # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead 
+  # of just the bare essentials.
   #  powerManagement.enable = false;
 
-    # Fine-grained power management. Turns off GPU when not in use.
-    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+  # Fine-grained power management. Turns off GPU when not in use.
+  # Experimental and only works on modern Nvidia GPUs (Turing or newer).
   #  powerManagement.finegrained = false;
 
-    # Use the NVidia open source kernel module (not to be confused with the
-    # independent third-party "nouveau" open source driver).
-    # Support is limited to the Turing and later architectures. Full list of 
-    # supported GPUs is at: 
-    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
-    # Only available from driver 515.43.04+
-    # Currently alpha-quality/buggy, so false is currently the recommended setting.
+  # Use the NVidia open source kernel module (not to be confused with the
+  # independent third-party "nouveau" open source driver).
+  # Support is limited to the Turing and later architectures. Full list of 
+  # supported GPUs is at: 
+  # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
+  # Only available from driver 515.43.04+
+  # Currently alpha-quality/buggy, so false is currently the recommended setting.
   #  open = false;
 
-    # Enable the Nvidia settings menu,
-    # accessible via `nvidia-settings`.
+  # Enable the Nvidia settings menu,
+  # accessible via `nvidia-settings`.
   #  nvidiaSettings = true;
 
-    # Optionally, you may need to select the appropriate driver version for your specific GPU.
+  # Optionally, you may need to select the appropriate driver version for your specific GPU.
   #  package = config.boot.kernelPackages.nvidiaPackages.stable;
- # };
+  # };
 }
diff --git a/hosts/joe/configuration.nix b/hosts/joe/configuration.nix
index d7f07b8..b2fb302 100644
--- a/hosts/joe/configuration.nix
+++ b/hosts/joe/configuration.nix
@@ -1,21 +1,26 @@
-{ config, lib, pkgs, settings, ... } @ args:
 {
-  imports =
-    [
-      (settings.hostsDir + "/_common/components/neovim.nix")
-      # Common components this machine uses
-      (settings.hostsDir + "/_common/components/systemd_boot.nix")
-      (settings.hostsDir + "/_common/components/ssh.nix")
-      (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
-      (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix")
-      (settings.hostsDir + "/_common/components/home_manager.nix")
-      (settings.hostsDir + "/_common/components/gnome_xorg.nix")
-      (settings.hostsDir + "/_common/components/docker.nix")
-      (settings.hostsDir + "/_common/components/nebula.nix")
-      # Users this machine has
-      (settings.usersDir + "/root/configuration.nix")
-      (settings.usersDir + "/josh/configuration.nix")
-    ];
+  config,
+  lib,
+  pkgs,
+  settings,
+  ...
+}@args:
+{
+  imports = [
+    # Common components this machine uses
+    (settings.hostsDir + "/_common/components/neovim.nix")
+    (settings.hostsDir + "/_common/components/systemd_boot.nix")
+    (settings.hostsDir + "/_common/components/ssh.nix")
+    (settings.hostsDir + "/_common/components/caps_to_escape_in_tty.nix")
+    (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix")
+    (settings.hostsDir + "/_common/components/home_manager.nix")
+    (settings.hostsDir + "/_common/components/gnome_xorg.nix")
+    (settings.hostsDir + "/_common/components/docker.nix")
+    (settings.hostsDir + "/_common/components/nebula.nix")
+    # Users this machine has
+    (settings.usersDir + "/root/configuration.nix")
+    (settings.usersDir + "/josh/configuration.nix")
+  ];
 
   # machine specific configuration
   # ==============================