From 0caacbdf420e1da5da01353958f5bd082f77b884 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 4 Jul 2020 06:15:53 +0200
Subject: l: add klem service

---
 lass/3modules/klem.nix | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 lass/3modules/klem.nix

(limited to 'lass/3modules')

diff --git a/lass/3modules/klem.nix b/lass/3modules/klem.nix
new file mode 100644
index 00000000..a297adcd
--- /dev/null
+++ b/lass/3modules/klem.nix
@@ -0,0 +1,75 @@
+{ config, pkgs, ... }: with import <stockholm/lib>; let
+  cfg = config.lass.klem;
+in {
+  options.lass.klem = mkOption {
+    default = {};
+    type = types.attrsOf (types.submodule ({ config, ...}: {
+      options = {
+        target = mkOption {
+          default = ".*";
+          description = ''
+            regex of valid targets
+            can be shown with xclip -selection clipboard -t TARGETS
+            the first hit is taken as target argument
+          '';
+          type = types.str;
+        };
+        script = mkOption {
+          description = ''
+            file to run if entry is selected
+          '';
+          type = types.path;
+        };
+        label = mkOption {
+          default = config._module.args.name;
+          description = ''
+            label to show in dmenu for this script
+          '';
+          type = types.str;
+        };
+      };
+    }));
+  };
+  config = let
+    klem = pkgs.writers.writeDashBin "klem" ''
+      set -x
+
+      labels=""
+      # match filetype against patterns
+      ${concatMapStringsSep "\n" (script: ''
+        ${pkgs.xclip}/bin/xclip -selection clipboard -target TARGETS -out \
+          | grep -q '${script.target}'
+        if [ $? -eq 0 ]; then
+          labels="$labels:${script.label}"
+        fi
+      '') (attrValues cfg)}
+
+      #remove empty line, feed into dmenu
+      script=$(echo "$labels" \
+        | ${pkgs.gnused}/bin/sed 's/^://;s/:/\n/g' \
+        | ${pkgs.dmenu}/bin/dmenu)
+
+      #run the chosen script
+      case $script in
+        ${concatMapStringsSep "\n" (script: indent ''
+          ${script.label})
+            target=$(${pkgs.xclip}/bin/xclip -selection clipboard -target TARGETS -out \
+              | ${pkgs.gnugrep}/bin/grep '${script.target}' \
+              | ${pkgs.gnugrep}/bin/grep -v TARGETS \
+              | ${pkgs.coreutils}/bin/head -1)
+            ${pkgs.xclip}/bin/xclip -selection clipboard -target "$target" -out \
+            | ${script.script} \
+            | ${pkgs.xclip}/bin/xclip -selection clipboard -in
+          ;;
+        '') (attrValues cfg)}
+      esac
+    '';
+  in mkIf (cfg != {}) {
+    environment.systemPackages = [ klem ];
+    nixpkgs.overlays = [
+      (self: super: {
+        klem = klem;
+      })
+    ];
+  };
+}
-- 
cgit v1.2.3


From dbee272de6f3dae261ac6e15992b91cd3c1d02ed Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 4 Jul 2020 10:20:26 +0200
Subject: l: import klem module

---
 lass/3modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lass/3modules')

diff --git a/lass/3modules/default.nix b/lass/3modules/default.nix
index f6179c39..335658ed 100644
--- a/lass/3modules/default.nix
+++ b/lass/3modules/default.nix
@@ -6,6 +6,7 @@ _:
     ./folderPerms.nix
     ./hass.nix
     ./hosts.nix
+    ./klem.nix
     ./mysql-backup.nix
     ./news.nix
     ./nichtparasoup.nix
-- 
cgit v1.2.3


From b5b90b598430cfa876639d76dbbdc8d826ccb5c0 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 4 Aug 2020 20:28:04 +0200
Subject: types.secret-file: add service option

---
 lass/3modules/ejabberd/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lass/3modules')

diff --git a/lass/3modules/ejabberd/default.nix b/lass/3modules/ejabberd/default.nix
index 4838a909..9642c64c 100644
--- a/lass/3modules/ejabberd/default.nix
+++ b/lass/3modules/ejabberd/default.nix
@@ -74,8 +74,15 @@ in {
 
     systemd.services.ejabberd = {
       wantedBy = [ "multi-user.target" ];
-      requires = [ "secret.service" ];
-      after = [ "network.target" "secret.service" ];
+      after = [
+        config.krebs.secret.files.ejabberd-certfile.service
+        config.krebs.secret.files.ejabberd-s2s_certfile.service
+        "network.target"
+      ];
+      requires = [
+        config.krebs.secret.files.ejabberd-certfile.service
+        config.krebs.secret.files.ejabberd-s2s_certfile.service
+      ];
       serviceConfig = {
         ExecStartPre = "${gen-dhparam} ${cfg.dhfile.path}";
         ExecStart = "${cfg.pkgs.ejabberdctl}/bin/ejabberdctl foreground";
-- 
cgit v1.2.3


From ec91d1b83cfad151033433159a04eb7b5381bc73 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 4 Aug 2020 22:22:43 +0200
Subject: krebs.secret: restart units on secret change

---
 lass/3modules/ejabberd/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lass/3modules')

diff --git a/lass/3modules/ejabberd/default.nix b/lass/3modules/ejabberd/default.nix
index 9642c64c..20a38d57 100644
--- a/lass/3modules/ejabberd/default.nix
+++ b/lass/3modules/ejabberd/default.nix
@@ -17,6 +17,7 @@ in {
     certfile = mkOption {
       type = types.secret-file;
       default = {
+        name = "ejabberd-certfile";
         path = "${cfg.user.home}/ejabberd.pem";
         owner = cfg.user;
         source-path = "/var/lib/acme/lassul.us/full.pem";
@@ -25,6 +26,7 @@ in {
     dhfile = mkOption {
       type = types.secret-file;
       default = {
+        name = "ejabberd-dhfile";
         path = "${cfg.user.home}/dhparams.pem";
         owner = cfg.user;
         source-path = "/dev/null";
@@ -79,7 +81,7 @@ in {
         config.krebs.secret.files.ejabberd-s2s_certfile.service
         "network.target"
       ];
-      requires = [
+      partOf = [
         config.krebs.secret.files.ejabberd-certfile.service
         config.krebs.secret.files.ejabberd-s2s_certfile.service
       ];
-- 
cgit v1.2.3