diff --git a/users/simon/base.nix b/users/simon/base.nix
index 95a2e3c..21936cc 100644
--- a/users/simon/base.nix
+++ b/users/simon/base.nix
@@ -32,6 +32,7 @@ in
     imports = [
       ./modules/alacritty.nix
       ./modules/ankisyncd.nix
+      ./modules/git.nix
       ./modules/gtk.nix
       ./modules/htop.nix
       ./modules/mpd.nix
diff --git a/users/simon/modules/git.nix b/users/simon/modules/git.nix
new file mode 100644
index 0000000..eded310
--- /dev/null
+++ b/users/simon/modules/git.nix
@@ -0,0 +1,38 @@
+{
+  programs.git = {
+    enable = true;
+    userName = "Simon Bruder";
+    userEmail = "simon@sbruder.de";
+    signing = {
+      key = "51276B7B829AF24674F2AA716F03E0000CC5B62F";
+      signByDefault = true;
+    };
+
+    extraConfig = {
+      core.quotepath = "off";
+      pull.ff = "only";
+    };
+
+    ignores = [
+      "*.swp"
+      ".direnv"
+      "Session.vim"
+    ];
+
+    lfs.enable = true;
+    delta = {
+      enable = true;
+      options = {
+        line-numbers = "true";
+        side-by-side = "true";
+        features = "decorations";
+        syntax-theme = "base16";
+        decorations = {
+          commit-decoration-style = "bold yellow box ul";
+          file-style = "bold yellow ul";
+          file-decoration-style = "none";
+        };
+      };
+    };
+  };
+}