AddKeysToAgent defaulting to yes. Added UseKeychain if on macos

lib/user.nix

@@ -22,5 +22,15 @@
       
       home-manager.users.${name}.imports = [ (mkRole "common") ]
         ++ roles_mod;
-    };
+      };
+      
+      mkHMUser = { name, roles ? [] }: 
+        let
+          mkRole = role: import (../roles/home + "/${role}.nix");
+        in{
+      home-manager.users.${name}.imports = [ (mkRole "common") ]
+        ++ roles_mod;
+      };
+
+  };
 }

roles/home/common.nix

@@ -1,16 +1,14 @@
-{ config, pkgs, unstable, ... }:
+{ config, pkgs, ... }:
 
-{
+let unstable = import <nixpkgs-unstable> { };
+in {
   imports = [ ./zsh.nix ./git.nix ];
 
   home = {
-    stateVersion = "21.05";
     sessionVariables = {
       EDITOR = "nvim";
       VISUAL = "nvim";
     };
-
-    packages = with pkgs; [ rizin sshfs nixfmt victor-mono ];
   };
 
   programs.neovim = {
@@ -24,6 +22,7 @@
       cmake-format
       clang-tools
       rustfmt
+      nixfmt
     ];
     extraConfig = ''
         " syntax

roles/home/ssh.nix

@@ -1,3 +1,5 @@
+{ pkgs, lib, ... }:
+
 {
   programs.ssh = {
     enable = true;
@@ -166,6 +168,7 @@
     extraConfig = ''
       IdentitiesOnly yes
       ServerAliveInterval 3600
-    '';
+      AddKeysToAgent yes
+    '' + lib.optionalString pkgs.stdenv.isDarwin "UseKeychain yes";
   };
-}
+}

roles/home/zsh.nix

@@ -7,5 +7,8 @@
       plugins = [ "git" "sudo" "docker" "docker-compose" "adb" "systemd" ];
       theme = "bira";
     };
+      initExtra = ''
+        source ~/.profile
+      '';
   };
 }