diff --git a/Emacs.org b/Emacs.org
index ace41f5..8e1b6b6 100644
--- a/Emacs.org
+++ b/Emacs.org
@@ -1537,6 +1537,9 @@ In order to update the language grammars, run the next command below.
     :custom
     (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) ; stay in the same window
 
+  ;; yubikey support for pushing commits
+  ;; commiting is enabled through nixos gpg-agent config
+  (setenv "SSH_AUTH_SOCK" (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))
 #+end_src
 
 ** Forge
diff --git a/Nix.org b/Nix.org
index 214b234..fc1024d 100644
--- a/Nix.org
+++ b/Nix.org
@@ -137,7 +137,11 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann
     enableSshSupport = true;
     enableExtraSocket = true;
     pinentryPackage = pkgs.pinentry-gtk2;
-  };
+    extraConfig = ''
+    allow-emacs-pinentry
+    allow-loopback-pinentry
+    '';
+    };
 
 #+end_src
 
@@ -1343,6 +1347,7 @@ New setup for the SP3, this time using NixOS - another machine will take over th
         ];
         allowedUDPPortRanges = [
           {from = 27000; to = 27031;} # barotrauma
+          {from = 58962; to = 58964;} # barotrauma
         ];
       };
     };
diff --git a/profiles/TEMPLATE/home.nix b/profiles/TEMPLATE/home.nix
index c57eb60..100f247 100644
--- a/profiles/TEMPLATE/home.nix
+++ b/profiles/TEMPLATE/home.nix
@@ -8,7 +8,11 @@
     enableSshSupport = true;
     enableExtraSocket = true;
     pinentryPackage = pkgs.pinentry-gtk2;
-  };
+    extraConfig = ''
+    allow-emacs-pinentry
+    allow-loopback-pinentry
+    '';
+    };
   
   home = {
     username = "TEMPLATE";
diff --git a/profiles/fourside/home.nix b/profiles/fourside/home.nix
index 523ae50..c9d9cca 100644
--- a/profiles/fourside/home.nix
+++ b/profiles/fourside/home.nix
@@ -8,7 +8,11 @@
     enableSshSupport = true;
     enableExtraSocket = true;
     pinentryPackage = pkgs.pinentry-gtk2;
-  };
+    extraConfig = ''
+    allow-emacs-pinentry
+    allow-loopback-pinentry
+    '';
+    };
   
   home = {
     username = "swarsel";
diff --git a/profiles/fourside/nixos.nix b/profiles/fourside/nixos.nix
index 4cf4e93..49f7cb2 100644
--- a/profiles/fourside/nixos.nix
+++ b/profiles/fourside/nixos.nix
@@ -38,6 +38,7 @@
       ];
       allowedUDPPortRanges = [
         {from = 27000; to = 27031;} # barotrauma
+        {from = 58962; to = 58964;} # barotrauma
       ];
     };
   };
diff --git a/profiles/onett/home.nix b/profiles/onett/home.nix
index 55d7fa0..92fed89 100644
--- a/profiles/onett/home.nix
+++ b/profiles/onett/home.nix
@@ -8,7 +8,11 @@
     enableSshSupport = true;
     enableExtraSocket = true;
     pinentryPackage = pkgs.pinentry-gtk2;
-  };
+    extraConfig = ''
+    allow-emacs-pinentry
+    allow-loopback-pinentry
+    '';
+    };
   
 
   home = {
diff --git a/profiles/stand/home.nix b/profiles/stand/home.nix
index 5304c57..766bcab 100644
--- a/profiles/stand/home.nix
+++ b/profiles/stand/home.nix
@@ -8,7 +8,11 @@
     enableSshSupport = true;
     enableExtraSocket = true;
     pinentryPackage = pkgs.pinentry-gtk2;
-  };
+    extraConfig = ''
+    allow-emacs-pinentry
+    allow-loopback-pinentry
+    '';
+    };
   
 
   home = {
diff --git a/profiles/threed/home.nix b/profiles/threed/home.nix
index 7ef34c4..f4c0be6 100644
--- a/profiles/threed/home.nix
+++ b/profiles/threed/home.nix
@@ -8,7 +8,11 @@
     enableSshSupport = true;
     enableExtraSocket = true;
     pinentryPackage = pkgs.pinentry-gtk2;
-  };
+    extraConfig = ''
+    allow-emacs-pinentry
+    allow-loopback-pinentry
+    '';
+    };
   
 
   home = {
diff --git a/programs/emacs/init.el b/programs/emacs/init.el
index 8dae25e..1d6996a 100644
--- a/programs/emacs/init.el
+++ b/programs/emacs/init.el
@@ -1127,6 +1127,10 @@
   :custom
   (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) ; stay in the same window
 
+;; yubikey support for pushing commits
+;; commiting is enabled through nixos gpg-agent config
+(setenv "SSH_AUTH_SOCK" (string-chop-newline (shell-command-to-string "gpgconf --list-dirs agent-ssh-socket")))
+
 (use-package forge
     :after magit)