refactor: hide op-ssh-sign behind feature flag

khaneliman · Oct 5, 2023 · 9869ea7 · 9869ea7
1 parent 1b3bca7
commit 9869ea7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
@@ -20,6 +20,7 @@ in
     userName = mkOpt types.str user.fullName "The name to configure git with.";
     userEmail = mkOpt types.str user.email "The email to configure git with.";
     wslAgentBridge = mkBoolOpt false "Whether to enable the wsl agent bridge.";
+    _1password = mkBoolOpt false "Whether to enable 1Password integration.";
   };
 
   config = mkIf cfg.enable {
@@ -268,9 +269,9 @@ in
           };
 
           gpg.format = "ssh";
-          # "gpg \"ssh\"".program = ''''
-          #   + ''${lib.optionalString pkgs.stdenv.isLinux (getExe' pkgs._1password-gui-beta "op-ssh-sign")}''
-          #   + ''${lib.optionalString pkgs.stdenv.isDarwin "${pkgs._1password-gui-beta}/Applications/1Password.app/Contents/MacOS/op-ssh-sign"}'';
+          "gpg \"ssh\"".program = mkIf cfg._1password (''''
+            + ''${lib.optionalString pkgs.stdenv.isLinux (getExe' pkgs._1password-gui-beta "op-ssh-sign")}''
+            + ''${lib.optionalString pkgs.stdenv.isDarwin "${pkgs._1password-gui-beta}/Applications/1Password.app/Contents/MacOS/op-ssh-sign"}'');
 
           init = {
             defaultBranch = "main";