diff --git a/home/modules/default.nix b/home/modules/default.nix
index 43e6cd4f..95a5e1d4 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -24,6 +24,7 @@
     "${userModules}/utils/zathura"
     "${userModules}/utils/tuirun"
     "${userModules}/utils/eza"
+    "${userModules}/utils/ssh"
     "${userModules}/wm/hyprland"
     "${userModules}/wm/utils/hypridle"
     "${userModules}/wm/utils/hyprlock"
diff --git a/home/modules/utils/ssh/default.nix b/home/modules/utils/ssh/default.nix
new file mode 100644
index 00000000..3d05cd1e
--- /dev/null
+++ b/home/modules/utils/ssh/default.nix
@@ -0,0 +1,17 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.utils.ssh;
+in {
+  options = {
+    modules.utils.ssh.enable = mkEnableOption "Enables ssh";
+  };
+  config = mkIf cfg.enable {
+    programs.ssh = {
+      enable = true;
+    };
+  };
+}
diff --git a/home/users/cnst/git.nix b/home/users/cnst/git.nix
index dd11593a..2618799e 100644
--- a/home/users/cnst/git.nix
+++ b/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";
diff --git a/home/users/cnst/modules.nix b/home/users/cnst/modules.nix
index 6997e5e6..737f3143 100644
--- a/home/users/cnst/modules.nix
+++ b/home/users/cnst/modules.nix
@@ -85,6 +85,9 @@
       eza = {
         enable = true;
       };
+      ssh = {
+        enable = true;
+      };
     };
     wm = {
       hyprland = {
diff --git a/home/users/cnst/shell.nix b/home/users/cnst/shell.nix
index 301049a7..e05d624e 100644
--- a/home/users/cnst/shell.nix
+++ b/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
     '';
   };
diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix
index 47138e68..ca40ec78 100644
--- a/hosts/cnix/modules.nix
+++ b/hosts/cnix/modules.nix
@@ -93,7 +93,7 @@
         samba = {
           enable = false;
         };
-        ssh = {
+        openssh = {
           enable = true;
         };
       };
diff --git a/system/modules/default.nix b/system/modules/default.nix
index df194bd0..f624b219 100644
--- a/system/modules/default.nix
+++ b/system/modules/default.nix
@@ -21,7 +21,7 @@
     "${systemModules}/sysd/network/blueman"
     "${systemModules}/sysd/network/mullvad"
     "${systemModules}/sysd/network/samba"
-    "${systemModules}/sysd/network/ssh"
+    "${systemModules}/sysd/network/openssh"
     "${systemModules}/sysd/security/agenix"
     "${systemModules}/sysd/security/gnome-keyring"
     "${systemModules}/sysd/session/dbus"
diff --git a/system/modules/sysd/network/ssh/default.nix b/system/modules/sysd/network/openssh/default.nix
similarity index 52%
rename from system/modules/sysd/network/ssh/default.nix
rename to system/modules/sysd/network/openssh/default.nix
index 5e22ba32..22ad2843 100644
--- a/system/modules/sysd/network/ssh/default.nix
+++ b/system/modules/sysd/network/openssh/default.nix
@@ -4,17 +4,14 @@
   ...
 }: let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.modules.sysd.network.ssh;
+  cfg = config.modules.sysd.network.openssh;
 in {
   options = {
-    modules.sysd.network.ssh.enable = mkEnableOption "Enables ssh";
+    modules.sysd.network.openssh.enable = mkEnableOption "Enables openssh";
   };
   config = mkIf cfg.enable {
     services.openssh = {
       enable = true;
     };
-    programs.ssh = {
-      startAgent = true;
-    };
   };
 }