diff --git a/modules/home/base/default.nix b/modules/home/base/default.nix
index a811294..5127f97 100644
--- a/modules/home/base/default.nix
+++ b/modules/home/base/default.nix
@@ -1,8 +1,15 @@
-{ namespace, lib, ... }:
+{
+  lib,
+  namespace,
+  pkgs,
+  ...
+}:
 let
   inherit (lib.${namespace}) enabled;
 in
 {
+  # Anything in this folder should not include an enable/disable option. This is
+  # the only folder that is always applied.
   config = {
     ${namespace}.my = {
       name = "marley";
@@ -11,6 +18,18 @@ in
       email = "marley@punkfairie.net";
     };
 
+    # Tell nix what version it is.
+    nix.package = pkgs.nix;
+
+    home.language.base = "en_US.UTF-8";
+
     programs.home-manager = enabled;
+
+    # Autostart wanted systemd services.
+    systemd.user.startServices = true;
+
+    imports = [
+      ./nix.nix
+    ];
   };
 }
diff --git a/modules/home/base/nix.nix b/modules/home/base/nix.nix
new file mode 100644
index 0000000..9c7497b
--- /dev/null
+++ b/modules/home/base/nix.nix
@@ -0,0 +1,21 @@
+{ _ }:
+{
+  config = {
+    nix = {
+      # Enable flakes.
+      settings.experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+
+      # Disable that annoying "git tree is dirty" warning.
+      extraOptions = ''
+        warn-dirty = false
+      '';
+
+      # Garbage collection.
+      gc.automatic = true;
+    };
+
+  };
+}
diff --git a/old/home/default.nix b/old/home/default.nix
deleted file mode 100644
index 5d88d9e..0000000
--- a/old/home/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}:
-{
-  me = {
-    username = "punkfairie";
-    email = "marley@punkfairie.net";
-  };
-
-  targets.genericLinux.enable = lib.mkIf pkgs.stdenv.isLinux true;
-
-  home.language.base = "en_US.UTF-8";
-
-  # Tell nix what version it is.
-  nix.package = pkgs.nix;
-
-  nix = {
-    # Enable flakes.
-    settings.experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-
-    # Disable that annoying "git tree is dirty" warning.
-    extraOptions = ''
-      warn-dirty = false
-    '';
-
-    # Garbage collection.
-    gc.automatic = true;
-  };
-
-  xdg.configFile."nixpkgs/config.nix".text = # nix
-    ''
-      {
-        allowUnfree = true;
-      }
-    '';
-
-  # Autostart wanted systemd services.
-  systemd.user.startServices = true;
-
-  imports = [
-    ./appearance
-    ./languages
-    ./profile
-    ./programs
-    ./services
-    ./xorg
-  ];
-
-  # This value determines the Home Manager release that your configuration is
-  # compatible with. This helps avoid breakage when a new Home Manager release
-  # introduces backwards incompatible changes.
-  #
-  # You should not change this value, even if you update Home Manager. If you do
-  # want to update the value, then make sure to first check the Home Manager
-  # release notes.
-  # home.stateVersion = "24.05"; # Please read the comment before changing.
-  # ((this is set in flake.nix but I wanted to keep the explanation here.))
-
-  # Let home Manager install and manage itself.
-  programs.home-manager.enable = true;
-}