From e2545d8e3d72601321278bf7c3c6c6254471d93f Mon Sep 17 00:00:00 2001
From: Aner Zakobar <aner@zakobar.com>
Date: Sun, 20 Apr 2025 13:54:34 +0300
Subject: [PATCH] WORKS

---
 azos-core                           |  2 +-
 flake.lock                          |  8 ++++----
 flake.nix                           |  4 +++-
 home-manager/home.nix               |  1 +
 modules/home-manager/default.nix    |  3 +--
 modules/home-manager/encryption.nix | 10 +++++++++-
 nixos/configuration.nix             |  1 +
 7 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/azos-core b/azos-core
index bf77173..bc0d909 160000
--- a/azos-core
+++ b/azos-core
@@ -1 +1 @@
-Subproject commit bf771732d06cb9405314a1ad2cd7817326b142e7
+Subproject commit bc0d909e255fe8ca717fe5c9f746f0ad1addf03f
diff --git a/flake.lock b/flake.lock
index a775917..b83a6ec 100755
--- a/flake.lock
+++ b/flake.lock
@@ -6,11 +6,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1745138291,
-        "narHash": "sha256-FXUYygIg+z35NszMG5lt9lw7BJgkD3ABRX8zBTKkQl4=",
+        "lastModified": 1745145915,
+        "narHash": "sha256-GkVoSkWMT7D7uXmt132rW5t2FSp5b+0ebr/BCGWdH3U=",
         "ref": "refs/heads/master",
-        "rev": "bf771732d06cb9405314a1ad2cd7817326b142e7",
-        "revCount": 21,
+        "rev": "bc0d909e255fe8ca717fe5c9f746f0ad1addf03f",
+        "revCount": 22,
         "type": "git",
         "url": "file:./azos-core"
       },
diff --git a/flake.nix b/flake.nix
index e2ad73e..d544419 100755
--- a/flake.nix
+++ b/flake.nix
@@ -64,7 +64,9 @@
     nixosModules = inputs.azos-core.nixosModules.nixosModules;
     # Reusable home-manager modules you might want to export
     # These are usually stuff you would upstream into home-manager
-    homeManagerModules = inputs.azos-core.nixosModules.homeManagerModules;
+    azos-core.homeManagerModules = inputs.azos-core.nixosModules.homeManagerModules;
+    homeManagerModules = import ./modules/home-manager;
+
     #OLD CODE
     # homeManagerModules = import ./modules/home-manager;
 
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 69f58c9..4d113dd 100755
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -11,6 +11,7 @@
 
   imports = [
     outputs.homeManagerModules
+    outputs.azos-core.homeManagerModules
   ];
 
   nixpkgs = {
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index cb101a1..20b7c5b 100755
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,4 +1,3 @@
 {
-  # imports = [./mail.nix ./encryption.nix];
-  imports = [./mail.nix];
+  imports = [./mail.nix ./encryption.nix];
 }
diff --git a/modules/home-manager/encryption.nix b/modules/home-manager/encryption.nix
index a52663b..e75d18b 100755
--- a/modules/home-manager/encryption.nix
+++ b/modules/home-manager/encryption.nix
@@ -19,8 +19,16 @@ in {
 
       home.packages = with pkgs; [
         yubikey-personalization
-        gnupg
+        pinentry-gtk2
       ];
+      programs.gpg = {
+        enable = true;
+      };
+      services.gpg-agent = {
+        enable = true;
+        enableSshSupport = true;
+        pinentryPackage = pkgs.pinentry-gtk2;
+      };
 
       home.file.".ssh/config".source = ./ssh-config;
       home.file.".ssh/gpg-as-ssh.pub".source = ./gpg-as-ssh.pub;
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index a770276..ff2dfb2 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -91,6 +91,7 @@
     vim
     git
     tmux
+    killall
   ];
 
   fonts.enableDefaultPackages = true;