diff --git a/gpg.nix b/gpg.nix
index 9161c53a..b7046d0f 100644
--- a/gpg.nix
+++ b/gpg.nix
@@ -15,10 +15,4 @@
       pkgs.yubikey-personalization
     ];
   };
-
-  environment.shellInit = ''
-    gpg-connect-agent /bye
-    export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-    export MARKON_MUUTTUJA="test"
-  '';
 }
diff --git a/hosts/Mirkwood/hardware-configuration.nix b/hosts/Mirkwood/hardware-configuration.nix
index 3c105ff4..fa60be88 100644
--- a/hosts/Mirkwood/hardware-configuration.nix
+++ b/hosts/Mirkwood/hardware-configuration.nix
@@ -1,7 +1,7 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
   imports =