WORKS

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"
       },

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;
 

home-manager/home.nix

@@ -11,6 +11,7 @@
 
   imports = [
     outputs.homeManagerModules
+    outputs.azos-core.homeManagerModules
   ];
 
   nixpkgs = {

modules/home-manager/default.nix

@@ -1,4 +1,3 @@
 {
-  # imports = [./mail.nix ./encryption.nix];
-  imports = [./mail.nix];
+  imports = [./mail.nix ./encryption.nix];
 }

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;

nixos/configuration.nix

@@ -91,6 +91,7 @@
     vim
     git
     tmux
+    killall
   ];
 
   fonts.enableDefaultPackages = true;