diff --git a/nixos/modules/utils/default.nix b/nixos/modules/utils/default.nix
index b869b10..68d5e14 100644
--- a/nixos/modules/utils/default.nix
+++ b/nixos/modules/utils/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./git
     ./mpv
     ./sops
     ./ssh
@@ -12,7 +13,6 @@
     home.packages = with pkgs; [
       direnv
       duf
-      git-crypt
       lynx
       nsxiv
       w3m
@@ -25,21 +25,6 @@
         enable = true;
         nix-direnv.enable = true;
       };
-
-      git = {
-        enable = true;
-        userName = "tdpeuter";
-        userEmail = "tibo.depeuter@gmail.com";
-        extraConfig = {
-          core.editor = "vim";
-        };
-        includes = [
-          {
-            path = "~/.gitconfig-ugent";
-            condition = "gitdir:~/Nextcloud/Documenten/UGent";
-          }
-        ];
-      };
     };
   };
 }
diff --git a/nixos/modules/utils/git/default.nix b/nixos/modules/utils/git/default.nix
new file mode 100644
index 0000000..0f4be64
--- /dev/null
+++ b/nixos/modules/utils/git/default.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home-manager.users.tdpeuter = {
+    programs.git = {
+      enable = true;
+      userName = "tdpeuter";
+      userEmail = "tibo.depeuter@gmail.com";
+      extraConfig = {
+        core.editor = "vim";
+      };
+      ignores = [
+        "*.swp"
+      ];
+      includes = [
+        {
+          path = "~/.gitconfig-ugent";
+          condition = "gitdir:~/Nextcloud/Documenten/UGent";
+        }
+      ];
+    };
+  };
+}