diff --git a/modules/40-basesystem/config b/modules/40-basesystem/config
index 9855c53..a134b6e 100644
--- a/modules/40-basesystem/config
+++ b/modules/40-basesystem/config
@@ -13,7 +13,7 @@ setconf add "timezone" "Europe/Berlin"
 
 
 addpkg void-repo-multilib void-repo-multilib-nonfree void-repo-nonfree lvm2 cronie socklog-void ntp xtools wireguard-tools gnupg2 progress pwgen net-tools ncdu nmap mtr iotop hdparm smartmontools htop git neovim btrbk croc
-ignorepkg nvi
+ignorepkg nvi gnupg
 servicesenable acpid cronie socklog-unix nanoklogd uuidd
 servicesdisable agetty-tty6 agetty-tty5
 
diff --git a/modules/40-basesystem/install b/modules/40-basesystem/install
index 3da370e..cd9586c 100644
--- a/modules/40-basesystem/install
+++ b/modules/40-basesystem/install
@@ -39,8 +39,8 @@ echo 'Defaults umask = 022';
 echo 'Defaults passprompt="[sudo] Password: "';
 echo '%wheel   ALL=(ALL) ALL';
 echo 'Defaults editor = /usr/bin/nvim';
-echo 'Defaults env_keep += "EDITOR"'; } > /etc/sudoers.d/10-common
-
+echo 'Defaults env_keep += "EDITOR"';
+echo 'env_keep += "SSH_CONNECTION"'; } > /etc/sudoers.d/10-common
 mkdir -p /etc/udev/rules.d/
 echo 'ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="1"' > /etc/udev/rules.d/mount-media.rules
 echo 'ACTION=="add|change", KERNEL=="sd[a-z]|mmcblk[0-9]*", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="mq-deadline"' > /etc/udev/rules.d/60-ioschedulers.rules