diff --git a/hosts/yodaGaming/configuration.nix b/hosts/yodaGaming/configuration.nix
index 55642a1..7eb8e3b 100644
--- a/hosts/yodaGaming/configuration.nix
+++ b/hosts/yodaGaming/configuration.nix
@@ -5,9 +5,6 @@
       ./hardware-configuration.nix
       #../../modules/gpu-amd.nix
 
-      ../../modules/home-manager.nix
-      ../../modules/nur-and-unstable.nix
-      ../../modules/unfree.nix
       ../../modules/base.nix
       ../../modules/base-bios-grub.nix
       ../../modules/power-management.nix
diff --git a/hosts/yodaHedgehog/configuration.nix b/hosts/yodaHedgehog/configuration.nix
index 485e95f..5a146ce 100644
--- a/hosts/yodaHedgehog/configuration.nix
+++ b/hosts/yodaHedgehog/configuration.nix
@@ -4,9 +4,6 @@
     [
       ./hardware-configuration.nix
       ./host-specific.nix
-      ../../modules/home-manager.nix
-      ../../modules/nur-and-unstable.nix
-      ../../modules/unfree.nix
       ../../modules/base.nix
       ../../modules/base-efi-systemd.nix
       ../../modules/headless.nix
diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index ddf9681..62e01ee 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -4,9 +4,7 @@
     [
       ./hardware-configuration.nix
       ./host-specific.nix
-      ../../modules/home-manager.nix
-      ../../modules/nur-and-unstable.nix
-      ../../modules/unfree.nix
+
       ../../modules/base.nix
       ../../modules/base-efi-systemd.nix
       ../../modules/headless.nix
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 0413bfc..cb10afb 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -4,9 +4,6 @@
     [
       ./hardware-configuration.nix
 
-      ../../modules/home-manager.nix
-      ../../modules/nur-and-unstable.nix
-      ../../modules/unfree.nix
       ../../modules/base.nix
       ../../modules/base-efi-systemd.nix
       ../../modules/xdg.nix
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index 346e421..3922c88 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -23,9 +23,8 @@
       #   - `reboot`
       # - Related: https://unix.stackexchange.com/a/667997
 
-      ../../modules/home-manager.nix
-      ../../modules/nur-and-unstable.nix
-      ../../modules/unfree.nix
+      #./benchmark.nix
+
       ../../modules/base.nix
       ../../modules/base-efi-systemd.nix
       ../../modules/xdg.nix
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index 380e545..c19cc32 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -4,9 +4,6 @@
     [
       ./hardware-configuration.nix
       ./host-specific.nix
-      ../../modules/home-manager.nix
-      ../../modules/nur-and-unstable.nix
-      ../../modules/unfree.nix
       ../../modules/base.nix
       ../../modules/base-efi-systemd.nix
       ../../modules/headless.nix
diff --git a/modules/base.nix b/modules/base.nix
index c313ca5..ebf1f51 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -16,6 +16,12 @@
     ./dns.nix # Encrypted DNS queries to custom name servers.
     #./dns-unencrypted.nix # Custom name servers.
 
+    # nixpkgs config
+    ./home-manager.nix
+    ./nur-and-unstable.nix
+    # Helper
+    ./unfree.nix
+
     # Nix garbage collection.
     ./nix-gc.nix
     # Display contact information during boot.