diff --git a/modules/base/base.nix b/modules/base/base.nix
index f5d26b0..3e27fed 100644
--- a/modules/base/base.nix
+++ b/modules/base/base.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+{ inputs, config, ... }: {
   flake.nixosModules.base = {
     imports = with inputs.self.nixosModules; [
       boot
@@ -14,4 +14,11 @@
       zsh
     ];
   };
+
+  flake.homeManagerModules.base = { ... }: {
+    imports = with config.flake.homeManagerModules; [
+      git
+      zsh
+    ];
+  };
 }
diff --git a/modules/base/git/git.nix b/modules/base/git/git.nix
new file mode 100644
index 0000000..2edd43d
--- /dev/null
+++ b/modules/base/git/git.nix
@@ -0,0 +1,13 @@
+{ inputs, ... }: {
+  flake.homeManagerModules.git = { user, fullname, ... }: {
+    programs.git = {
+      enable = true;
+      userName = fullname;
+      userEmail = "${user}@chrayed.de";
+      extraConfig = {
+        init.defaultBranch = "main";
+        core.editor = "nano";
+      };
+    };
+  };
+}
diff --git a/modules/base/zsh/dotfiles/zsh-config b/modules/base/zsh/dotfiles/zsh-config
new file mode 100644
index 0000000..e69de29
diff --git a/modules/base/zsh/zsh.nix b/modules/base/zsh/zsh.nix
index b04410a..c792c51 100644
--- a/modules/base/zsh/zsh.nix
+++ b/modules/base/zsh/zsh.nix
@@ -1,5 +1,5 @@
 { ... }: {
-  flake.nixosModules.zsh = {pkgs, ... }:{
+  flake.nixosModules.zsh = { pkgs, ... }: {
     programs.zsh.enable = true;
     programs.zsh.enableCompletion = true;
     programs.zsh.syntaxHighlighting.enable = true;
@@ -7,6 +7,10 @@
     programs.zsh.autosuggestions.async = true;
     programs.zsh.ohMyZsh.enable = true;
     programs.zsh.ohMyZsh.theme = "agnoster";
-    users.defaultUserShell = pkgs.zsh;    
+    users.defaultUserShell = pkgs.zsh;
+  };
+
+  flake.homeManagerModules.zsh = { ... }: {
+    home.file.".zshrc".source = ./dotfiles/zsh-config;
   };
 }