diff --git a/home-manager/default.nix b/home-manager/default.nix
index 0f82d9e..0ef0002 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -14,6 +14,7 @@ in
       modules/neovim.nix
       modules/vscode.nix
       modules/sway.nix
+      modules/git.nix
     ] ++ lib.optionals (config.networking.hostName == "jimbo") [
       modules/kanshi.nix
     ];
diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix
new file mode 100644
index 0000000..bc122de
--- /dev/null
+++ b/home-manager/modules/git.nix
@@ -0,0 +1,29 @@
+{
+programs.git = {
+  enable = true;
+  ignores = [".vscode"];
+  userName = "fleaz";
+  userEmail = "mail@felixbreidenstein.de";
+  aliases = {
+    cpr = "!f() { git fetch origin refs/pull/$1/head && git checkout FETCH_HEAD; }; f";
+  };
+  includes = [{
+    condition = "gitdir:~/codemonauts/";
+    contents = {
+      user = {
+        email = "felix@codemonauts.com";
+	name = "Felix Breidenstein";
+      };
+    };
+  }
+  {
+    condition = "gitdir:~/kundendaten/";
+    contents = {
+      user = {
+        email = "felix@codemonauts.com";
+	name = "Felix Breidenstein";
+      };
+    };
+  }];
+};
+}