From 177963b64e571b8465da6357811ad51fd54da367 Mon Sep 17 00:00:00 2001
From: Aner Zakobar <aner@zakobar.com>
Date: Sun, 6 Sep 2026 14:40:40 +0300
Subject: [PATCH] Fixes!

---
 azos-core                          |  2 +-
 features/encryption/default.nix    |  4 ++++
 features/lauretta/emacs/_pkg.nix   |  1 +
 features/lauretta/emacs/config.org | 13 +++++++++++++
 nixos/configuration.nix            |  2 +-
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/azos-core b/azos-core
index 4babf24..9e78f57 160000
--- a/azos-core
+++ b/azos-core
@@ -1 +1 @@
-Subproject commit 4babf242704a529ce06b0bc3d52c74a6e767d4e0
+Subproject commit 9e78f571ba2c04e7fb6a8aee2a72e47eeb2c294a
diff --git a/features/encryption/default.nix b/features/encryption/default.nix
index 09f0898..e1fc501 100644
--- a/features/encryption/default.nix
+++ b/features/encryption/default.nix
@@ -31,6 +31,10 @@
         enableSshSupport = true;
         grabKeyboardAndMouse = false;
         pinentry.package = pkgs.pinentry-emacs;
+        extraConfig = ''
+          allow-emacs-pinentry
+          allow-loopback-pinentry
+        '';
       };
       home.file.".ssh/config".source = ./ssh-config;
       home.file.".ssh/gpg-as-ssh.pub".source = ./gpg-as-ssh.pub;
diff --git a/features/lauretta/emacs/_pkg.nix b/features/lauretta/emacs/_pkg.nix
index 248fe62..3e50b04 100755
--- a/features/lauretta/emacs/_pkg.nix
+++ b/features/lauretta/emacs/_pkg.nix
@@ -16,5 +16,6 @@ orgTrivialBuild {
 
     agent-shell
     org-caldav
+    pinentry
   ];
 }
diff --git a/features/lauretta/emacs/config.org b/features/lauretta/emacs/config.org
index 08004b6..0648146 100644
--- a/features/lauretta/emacs/config.org
+++ b/features/lauretta/emacs/config.org
@@ -34,6 +34,19 @@
    :models '(openai/gpt-oss-120b)))
 #+end_src
 
+** GPG Pinentry
+
+gpg-agent is configured with =pinentry.package = pkgs.pinentry-emacs=, which
+needs a running Emacs-side pinentry service to hand it prompts over a
+loopback socket. Without =pinentry-start=, the pinentry-emacs binary can't
+reach Emacs and falls back to the curses pinentry (visible as a TUI prompt
+when committing from vterm) or hangs entirely (as seen from Magit).
+
+#+begin_src emacs-lisp
+(require 'pinentry)
+(pinentry-start)
+#+end_src
+
 ** Agent Shell
 
 #+begin_src emacs-lisp
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 49dcb24..2a8ef45 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -119,7 +119,7 @@
         services.greetd.settings = lib.mkForce {
           terminal.vt = 1;
           default_session = {
-            command = "${pkgs.tuigreet}/bin/tuigreet --time --user-menu --cmd '/home/aner/.login.sh'";
+            command = "${pkgs.tuigreet}/bin/tuigreet --time --user-menu --user-menu-min-uid 1000 --user-menu-max-uid 29999 --cmd '/home/aner/.login.sh'";
             user = "greeter";
           };
           initial_session = {