diff --git a/dot_config/nixpkgs/home.nix b/dot_config/nixpkgs/home.nix
index f6900bb..009d8f2 100644
--- a/dot_config/nixpkgs/home.nix
+++ b/dot_config/nixpkgs/home.nix
@@ -7,6 +7,21 @@ in
 {
   programs.home-manager.enable = true;
 
+  services.gpg-agent = {
+    enable = true;
+    defaultCacheTtl = 1800;
+    enableSshSupport = true;
+    enableExtraSocket = true;
+    extraConfig = ''
+      allow-emacs-pinentry
+      debug-level expert
+      keep-display
+      extra-socket /run/user/1000/gnupg/S.gpg-agent.extra
+      no-grab
+      allow-preset-passphrase
+    '';
+  };
+
   home.username = "bascht";
   home.homeDirectory = "/home/bascht";
 
@@ -221,6 +236,7 @@ in
          "editor.renderControlCharacters" = true;
      };
  };
+
  systemd.user.services.mako = {
        Unit = {
              Description = "Mako notifications";
@@ -263,6 +279,7 @@ in
         };
   };
 
+  services.mbsync.enable = true;
   services.gnome-keyring.enable = true;
   services.nextcloud-client.enable = true;
   services.emacs.enable = true;
diff --git a/private_dot_gnupg/gpg-agent.conf b/private_dot_gnupg/gpg-agent.conf
deleted file mode 100644
index 9245699..0000000
--- a/private_dot_gnupg/gpg-agent.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-default-cache-ttl 1800
-max-cache-ttl 999999
-enable-ssh-support
-allow-emacs-pinentry
-debug-level expert
-keep-display
-pinentry-program /home/bascht/.nix-profile/bin/pinentry
-extra-socket /run/user/1000/gnupg/S.gpg-agent.extra
-log-file /tmp/gpg-agent.log
-no-grab
-allow-preset-passphrase