diff --git a/modules/common.nix b/modules/common.nix
index 33512bf..8d7753e 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -12,7 +12,6 @@
     # Install base packages
     aux.system.packages = with pkgs; [
       fastfetch # Show a neat system statistics screen when opening a terminal
-      git-crypt # Secrets management
       htop # System monitor
       zellij # Terminal multiplexer
     ];
diff --git a/modules/system/system.nix b/modules/system/system.nix
index 1e9f48d..4509d8a 100644
--- a/modules/system/system.nix
+++ b/modules/system/system.nix
@@ -28,6 +28,7 @@ in
           dconf
           direnv
           git
+          git-crypt # Secrets management
           gnutar
           gzip
           home-manager
diff --git a/modules/users/aires/default.nix b/modules/users/aires/default.nix
index 53526d1..c7e3233 100644
--- a/modules/users/aires/default.nix
+++ b/modules/users/aires/default.nix
@@ -50,7 +50,6 @@ in
         # Configure home-manager
         home-manager.users.aires = {
           imports = [
-            ../common/home-manager/git-crypt.nix
             ../common/home-manager/gnome.nix
             ../common/home-manager/zsh.nix
           ];
diff --git a/modules/users/common/home-manager/git-crypt.nix b/modules/users/common/home-manager/git-crypt.nix
deleted file mode 100644
index 6fbc4ab..0000000
--- a/modules/users/common/home-manager/git-crypt.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configure Git to support git-crypt
-{ pkgs, ... }:
-{
-  programs.git = {
-    extraConfig = {
-      filter."git-crypt" = {
-        required = true;
-        smudge = "/run/current-system/sw/bin/git-crypt smudge";
-        clean = "/run/current-system/sw/bin/git-crypt clean";
-      };
-      diff."git-crypt" = {
-        textconv = "/run/current-system/sw/bin/git-crypt diff";
-      };
-    };
-  };
-}
diff --git a/modules/users/gremlin/default.nix b/modules/users/gremlin/default.nix
index 444deec..1aa4a12 100644
--- a/modules/users/gremlin/default.nix
+++ b/modules/users/gremlin/default.nix
@@ -51,7 +51,6 @@ in
 
       home-manager.users.gremlin = {
         imports = [
-          ../common/home-manager/git-crypt.nix
           ../common/home-manager/gnome.nix
           ../common/home-manager/zsh.nix
         ];
diff --git a/modules/users/root/default.nix b/modules/users/root/default.nix
index 14b53e1..a8c6062 100644
--- a/modules/users/root/default.nix
+++ b/modules/users/root/default.nix
@@ -2,7 +2,6 @@
 {
   # Give root user access to run remote builds
   home-manager.users.root = {
-    imports = [ ../common/home-manager/git-crypt.nix ];
     home.stateVersion = "24.05";
     programs = {
       git.extraConfig = {