diff --git a/modules/base-minimal.nix b/modules/base-minimal.nix
index c99369e..8e3d095 100644
--- a/modules/base-minimal.nix
+++ b/modules/base-minimal.nix
@@ -5,15 +5,9 @@
     ./btrfsFileSystems.nix
     ./btrfsMounts.nix
 
-    # Shell settings.
-    ./bash.nix # bash settings.
-    ./zsh.nix # zsh as default shell for yoda and root.
-    ./fzf.nix # Fuzzy command history and file search.
-
     # nixpkgs config
-    ./home-manager.nix
     ./nur-and-unstable.nix
-    # Helper
+    # nixpkgs config helper
     ./unfree.nix
   ];
 
diff --git a/modules/base.nix b/modules/base.nix
index f6eeda7..ef88b49 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -12,6 +12,14 @@
     ./dns.nix # Encrypted DNS queries to custom name servers.
     #./dns-unencrypted.nix # Custom name servers.
 
+    # Shell settings.
+    ./bash.nix # bash settings.
+    ./zsh.nix # zsh as default shell for yoda and root.
+    ./fzf.nix # Fuzzy command history and file search.
+
+    # nixpkgs config
+    ./home-manager.nix
+
     # Nix garbage collection.
     ./nix-gc.nix
     # Display contact information during boot.