diff --git a/nixos/hosts/Tibo-NixFat/default.nix b/nixos/hosts/Tibo-NixFat/default.nix
index 10f5546..d96b7e1 100644
--- a/nixos/hosts/Tibo-NixFat/default.nix
+++ b/nixos/hosts/Tibo-NixFat/default.nix
@@ -41,8 +41,9 @@
   };
 
   environment.systemPackages = with pkgs; [
-    zenith-nvidia
+    git
     wget
+    zenith-nvidia
   ];
 
   system.stateVersion = "23.05";
diff --git a/nixos/modules-old/utils/default.nix b/nixos/modules-old/utils/default.nix
index c84130e..cb04b39 100644
--- a/nixos/modules-old/utils/default.nix
+++ b/nixos/modules-old/utils/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
-    ./git
     ./sops
     ./ssh
     ./vim
diff --git a/nixos/modules-old/utils/git/default.nix b/nixos/modules-old/utils/git/default.nix
deleted file mode 100644
index 7910375..0000000
--- a/nixos/modules-old/utils/git/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  home-manager.users.tdpeuter = {
-    programs.git = {
-      enable = true;
-      userName = "Tibo De Peuter";
-      userEmail = "tibo.depeuter@gmail.com";
-      extraConfig = {
-        core.editor = "vim";
-      };
-      ignores = [
-        "*.swp"
-      ];
-      includes = [
-        {
-          condition = "gitdir:~/university/"; # Trailing backslash is necessary!
-          contentSuffix = ".gitconfig";
-          contents = {
-            user.email = "tibo.depeuter@ugent.be";
-          };
-        }
-      ];
-    };
-  };
-}
diff --git a/nixos/modules/users/tdpeuter/default.nix b/nixos/modules/users/tdpeuter/default.nix
index 353f25a..3f9baf4 100644
--- a/nixos/modules/users/tdpeuter/default.nix
+++ b/nixos/modules/users/tdpeuter/default.nix
@@ -58,6 +58,10 @@ in {
             source = ../../../../stow/alacritty/.config/alacritty;
           };
 
+          ".config/git" = lib.mkIf (builtins.elem pkgs.git installedPkgs) {
+            source = ../../../../stow/git/.config/git;
+          };
+
           ".config/mpv" = lib.mkIf (builtins.elem pkgs-unstable.mpv installedPkgs) {
             source = ../../../../stow/mpv/.config/mpv;
           };
diff --git a/stow/git/.config/git/config b/stow/git/.config/git/config
new file mode 100644
index 0000000..85f71f0
--- /dev/null
+++ b/stow/git/.config/git/config
@@ -0,0 +1,17 @@
+[user]
+    name = "Tibo De Peuter"
+    email = "tibo.depeuter@gmail.com"
+
+[core]
+    editor = "vim";
+    excludesFile = "~/.config/git/ignore"
+
+[color]
+    ui = true
+
+[help]
+    autocorrect = 20
+
+[includeIf "gitdir:~/university/"] # Trailing backslash is necessary!
+    path = "~/.config/git/university"
+
diff --git a/stow/git/.config/git/ignore b/stow/git/.config/git/ignore
new file mode 100644
index 0000000..4c5f88a
--- /dev/null
+++ b/stow/git/.config/git/ignore
@@ -0,0 +1,2 @@
+*~
+.*.swp
diff --git a/stow/git/.config/git/university b/stow/git/.config/git/university
new file mode 100644
index 0000000..e0f3026
--- /dev/null
+++ b/stow/git/.config/git/university
@@ -0,0 +1,2 @@
+[user]
+	email = "tibo.depeuter@ugent.be"