diff --git a/common/config/config.nix b/common/config/config.nix
index b83556c..2ca6748 100644
--- a/common/config/config.nix
+++ b/common/config/config.nix
@@ -59,14 +59,7 @@ nixpkgs, # The flake's input version of nixpkgs
 
   environment.sessionVariables.GTK_THEME = "Adwaita:dark";
 
-  # Security
   services.openssh.enable = true;
-  services.pcscd.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-    pinentryFlavor = "curses";
-  };
 
 
   # This value determines the NixOS release from which the default
diff --git a/common/home-manager/default.nix b/common/home-manager/default.nix
index 70afb52..775a682 100644
--- a/common/home-manager/default.nix
+++ b/common/home-manager/default.nix
@@ -10,7 +10,7 @@
 
   programs.git = {
     enable = true;
-    userName = "kiana-S";
+    userName = "Kiana Sheibani";
     userEmail = "kiana.a.sheibani@gmail.com";
 
     extraConfig = {
@@ -22,4 +22,11 @@
       commit.gpgsign = true;
     };
   };
+
+  programs.gpg.enable = true;
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+    pinentryFlavor = "curses";
+  };
 }