diff --git a/modules/base/users/default.nix b/modules/base/users/default.nix
index e2f03ac..033f407 100644
--- a/modules/base/users/default.nix
+++ b/modules/base/users/default.nix
@@ -62,7 +62,7 @@
     home-manager.useGlobalPkgs = true;
     home-manager.users.motiejus = {pkgs, ...}: {
       home.stateVersion = config.mj.stateVersion;
-      home.packages = with pkgs; [go];
+      home.packages = lib.mkIf config.mj.base.users.devEnvironment [pkgs.go];
 
       programs.direnv.enable = true;
 
@@ -112,10 +112,6 @@
         ];
       };
 
-      services.gpg-agent = {
-        enable = true;
-        enableSshSupport = true;
-      };
     };
   };
 }
diff --git a/modules/profiles/desktop/default.nix b/modules/profiles/desktop/default.nix
index e336c24..9a83107 100644
--- a/modules/profiles/desktop/default.nix
+++ b/modules/profiles/desktop/default.nix
@@ -59,6 +59,11 @@
     ];
 
     home-manager.users.motiejus = {pkgs, ...}: {
+      services.gpg-agent = {
+        enable = true;
+        enableSshSupport = true;
+      };
+
       programs.firefox = {
         enable = true;
         profiles = {