refactor: moving script into modules that makes sense

- instead of collecting all scripts into modules/scripts we are moving
  them to modules that makes sense (yazi-file-chooser.sh into yazi)

1 files changed, 54 insertions, 24 deletions

diff --git a/modules/security/gopass/default.nix b/modules/security/gopass/default.nix
index d154226..4fefdd2 100644
--- a/modules/security/gopass/default.nix
+++ b/modules/security/gopass/default.nix
@@ -5,6 +5,32 @@
   pkgs,
   ...
 }:
+let
+  inherit ((import ../../lib/script.nix { inherit lib pkgs; })) mkScriptModule;
+
+  gopassKeys = config.security.ssh.gopassKeys;
+
+  gopassSshLoad = mkScriptModule {
+    scope = [
+      "security"
+      "gopass"
+    ];
+    name = "gopass-ssh-load";
+    path = ./gopass-ssh-load.sh;
+    description = "Load SSH keys from gopass password store";
+    env = {
+      GNUPGHOME = config.home.sessionVariables.GNUPGHOME;
+      GOPASS_SSH_KEYS = lib.concatStringsSep " " gopassKeys;
+    };
+    deps = with pkgs; [
+      config.security.gopass.package
+      gnupg
+      openssh
+      bash
+    ];
+    inherit config;
+  };
+in
 {
   options.security.gopass = {
     enable = lib.mkEnableOption "Enables gopass.";
@@ -15,33 +41,37 @@
       description = "The gopass package to use.";
     };
     ssh-agent.enable = lib.mkEnableOption "gopass-backed SSH keys for git";
-  };
+  }
+  // gopassSshLoad.options.security.gopass;
 
-  config = lib.mkIf config.security.gopass.enable {
-    programs.password-store = {
-      enable = true;
-      package = pkgs.gopass.override { passAlias = true; };
-      settings = {
-        PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.local/share/pass";
+  config = lib.mkMerge [
+    (lib.mkIf config.security.gopass.enable {
+      programs.password-store = {
+        enable = true;
+        package = pkgs.gopass.override { passAlias = true; };
+        settings = {
+          PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.local/share/pass";
+        };
       };
-    };
 
-    home.sessionVariables = {
-      PASSWORD_STORE_DIR = config.programs.password-store.settings.PASSWORD_STORE_DIR;
-    };
+      home.sessionVariables = {
+        PASSWORD_STORE_DIR = config.programs.password-store.settings.PASSWORD_STORE_DIR;
+      };
 
-    home.file.".local/share/icons/hicolor/scalable/apps/gopass.svg" = {
-      source = ../../../assets/icons/gopass.svg;
-    };
+      home.file.".local/share/icons/hicolor/scalable/apps/gopass.svg" = {
+        source = ../../../assets/icons/gopass.svg;
+      };
 
-    xdg.desktopEntries."gopass" = {
-      name = "gopass";
-      exec = "${lib.getExe config.terminal.kitty.package} --class gopass -e ${lib.getExe config.security.gopass.package}";
-      icon = "gopass";
-      comment = "Standard Unix password manager (Go implementation)";
-      categories = [ "Utility" ];
-      terminal = false;
-      type = "Application";
-    };
-  };
+      xdg.desktopEntries."gopass" = {
+        name = "gopass";
+        exec = "${lib.getExe config.terminal.kitty.package} --class gopass -e ${lib.getExe config.security.gopass.package}";
+        icon = "gopass";
+        comment = "Standard Unix password manager (Go implementation)";
+        categories = [ "Utility" ];
+        terminal = false;
+        type = "Application";
+      };
+    })
+    gopassSshLoad.config
+  ];
 }