diff --git a/config/basic/home-manager.nix b/config/basic/home-manager.nix
index dfe9a2e..af56e21 100644
--- a/config/basic/home-manager.nix
+++ b/config/basic/home-manager.nix
@@ -3,6 +3,7 @@
   inputs,
   pkgs,
   nodes,
+  minimal,
   ...
 }:
 {
@@ -15,7 +16,7 @@
     useUserPackages = true;
     verbose = true;
     extraSpecialArgs = {
-      inherit nodes;
+      inherit nodes minimal;
       spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
     };
     sharedModules = [
diff --git a/config/basic/system.nix b/config/basic/system.nix
index 0098ffd..d2db6ab 100644
--- a/config/basic/system.nix
+++ b/config/basic/system.nix
@@ -62,7 +62,6 @@
     fd
     kitty.terminfo
     nvd
-    htop
     unzip
     # fix pcscd
     pcscliteWithPolkit.out
diff --git a/config/hardware/physical.nix b/config/hardware/physical.nix
index 29558d3..fa34390 100644
--- a/config/hardware/physical.nix
+++ b/config/hardware/physical.nix
@@ -1,14 +1,19 @@
 # Configuration for actual physical machines
-{ config, ... }:
 {
-  hardware = {
+  config,
+  minimal,
+  lib,
+  ...
+}:
+{
+  hardware = lib.mkIf (!minimal) {
     enableRedistributableFirmware = true;
     enableAllFirmware = true;
   };
 
   services = {
-    fwupd.enable = true;
-    smartd.enable = true;
+    fwupd.enable = !minimal;
+    smartd.enable = !minimal;
     thermald.enable = builtins.elem config.nixpkgs.hostPlatform.system [ "x86_64-linux" ];
   };
 }
diff --git a/hosts/testienix/default.nix b/hosts/testienix/default.nix
index 844cae9..1d330dd 100644
--- a/hosts/testienix/default.nix
+++ b/hosts/testienix/default.nix
@@ -15,11 +15,9 @@
     ../../config/hardware/physical.nix
     ../../config/optional/zfs.nix
 
-    ../../config/services/octoprint.nix
-
     ./net.nix
     ./fs.nix
-  ] ++ lib.lists.optionals (!minimal) [ ];
+  ] ++ lib.lists.optionals (!minimal) [ ../../config/services/octoprint.nix ];
   services.xserver.xkb = {
     layout = "de";
   };
diff --git a/hosts/testienix/secrets/host.pub b/hosts/testienix/secrets/host.pub
index 15c505b..705773e 100644
--- a/hosts/testienix/secrets/host.pub
+++ b/hosts/testienix/secrets/host.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGXcDQbZKe8mcPj7ZqAcNrbVbXCW4po+A004yMjauQjD
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMTiFpqpCiJaFOcSjFrJWk7YPBiZLwoJRbyy1JgZWFmN
diff --git a/users/common/default.nix b/users/common/default.nix
index 2a74056..7e23a2e 100644
--- a/users/common/default.nix
+++ b/users/common/default.nix
@@ -1,11 +1,11 @@
+{ minimal, lib, ... }:
 {
   imports = [
     ./shells/alias.nix
     ./shells/zsh
 
     ./programs/gpg.nix
-    ./programs/htop.nix
-  ];
+  ] ++ lib.optional (!minimal) ./programs/htop.nix;
 
   programs.bat.enable = true;
   nixpkgs.config = {