From 37ca0d558c1908ff046d0973db1a4145956412fe Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sat, 29 Jun 2024 13:31:11 +0900
Subject: [PATCH] Various GPG updates

---
 home-manager/common/software/cli/bash.nix | 4 ++++
 home-manager/common/software/cli/fish.nix | 2 +-
 home-manager/users/albert/default.nix     | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/home-manager/common/software/cli/bash.nix b/home-manager/common/software/cli/bash.nix
index 3d3ab27f..c696038c 100644
--- a/home-manager/common/software/cli/bash.nix
+++ b/home-manager/common/software/cli/bash.nix
@@ -134,6 +134,10 @@
       }
     '';
     shellAliases = {
+      # GPG Related 
+      sign = "gpg -u $PGP_KEY_ID --armor --detach-sig";
+      verify = "gpg -u $PGP_KEY_ID --verify";
+      
       prime-select = "nvidia-offload";
       screenshot = ''grim -g "$(slurp)" | wl-copy -t image/png'';
 
diff --git a/home-manager/common/software/cli/fish.nix b/home-manager/common/software/cli/fish.nix
index 5780f9a5..3f3aa6f1 100644
--- a/home-manager/common/software/cli/fish.nix
+++ b/home-manager/common/software/cli/fish.nix
@@ -110,7 +110,7 @@
     shellAliases = {
      
       # GPG Related 
-      sign = "gpg -u $PGP_KEY_ID --armor --clearsign";
+      sign = "gpg -u $PGP_KEY_ID --armor --detach-sig";
       verify = "gpg -u $PGP_KEY_ID --verify";
 
       prime-select = "nvidia-offload";
diff --git a/home-manager/users/albert/default.nix b/home-manager/users/albert/default.nix
index c120475d..d3d47e3a 100644
--- a/home-manager/users/albert/default.nix
+++ b/home-manager/users/albert/default.nix
@@ -13,6 +13,7 @@
   programs.bash.sessionVariables = {
     # SOPS comma delimited list of GPG keys allowed to edit files
     SOPS_PGP_FP = "4A89D6B44B7E423B647C7AE848FBC3335A26DED6";
+    PGP_KEY_ID = "48FBC3335A26DED6";
   };
 
   programs.fish.shellInit = ''