From 549282140fb267b4dcec875781109165a2c3fbd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Wed, 5 Oct 2022 16:50:22 +0200
Subject: [PATCH] fix(rofi-pass): include via home-manager

also fix https://github.com/carnager/rofi-pass/issues/226
---
 configs/default.nix      |  6 ------
 configs/i3.nix           |  4 ++--
 configs/rofi.nix         |  8 ++++++++
 packages/rofi-pass.patch | 12 ------------
 4 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 packages/rofi-pass.patch

diff --git a/configs/default.nix b/configs/default.nix
index b29594c..793f4e1 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -31,12 +31,6 @@ in {
             tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
             iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
             ix = pkgs.callPackage <niveum/packages/ix.nix> {};
-            rofi-pass = pkgs.rofi-pass.overrideAttrs (final: previous: {
-              patches = [
-                # password store androi
-                <niveum/packages/rofi-pass.patch>
-              ];
-            });
           };
         };
       };
diff --git a/configs/i3.nix b/configs/i3.nix
index 53bd73e..c51a665 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -231,7 +231,7 @@ in {
         "${modifier}+0" = "exec ${scripts.menu-calc}/bin/=";
 
         "${modifier}+Shift+w" = "exec ${scripts.k-lock}/bin/k-lock";
-        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec ${pkgs.rofi}/bin/rofi -modi run,window,ssh,filebrowser -show run''}";
+        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
         "${modifier}+Shift+d" = "exec ${
           pkgs.writers.writeDash "notemenu" ''
             set -efu
@@ -251,7 +251,7 @@ in {
             fi
           ''
         }";
-        "${modifier}+p" = "exec --no-startup-id ${pkgs.rofi-pass}/bin/rofi-pass";
+        "${modifier}+p" = "exec --no-startup-id rofi-pass";
         "${modifier}+u" = "exec ${scripts.unicodmenu}/bin/unicodmenu";
 
         "${modifier}+F6" = "exec ${pkgs.xorg.xkill}/bin/xkill";
diff --git a/configs/rofi.nix b/configs/rofi.nix
index bafad26..90cf676 100644
--- a/configs/rofi.nix
+++ b/configs/rofi.nix
@@ -9,5 +9,13 @@ in {
     enable = true;
     font = "Monospace 10";
     theme = "${pkgs.rofi}/share/rofi/themes/Arc.rasi";
+    pass = {
+      enable = true;
+      extraConfig = ''
+        USERNAME_field='login'
+        help_color="#FF0000"
+      ''; # help_color set by https://github.com/mrossinek/dotfiles/commit/13fc5f24caa78c8f20547bf473266879507f13bf
+    };
+    plugins = [pkgs.rofi-calc];
   };
 }
diff --git a/packages/rofi-pass.patch b/packages/rofi-pass.patch
deleted file mode 100644
index 8bd2e9c..0000000
--- a/packages/rofi-pass.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/rofi-pass b/rofi-pass
-index 48928db..13682a5 100755
---- a/rofi-pass
-+++ b/rofi-pass
-@@ -15,7 +15,7 @@ _image_viewer () {
-
- # We expect to find these fields in pass(1)'s output
- URL_field='url'
--USERNAME_field='user'
-+USERNAME_field='login'
- AUTOTYPE_field='autotype'
- OTPmethod_field='otp_method'