diff --git a/modules/gpg.nix b/modules/gpg.nix
index f6c97b1..e0dc33f 100644
--- a/modules/gpg.nix
+++ b/modules/gpg.nix
@@ -4,7 +4,7 @@
 
   programs.gnupg.agent = {
     enable = true;
-    enableSSHSupport = true;
+    enableSSHSupport = false;
     #pinentryFlavor = "qt";
   };
   #environment.systemPackages = with pkgs; [
diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
index f27cd5f..73eefc1 100644
--- a/modules/graphical/shared.nix
+++ b/modules/graphical/shared.nix
@@ -75,6 +75,12 @@ in
       ];
       services.gvfs.enable = true; # for file manager, trash support, etc.
 
+      programs.ssh.startAgent = true;
+      programs.zoxide = {
+        enable = true;
+        enableZshIntegration = true;
+      };
+
       # List packages installed in system profile. To search, run:
       # $ nix search wget
       environment.systemPackages = with pkgs; [
diff --git a/systems/laptop/configuration.nix b/systems/laptop/configuration.nix
index 514023c..ba058b9 100644
--- a/systems/laptop/configuration.nix
+++ b/systems/laptop/configuration.nix
@@ -63,7 +63,6 @@ in
           ;;
       esac
     '';
-  programs.ssh.startAgent = true;
 
   custom = {
     cli-tools.enable = true;
diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix
index 7a8fb54..3c57385 100644
--- a/systems/pc/configuration.nix
+++ b/systems/pc/configuration.nix
@@ -117,10 +117,6 @@
     };
   };
 
-  programs.zoxide = {
-    enable = true;
-    enableZshIntegration = true;
-  };
   nix.gc.automatic = lib.mkForce false;
   services.searx = {
     enable = false;