diff --git a/home/iso.nix b/home/iso.nix
index 045bb37..e10150d 100644
--- a/home/iso.nix
+++ b/home/iso.nix
@@ -3,7 +3,6 @@
   # {{{ Imports
   imports = [
     ./global.nix
-    ./features/cli/lazygit.nix
     ./features/desktop/foot.nix
     ./features/wayland/hyprland
   ];
diff --git a/hosts/nixos/common/global/cli/htop.nix b/hosts/nixos/common/global/cli/htop.nix
index eb01bb5..7a62e4c 100644
--- a/hosts/nixos/common/global/cli/htop.nix
+++ b/hosts/nixos/common/global/cli/htop.nix
@@ -1,8 +1,6 @@
 {
   programs.htop = {
     enable = true;
-    settings = {
-      tree_view = true;
-    };
+    settings.tree_view = true;
   };
 }
diff --git a/hosts/nixos/common/global/nix.nix b/hosts/nixos/common/global/nix.nix
index a9f46ce..c175e62 100644
--- a/hosts/nixos/common/global/nix.nix
+++ b/hosts/nixos/common/global/nix.nix
@@ -1,4 +1,11 @@
-{ config, lib, pkgs, inputs, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+{
   nix = {
     # Flake support and whatnot
     package = pkgs.lix;
@@ -43,8 +50,10 @@
       # Deduplicate and optimize nix store
       auto-optimise-store = true;
 
-      # TODO: what is a trusted user?
-      trusted-users = [ "root" "@wheel" ];
+      trusted-users = [
+        "root"
+        "@wheel"
+      ];
     };
   };
 }
diff --git a/hosts/nixos/iso/default.nix b/hosts/nixos/iso/default.nix
index f1a8d1f..d0201eb 100644
--- a/hosts/nixos/iso/default.nix
+++ b/hosts/nixos/iso/default.nix
@@ -2,13 +2,23 @@
 #
 # Can be built with
 # nix build .#nixosConfigurations.iso.config.system.build.isoImage
-{ modulesPath, lib, ... }:
+{
+  modulesPath,
+  inputs,
+  pkgs,
+  ...
+}:
 {
   # {{{ Imports
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
 
-    ../common/global
+    inputs.stylix.nixosModules.stylix
+    inputs.sops-nix.nixosModules.sops
+
+    ../../../common
+    ../common/global/wireless
+    ../common/global/services/openssh.nix
     ../common/users/pilot.nix
     ../common/optional/desktop
     ../common/optional/wayland/hyprland.nix
@@ -25,16 +35,25 @@
     ];
   };
   # }}}
+  # {{{ Nix config
+  nix = {
+    # Flake support and whatnot
+    package = pkgs.lix;
+
+    # Enable flakes and new 'nix' command
+    settings.experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+  };
+  # }}}
 
   # Tell sops-nix to use the hermes keys for decrypting secrets
   sops.age.sshKeyPaths = [ "/hermes/secrets/hermes/ssh_host_ed25519_key" ];
 
-  # Override tailscale service enabled by the `global/default.nix` file
-  services.tailscale.enable = lib.mkForce false;
+  # Set username
+  satellite.pilot.name = "moon";
 
   # Fast but bad compression
   # isoImage.squashfsCompression = "gzip -Xcompression-level 1";
-
-  # Set username
-  satellite.pilot.name = "moon";
 }