diff --git a/modules/apps/cli/default.nix b/modules/apps/cli/default.nix
index 902e7aa..100b31a 100644
--- a/modules/apps/cli/default.nix
+++ b/modules/apps/cli/default.nix
@@ -1,10 +1,12 @@
 {
   imports = [
+    ./zsh
     ./helix
     ./newsboat
-    ./tools
-    ./zsh
     ./mutt
+    ./git
+    ./ssh
+    ./gpg
     ./misc
   ];
 }
diff --git a/modules/apps/cli/git/default.nix b/modules/apps/cli/git/default.nix
new file mode 100644
index 0000000..154f162
--- /dev/null
+++ b/modules/apps/cli/git/default.nix
@@ -0,0 +1,7 @@
+{...}: {
+  home-manager.users.joy.programs.git = {
+    enable = true;
+    userEmail = "mail@joygnu.org";
+    userName = "joygnu";
+  };
+}
diff --git a/modules/apps/cli/gpg/default.nix b/modules/apps/cli/gpg/default.nix
new file mode 100644
index 0000000..95e24d2
--- /dev/null
+++ b/modules/apps/cli/gpg/default.nix
@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  services.pcscd.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-curses;
+    enableSSHSupport = true;
+  };
+}
diff --git a/modules/apps/cli/ssh/default.nix b/modules/apps/cli/ssh/default.nix
new file mode 100644
index 0000000..9bd17c0
--- /dev/null
+++ b/modules/apps/cli/ssh/default.nix
@@ -0,0 +1,16 @@
+{...}: {
+  services.openssh = {
+    enable = true;
+    settings = {
+      PasswordAuthentication = false;
+      AllowUsers = null;
+    };
+  };
+
+  users.users.joy = {
+    isNormalUser = true;
+    openssh.authorizedKeys.keys = [
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8FnfVKPbbzPmZ3L0KuSMc8GD42rkIoIMay3c/r9zGkMBwRyluwP7OBR7SaTlp/w7iPHom3YwhGYa37HOXp/icSEMvFlYsCQOXWPkf7cNqyhEnycRsMojpKP2a6qxvcnuuCLY+xMwtlsX1h4nJFpsWHb2A62qBgdaOVrBlbVGd2ZuVCgiB+eenVagW3EFAO9jK5r6rSFciND7EMxBKfi6DbRma6UCejwGjpU0AHCZDikw5XKFhLUDbhdb9e02gyQxD5cs4Q2CuZ1PVt+Jb1GwHVnfh3wdEz5v7TWF+RUv85JXlRLrIYd2SEDpA6yvQIIT4YR2Bb1Tc/aC+zTdUdP+HMiBI32GGyplMfrE1dbj3quTfGN6cJ0TfPFOx7K+0N108fM7mehPtGT/uyB9nnMyYeLO45cgA1wMZZcT4egSvnnqe+6NO7j+zR0whl8+SbIru7HUK2Oa67SzxotQ7D8F27rx02Ie4UJqwbPsZGrxL7TlvNKUXQ4mOINkyE79tIshWncO71O6vJWzaoeYiye0mxc0AP3vYozdV3MgN34+5zscb/o4pwOQtthin8Nf1Y6o6H0poUz5YXYBdEKK/O0Wz3kxT6i/oZWZG7a18xCCKYnF1Jgdr7mfxkizLMkRqYsgM9CS0e0KoVJhu78TmMz8Eip9za1ncvGg3w1ZW6VG/6w=="
+    ];
+  };
+}
diff --git a/modules/apps/cli/tools/default.nix b/modules/apps/cli/tools/default.nix
deleted file mode 100644
index decab09..0000000
--- a/modules/apps/cli/tools/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./git
-    ./ssh
-    ./gpg
-  ];
-}