diff --git a/hosts/marpa/configuration.nix b/hosts/marpa/configuration.nix
index 73355be..3ddac04 100644
--- a/hosts/marpa/configuration.nix
+++ b/hosts/marpa/configuration.nix
@@ -8,9 +8,9 @@
     inputs.sops-nix.nixosModules.sops
     ./system/hardware-configuration.nix
     ./services
-    ../../modules/system.nix
-    ../../modules/sops.nix
     ../../modules/opentablet.nix
+    ../../modules/sops.nix
+    ../../modules/system.nix
     ../../programs/flatpak.nix
     ../../programs/hyprland.nix
     ../../programs/steam.nix
diff --git a/users/modules/default.nix b/users/modules/default.nix
index 22985a0..a1696e2 100644
--- a/users/modules/default.nix
+++ b/users/modules/default.nix
@@ -5,6 +5,7 @@
     ./btop.nix
     ./direnv.nix
     ./eza.nix
+    ./gpg.nix
     ./mopidy.nix
     ./nh.nix
     ./nix-index.nix
diff --git a/users/modules/gpg.nix b/users/modules/gpg.nix
new file mode 100644
index 0000000..8506b74
--- /dev/null
+++ b/users/modules/gpg.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}:{
+  programs.gpg = {
+    enable = true;
+    mutableKeys = true;
+    mutableTrust = true;
+  };
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+    pinentry.package = pkgs.pinentry-emacs;
+  };
+}