transfered from gpg to ssh and age

5 files changed, 44 insertions, 33 deletions

diff --git a/flake.lock b/flake.lock
index 119de0e..ae57a7c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -655,11 +655,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1773859791,
-        "narHash": "sha256-Awf/2pYopQCTbeP48BJXkOcQ/vga5WFhY2R3GUWT25A=",
+        "lastModified": 1773866737,
+        "narHash": "sha256-gWrYAWSEUzFD1aig3z+zeFCqHrfjkm0Tj66eZmCIcVA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "a0c695ae1c9ad4791b6f181ae667bcaeabf30c73",
+        "rev": "1a83b2d5d9a23041f9ddb170a21cefb8f02e0e45",
         "type": "github"
       },
       "original": {
@@ -680,11 +680,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1773777664,
-        "narHash": "sha256-HOqYvG6kyLyBhh6wpGz2z0+JID/mkGgjNa9c1nPJ4k8=",
+        "lastModified": 1773863905,
+        "narHash": "sha256-gfTSlftHbUmW3Z++XzquqH/GaAAI/z+Ep/zU03gLMQ4=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "ef0e10f591402cb9fad3e4f0faa8f66162655c04",
+        "rev": "046afc8b3e7a5b0f668ef2dc1b8b904e5b892435",
         "type": "github"
       },
       "original": {
@@ -953,11 +953,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773821154,
-        "narHash": "sha256-32jxpzx8NpjbrIf9feABt8ETobpU3WgiLV1mL6JKiqk=",
+        "lastModified": 1773863913,
+        "narHash": "sha256-RMHYN+xPD02UyDKp/ZlbzDypzd8dugLTJLl3CBqcNV0=",
         "owner": "Alexays",
         "repo": "Waybar",
-        "rev": "069c8cfb66ac995decc446d0ac1fd287a25b151c",
+        "rev": "b77b1818f63492870f2e467d913d90d23d1c4c14",
         "type": "github"
       },
       "original": {
diff --git a/hm/conf/git.nix b/hm/conf/git.nix
index b30e96e..15a7804 100644
--- a/hm/conf/git.nix
+++ b/hm/conf/git.nix
@@ -22,21 +22,18 @@ in
           name = "adikro";
           email = "adikro@disroot.org";
         };
-        gpg.format = "openpgp";
+        gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
         init.defaultBranch = "main";
         push.autoSetupRemote = true;
         pull.rebase = true;
-        "url \"git@codeberg.org:\"".insteadOf = "https://codeberg.org/";
       };
       ignores = [
-        "*.swp"
         "result"
         ".direnv/"
-        "secrets/*.tmp"
       ];
-      extraConfig = {
-        gpg.ssh.program = "ssh-keygen";
-      };
     };
+    home.file.".ssh/allowed_signers".text = ''
+      adikro@disroot.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC610CJfgc3yII7MpLVqzEzQGa8Tsm+dih+CTXHXTnv4
+    '';
   };
 }
diff --git a/hm/conf/xdg-mime.nix b/hm/conf/xdg-mime.nix
index cbf353d..05b85a2 100644
--- a/hm/conf/xdg-mime.nix
+++ b/hm/conf/xdg-mime.nix
@@ -11,10 +11,7 @@ in
       mimeApps = {
         enable = true;
         defaultApplications = {
-          "application/pdf" = [ "org.pwmt.zathura.desktop" ];
-          "application/x-bzpdf" = [ "org.pwmt.zathura.desktop" ];
-          "application/x-gzpdf" = [ "org.pwmt.zathura.desktop" ];
-          "application/epub+zip" = [ "org.pwmt.zathura.desktop" ];
+          "application/pdf" = [ "sioyek.desktop" ];
 
           "image/png" = [ "nsxiv.desktop" ];
           "image/jpeg" = [ "nsxiv.desktop" ];
@@ -51,7 +48,6 @@ in
       VISUAL = "nvim";
       BROWSER = "librewolf";
       TERMINAL = "foot";
-      GPG_TTY = "$(tty)";
       COLORTERM = "truecolor";
     };
   };
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index c17502d..29b26c4 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -60,6 +60,7 @@
       spicetify.enable = true;
       torrent.enable = true;
       yt-dlp.enable = true;
+      onlyoffice.enable = true;
     };
   };
 
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;
+      };
     };
   };
 }