testing

home/users/cnst/git.nix

@@ -1,16 +1,20 @@
 {
-  # pkgs,
   config,
-  # lib,
+  pkgs,
   ...
 }: let
   cfg = config.programs.git;
   sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIk/zMuOgZCX+bVCFDHxtoec96RaVfV4iG1Gohp0qHdU cnst@cnix";
 in {
+  home.packages = [pkgs.gh];
   programs.git = {
     enable = true;
     userName = "cnst";
     userEmail = "adamhilmersson@gmail.com";
+    delta = {
+      enable = true;
+      options.dark = true;
+    };
     extraConfig = {
       signing = {
         key = "${config.home.homeDirectory}/.ssh/id_ed25519";
@@ -23,7 +27,7 @@ in {
       init.defaultBranch = "main";
       # commit.gpgSign = lib.mkDefault true;
 
-      merge.conflictStyle = "zdiff3";
+      merge.conflictStyle = "diff3";
       commit.verbose = true;
       diff.algorithm = "histogram";
       log.date = "iso";

home/users/cnst/modules.nix

@@ -85,6 +85,9 @@
       eza = {
         enable = true;
       };
+      ssh = {
+        enable = true;
+      };
     };
     wm = {
       hyprland = {

home/users/cnst/shell.nix

@@ -83,6 +83,10 @@ in {
       ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX
 
       ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241'
+            ${lib.optionalString config.services.gpg-agent.enable ''
+        gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg)
+        export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh"
+      ''}
       microfetch
     '';
   };