diff --git a/modules/services.nix b/modules/services.nix
index 6a2b7bf..df3c079 100644
--- a/modules/services.nix
+++ b/modules/services.nix
@@ -31,7 +31,6 @@ in {
     drivers = [ pkgs.gutenprint ];
   };
   programs.dconf.enable = true;
-  # programs.gnupg.agent.enable = true;
 
   services.accounts-daemon.enable = true;
 
diff --git a/modules/workspace/misc.nix b/modules/workspace/misc.nix
index e8d2fe8..006232c 100644
--- a/modules/workspace/misc.nix
+++ b/modules/workspace/misc.nix
@@ -16,14 +16,10 @@
 
     programs.git = {
       enable = true;
-      # package = pkgs.git-with-libsecret;
       userEmail = "alukard.develop@gmail.com";
       userName = "Dmitriy Kholkin";
       signing.key = "922DA6E758A0FE4CFAB4E4B2FD266B810DF48DF2";
       extraConfig = {
-        # credential = {
-        #   helper = "libsecret";
-        # };
         core = {
           editor = "code --wait";
         };
@@ -31,11 +27,13 @@
     };
 
     # GPG with SSH
-    programs.gpg.enable = true;
+    programs.gpg = {
+      enable = true;
+    };
     services.gpg-agent = {
       enable = true;
       enableSshSupport = true;
-      pinentryFlavor = "gtk2";
+      pinentryFlavor = "gnome3";
       sshKeys = [ "E6A6377C3D0827C36428A290199FDB3B91414AFE" ];
     };
 
diff --git a/modules/workspace/ssh.nix b/modules/workspace/ssh.nix
index ffbbaef..3c69566 100644
--- a/modules/workspace/ssh.nix
+++ b/modules/workspace/ssh.nix
@@ -1,5 +1,11 @@
 { pkgs, lib, config, ... }: {
 
+  # home-manager.users.alukard = {
+  #   programs.ssh = {
+  #     enable = true;
+  #   };
+  # };
+
   # services.openssh = {
   #   enable = true;
   #   passwordAuthentication = false;
@@ -16,8 +22,8 @@
   #   };
   # };
 
-  users.users.alukard.openssh.authorizedKeys.keys = [
-    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+xd8ClJPvJuAdYC9HlNnjiubEtYfvnKjYr9ROV+UmPVvI3ZITF24OaMI+fxgR0EqGfcUzSGom8528IB53Q3aFMIAaA0vKjW+jrByyB2l/k/+ttpLbH75c9WyOpAcUDTen8BhHKPyXOHoJ1jLu7GFmtPZ+mZo8thFB/VIRrwECHd8DnF0drsSCorkRp1bZC7bAHgztaYHNBUoAVGgJ7nLwW7DotlgbUEDiPJHXOxd/c/ZlXIB/cfUUqF+L5ThbMPhMcwRMspLy+nQdmHhih9k6SkvYqJoNqHT5/XeShb0RkIzvUWT2CYTPop5kAY5mMnatVTOY1FZPhHzk3G8MhOQ3r/elM/ecZxmjL8uozMN9kRGf1IL4DgQZfVqQRILdNSQGb0tfeiyirNZe1RlDw9UvMnZJOw0EkiC9lSSRhBWXXxAmxRrbNFTPQSp+/kiIGDmp2AsGhD11CfTDEU3wcLEUPBUqp1FYSzHncJyEKGy2Dpa5xaUJ0cuyGL4W3WHDXa4sTfY+AIXbQTD88Ujdsbfzyd6lrikG4D/crCurXissrh7q9DuYKWRI24cp5bw9lG33U1EXisnZqFyZNwMAmSj2QEGsHCwSevn0FgyRa2WYXgpZ9hfgY4le+ZSMo2JTosQ6DjGyxMDyQAHJ/ismTTzL67Q2p6U+73toYm62Qqdspw== (none)"
-  ];
+  # users.users.alukard.openssh.authorizedKeys.keys = [
+  #   "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC+xd8ClJPvJuAdYC9HlNnjiubEtYfvnKjYr9ROV+UmPVvI3ZITF24OaMI+fxgR0EqGfcUzSGom8528IB53Q3aFMIAaA0vKjW+jrByyB2l/k/+ttpLbH75c9WyOpAcUDTen8BhHKPyXOHoJ1jLu7GFmtPZ+mZo8thFB/VIRrwECHd8DnF0drsSCorkRp1bZC7bAHgztaYHNBUoAVGgJ7nLwW7DotlgbUEDiPJHXOxd/c/ZlXIB/cfUUqF+L5ThbMPhMcwRMspLy+nQdmHhih9k6SkvYqJoNqHT5/XeShb0RkIzvUWT2CYTPop5kAY5mMnatVTOY1FZPhHzk3G8MhOQ3r/elM/ecZxmjL8uozMN9kRGf1IL4DgQZfVqQRILdNSQGb0tfeiyirNZe1RlDw9UvMnZJOw0EkiC9lSSRhBWXXxAmxRrbNFTPQSp+/kiIGDmp2AsGhD11CfTDEU3wcLEUPBUqp1FYSzHncJyEKGy2Dpa5xaUJ0cuyGL4W3WHDXa4sTfY+AIXbQTD88Ujdsbfzyd6lrikG4D/crCurXissrh7q9DuYKWRI24cp5bw9lG33U1EXisnZqFyZNwMAmSj2QEGsHCwSevn0FgyRa2WYXgpZ9hfgY4le+ZSMo2JTosQ6DjGyxMDyQAHJ/ismTTzL67Q2p6U+73toYm62Qqdspw== (none)"
+  # ];
   # programs.ssh.askPassword = "${pkgs.plasma5.ksshaskpass}/bin/ksshaskpass";
 }
\ No newline at end of file