...

1 files changed, 4 insertions, 14 deletions

diff --git a/hm/conf/git.nix b/hm/conf/git.nix
index 67fcaa4..0e4b805 100644
--- a/hm/conf/git.nix
+++ b/hm/conf/git.nix
@@ -2,10 +2,12 @@
   config,
   lib,
   pkgs,
+  osConfig,
   ...
 }:
 let
   cfg = config.hm.conf.git;
+  isOCI = osConfig.networking.hostName == "oci";
 in
 {
   options.hm.conf.git.enable = lib.mkEnableOption "enables git vcs";
@@ -14,14 +16,15 @@ in
       enable = true;
       lfs.enable = true;
       signing = {
-        key = "EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94";
         signByDefault = true;
+        key = if isOCI then "~/.ssh/id_ed25519.pub" else "EF69F2FB25C8B5A66918EA91A38ACEAB9656CD94";
       };
       settings = {
         user = {
           name = "adikro";
           email = "adikro@disroot.org";
         };
+        gpg.format = if isOCI then "ssh" else "openpgp";
         init.defaultBranch = "main";
         push.autoSetupRemote = true;
         pull.rebase = true;
@@ -33,19 +36,6 @@ in
         ".direnv/"
         "secrets/*.tmp"
       ];
-      hooks.pre-commit = pkgs.writeShellScript "sops-pre-commit" ''
-        for file in secrets/*.yaml; do
-          if [[ -f "$file" ]]; then
-            if ! ${pkgs.ripgrep}/bin/rg -q "sops" "$file"; then
-              echo "--------------------------------------------------------"
-              echo "ABORTING COMMIT: Unencrypted file detected: $file"
-              echo "Please run 'sops -e -i $file' before committing."
-              echo "--------------------------------------------------------"
-              exit 1
-            fi
-          fi
-        done
-      '';
     };
   };
 }