diff --git a/hosts/yodaTab/home-manager.nix b/hosts/yodaTab/home-manager.nix
index aa635c3..b491396 100644
--- a/hosts/yodaTab/home-manager.nix
+++ b/hosts/yodaTab/home-manager.nix
@@ -6,37 +6,10 @@ in
 {
   imports = [
     (import "${home-manager}/nixos")
+    ../../modules/base.home.nix
     ../../modules/git.home.nix
     ../../modules/zsh.home.nix
     # TODO
     #../../modules/nitrokey-ssh-gpg.home.nix
   ];
-
-  /* Enable home-manager to configure GNOME */
-  programs.dconf.enable = true;
-
-  home-manager.users.yoda = {
-    /* The home.stateVersion option does not have a default and must be set */
-    /* https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion */
-    home.stateVersion = "23.05";
-
-    /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */
-
-    #home.username = "yoda";
-    #home.homeDirectory = "/home/yoda";
-
-    #services.gpg-agent = {
-    #  enable = true;
-    #  enableSshSupport = true;
-    #  defaultCacheTtl = 1800;
-    #};
-
-# TODO: See history.path below.
-#    xdg = {
-#      enable = true;
-#      #dataHome = "${config.xdg.home.homeDirectory}/.local/share";
-#    };
-
-
-  };
 }
diff --git a/modules/base.home.nix b/modules/base.home.nix
new file mode 100644
index 0000000..24e8d5e
--- /dev/null
+++ b/modules/base.home.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+{
+  /* Enable home-manager to configure GNOME */
+  programs.dconf.enable = true;
+
+  home-manager.users.yoda = {
+    /* The home.stateVersion option does not have a default and must be set */
+    /* https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion */
+    home.stateVersion = "23.05";
+
+    /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */
+
+    #home.username = "yoda";
+    #home.homeDirectory = "/home/yoda";
+
+# TODO: See history.path in zsh module.
+#    xdg = {
+#      enable = true;
+#      #dataHome = "${config.xdg.home.homeDirectory}/.local/share";
+#    };
+
+  };
+}