transfered from gpg to ssh and age

1 files changed, 29 insertions, 12 deletions

diff --git a/os/core/ssh.nix b/os/core/ssh.nix
index 0b75dee..6f5cf51 100644
--- a/os/core/ssh.nix
+++ b/os/core/ssh.nix
@@ -1,12 +1,15 @@
 {
   config,
   lib,
-  pkgs,
   username,
   ...
 }:
 let
   cfg = config.os.core.ssh;
+  keys = {
+    main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC610CJfgc3yII7MpLVqzEzQGa8Tsm+dih+CTXHXTnv4";
+    oci = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCgWmRbNTP/kcaZ8JNV1boVTZ/FQVV4qP/9eTKL9buzDvz9HJdgyWmbCiVZicNSert31IRdWOF/wm1sFjZ48nSkGDHbrnc//MPSdHULTx+kMES/NW9SZwwpaquFIJClrObysxrFYBAqweD+DJ3bp451WIymBs7lRBMNKPgoHBpJ5WN2CfIQjl60Jqnli7ML5seCsrquPEemcMPr1TFPmrFCbirzgDVkzCLL5kOowSD2uprtSA08fFm/pZ6nZh6KTQaEgPO4zR9tK+NQ46oCynWwBTI7JOPB4/LtIOiC5TjEUrkXZ/sJzpCBiNPYSRI8RWnAD0N/uVFJ4EYPUKLO2C/d";
+  };
 in
 {
   options.os.core.ssh.enable = lib.mkEnableOption "enables ssh server setup";
@@ -20,19 +23,33 @@ in
       };
     };
 
-    # programs.ssh.startAgent = true;
-    # services.gnome.gcr-ssh-agent.enable = false;
+    programs.ssh.startAgent = false;
+    services.gnome.gcr-ssh-agent.enable = false;
 
-    programs.gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-      pinentryPackage = pkgs.pinentry-curses;
-    };
+    users.users.${username}.openssh.authorizedKeys.keys = [ "${keys.main} adikro@disroot.org" ];
 
-    users.users = {
-      ${username}.openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC610CJfgc3yII7MpLVqzEzQGa8Tsm+dih+CTXHXTnv4 adikro@disroot.org"
-      ];
+    environment.etc."ssh/allowed_signers".text = "adikro@disroot.org ${keys.main}";
+    home-manager.users.${username} = {
+      programs.ssh = {
+        enable = true;
+        enableDefaultConfig = false;
+
+        matchBlocks = {
+          "github.com codeberg.org" = {
+            identityFile = "~/.ssh/main_id_ed25519.pub";
+            identitiesOnly = true;
+            user = "git";
+          };
+          "oci" = {
+            hostname = "130.162.223.123";
+            user = "opc";
+          };
+        };
+      };
+      home.file = {
+        ".ssh/main_id_ed25519.pub".text = keys.main;
+        ".ssh/oci.pub".text = keys.oci;
+      };
     };
   };
 }