From 05947deacd0818616c6711c9bc42158dc1b06a70 Mon Sep 17 00:00:00 2001
From: Joey Hafner <joey@jafner.net>
Date: Mon, 23 Sep 2024 18:59:41 -0700
Subject: [PATCH] Update from joey@joey-laptop: Update fzf-bw to (mostly)
 working state. Init fzf-jq.

---
 nix/debug.txt                                 |   1 +
 .../app/bitwarden/.bitwarden.nix.swp          | Bin 0 -> 12288 bytes
 nix/home-manager/app/bitwarden/bitwarden.nix  |  22 +++++++++++++-----
 nix/home-manager/app/fzf-jq/fzf-jq.nix        |  19 +++++++++++++++
 nix/home-manager/app/sh/sh.nix                |  18 +++++++-------
 5 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 nix/debug.txt
 create mode 100644 nix/home-manager/app/bitwarden/.bitwarden.nix.swp
 create mode 100644 nix/home-manager/app/fzf-jq/fzf-jq.nix

diff --git a/nix/debug.txt b/nix/debug.txt
new file mode 100644
index 00000000..e475d899
--- /dev/null
+++ b/nix/debug.txt
@@ -0,0 +1 @@
+0.55.0 (v0.55.0)
diff --git a/nix/home-manager/app/bitwarden/.bitwarden.nix.swp b/nix/home-manager/app/bitwarden/.bitwarden.nix.swp
new file mode 100644
index 0000000000000000000000000000000000000000..cd36ab281b97fb079cedb480c132903b903090a6
GIT binary patch
literal 12288
zcmeHN&yU+g6rS?46k4Fb1(0}ngR(1PC%YA`x~m|eRaLeEQ7GF3ZK)i4lFY`jU3=Ul
z-CZid1ulpS>Oa7N6Z{1n;DY!cKt*sVH#l(To3Wi_w{5nSS|QL_`ebM3&AfTveD94{
z>sI6J+S_#8S!B4LV(g3Sf3;tH{;hpK-Pq4IB0f^hdtJ)T4%}Eq@l4Z?lwtjp+YWi+
zgk07`F|2o^KDYaB=yrHgcjLI;5^~@sJ`X2P4h(0`Y&s1ChJn2qILMAHEjE<hob@t2
zb9jC4A;!WmU>GnA7zPXjh5^HXVZbn882H~XAme@PDx!Iyh-js_@7r}Rewv$Mz%XDK
zFbo(53<HJ%!+>GHFkl!k3>XFs1OGt=T%WP0A7t#ghp>43|G)hE|F<U@`xW>e_!jsY
zxCVR<#K1A&CEx&X;}BzC0UrbJ0w;hu;QB$vz5_l5wtx?S!@!?UFt!FXffs<EAIJQF
z1^j)0u|I$xflq*UfFB-X>`UM?;3{wy_+>w1r-9{18CwEu;1F=_5ysvG<im`mKp)ru
z1n?U0JL3EX7y%~%75B4%xeNn_fr5cKYF}yFt%2R)^0b?#M4Kce@1IJekhYi0pQ>vR
zB|dGl=@IKGPfC+rBUD%D_WAUPln30CQ34;W!PuV4EBCyfiQR72u%Ob7>aI-<pI+{G
zZRLz=(5*d%QHZ6{9C=YJcuE<TTccPpAS3bu5w{|InxtmTLQe{?QCx5s#+ghtJ7pvM
zM48N+8QUgCRIQ@Gs{Zi=twGz4qd1FUopLwvx=pLHXsu9BNI4?gmO=)+*bw}TF7qT2
zKBt8DdB4Szivtn*(coe#uJC3UO`C{NNZ|&h#X$J7+dO`>F~g?IMW-v9M;eXNrB#`4
z4JZ())EY=JIA14K^812??c5#H?r3sB(d{R*irK93bbJ^`i6rel3xmk(!L`~9rMb2M
zDf;8Fy8f!nX$@r5;~{NPC*d&_gSWt`Pt~;k;rYt>v|g{G-^(P~ewC_Zx0e=Z>GitL
zFW18?2oOb_M4iO#r_PnM>jY6pgeQhFajA)|L-&Oh9qBeL=sS_*L#aCphZ{(dVgt*J
z!O!_gK55xbTE^<PDr%^Te*CmT-0NaPL$b=mS*CfdO@D_V7a*632c3UbrF3s0<UwF#
z*k}c!aecCrVrHw%;5(UC*<x+CoR$xTq=phV>1&SOi(J3&#><pOaf;-S9JK0;K_>a!
zOGdHOnWZ)}B{!wOm0aE9C{0Bx;5EvHU49%$-AMNMh}tL>monk?P-T#ym>WCp#$DmL
z0pSC}01wJh>Wmlje&k2XbTV;0-o`eMsOyG4^s_3H;MG;~+|c8J2s<^3+HFkR=dv4V
zihYrwIAKJbAO?bK#Ur`nrPoOG;{d6MUbO|XpAAdLeCP$4&(Cyu5Uh5&*Gr+4b7Y-a
zU1}^IwMsETRa6p3C_kmN6q9#6g)*L@MJ=R4SkS}9C5V8k&bbSYKqhRdr6al2;>klO
zD0{~muc&lO_+`Nd&FVy6TELszrA&+2R*_HR?N^IQvQUaXU(3s)iW^SjUMID)FqJMg
z*ilZ4gi<4j^wH2Ht8iB4hF%vWK8K<*Dcm~_hI~BHJPi^kR8#)OL<_XZN{fG!-@9Sc
zwtbN*noz#(7qRz;(}@gK^|C5Ussbs+c@UJFbO=YeI^wkc(3NlVJe1gMR)oKRrcFy7
zz1A{W=jZb(?5GB%j|HnnR(T5SuqYd~g)%LA^HJM(B+yxM#LJM<enFb5gEL<{O2OT&
zBzMyXq9zGj#&|D+Q3ZV}nDW&t&nwkgyxZNEK-6~Liy+pOPV&;Ac4TJ|s#DjL{QX1)
zviEMNvvT~Vm&blnEn|7Ro_k!cZj()?^Aeh`Ob?vB233T$*-Z=CxTM?1AIPh9qD6f{
m@5HXx!zc9Wgc%6g)s=RI&aq9lsh{y0J6(Hg<TwsqR@pyo$K{p)

literal 0
HcmV?d00001

diff --git a/nix/home-manager/app/bitwarden/bitwarden.nix b/nix/home-manager/app/bitwarden/bitwarden.nix
index e42d8ced..bd53ce0e 100644
--- a/nix/home-manager/app/bitwarden/bitwarden.nix
+++ b/nix/home-manager/app/bitwarden/bitwarden.nix
@@ -1,9 +1,10 @@
-{ pkgs, ... }:
+{ pkgs, pkgs-unstable, ... }:
 {
   home.packages = with pkgs; [
     bitwarden-cli
     jq
     wl-clipboard
+    tmux
     ( writeShellApplication {
       name = "fzf-bw"; # { bwJson }: { itemPreviewJson }
       runtimeInputs = [
@@ -25,19 +26,28 @@
         } )
         ( writeShellApplication {
           name = "fzf-bw-selector"; # { bwJson }: { itemUuid }
-          runtimeInputs = [ jq fzf ];
-          text = ''export json="$1"; echo "$json" | jq -r '.[].id' | fzf --height 33% --preview='fzf-bw-getItem {} "$json" | jq -C' --preview-window right,60% --disabled --border --padding=1'';
+          runtimeInputs = [ jq pkgs-unstable.fzf ];
+          text = ''export json="$1"; echo "$json" | jq -r '.[].id' | fzf --preview='fzf-bw-getItem {} "$json" | jq -C' --disabled '';
+          excludeShellChecks = [ "SC2016" ];
+        } )
+        ( writeShellApplication {
+          name = "fzf-bw-selector-tmux"; # { bwJson }: { itemUuid }
+          runtimeInputs = [ jq pkgs-unstable.fzf ];
+          text = ''export json="$1"; echo "$json" | jq -r '.[].id' | fzf --tmux center,70% --preview='fzf-bw-getItem {} "$json" | jq -C' '';
           excludeShellChecks = [ "SC2016" ];
         } )
       ] ;
       excludeShellChecks = [ "SC2016" ];
-      text = ''export json="$1"; itemJson="$(fzf-bw-getItem "$(fzf-bw-selector "$json")" "$json")"; echo "Username: (copied to clipboard)"; fzf-bw-getUser "$itemJson" | wl-copy; read -r; echo "Password: (copied to clipboard)"; fzf-bw-getPass "$itemJson" | wl-copy'';
+      # Todo: Gracefully handle Ctrl+C canceling, offer method to directly print or copy a password, implement fzf-tmux.
+      # Roadmap: sops integration to decrypt passwords as late as possible, window-manager hotkey for quicker use in graphical applications.
+      text = ''export json="$1"; itemJson="$(fzf-bw-getItem "$(fzf-bw-selector "$json")" "$json")"; echo -n "Username: (copied to clipboard)"; fzf-bw-getUser "$itemJson" | wl-copy; read -r; echo "Password: (copied to clipboard)"; fzf-bw-getPass "$itemJson" | wl-copy; exit 0'';
     } )
-     
   ];
   programs.zsh.loginExtra = ''
-    export $(bw unlock --passwordfile /home/joey/.bwtoken | grep export | sed 's/^\$\s//' | cut -d' ' -f2) 
+    export $(bw unlock --passwordfile /home/joey/.bwtoken | grep export | sed 's/^\$\s//' | cut -d' ' -f2) 2>/dev/null
     function bwf { search="$1"; fzf-bw "$(bw list items --search "$search")" }
+    function bwf-popup { search="$1"; kitty --title fzf-bw --override remember_window_size=no --override initial_window_width=960 --override initial_window_height=300 fzf-bw "$(bw list items --search $search)" }
+
   '';
 } 
 
diff --git a/nix/home-manager/app/fzf-jq/fzf-jq.nix b/nix/home-manager/app/fzf-jq/fzf-jq.nix
new file mode 100644
index 00000000..eee46742
--- /dev/null
+++ b/nix/home-manager/app/fzf-jq/fzf-jq.nix
@@ -0,0 +1,19 @@
+{ pkgs, pkgs-unstable, ... }:
+{
+  home.packages = with pkgs; [
+    jq
+    wl-clipboard
+    ( writeShellApplication {
+      name = "fzf-jq"; # { bwJson }: { itemPreviewJson }
+      runtimeInputs = [ wl-clipboard jq ] ;
+      excludeShellChecks = [ "SC2016" ];
+      text = ''export json="$1"; itemJson="$(fzf-bw-getItem "$(fzf-bw-selector "$json")" "$json")"; echo -n "Username: (copied to clipboard)"; fzf-bw-getUser "$itemJson" | wl-copy; read -r; echo "Password: (copied to clipboard)"; fzf-bw-getPass "$itemJson" | wl-copy; exit 0'';
+    } )
+  ];
+  programs.zsh.loginExtra = '' '';
+} 
+
+# fzf-jq          { jsonBody, searchByExp, itemPreviewExp }: {  } 
+#  summary: allows the user to interactively browse json objects
+#  details: takes a json object containing a list of objects, a jq expression which returns the list of objects on one line each, and a jq expression which returns only the object currently selected
+
diff --git a/nix/home-manager/app/sh/sh.nix b/nix/home-manager/app/sh/sh.nix
index 78616a1a..000dabc4 100644
--- a/nix/home-manager/app/sh/sh.nix
+++ b/nix/home-manager/app/sh/sh.nix
@@ -7,6 +7,13 @@
     enable = true;
   };
 
+  ## Tmux
+  programs.tmux = {
+    enable = true;
+    newSession = true;
+    shell = "$HOME/.nix-profile/bin/zsh";
+  };
+
   # Shell
   ## Zsh
   programs.zsh = {
@@ -17,7 +24,6 @@
     syntaxHighlighting.enable = true;
     shellAliases = {
       bat = "bat --paging=never --color=always";
-      cat = "bat";
       fd = "fd -Lu";
       ls = "eza";
       fetch = "fastfetch";
@@ -63,7 +69,7 @@
   home.packages = with pkgs; [
     fastfetch
     tree btop
-    bat fd eza fzf-git-sh tmux
+    bat fd eza fzf-git-sh
     wl-clipboard
     pkgs-unstable.fzf
   ];
@@ -108,11 +114,5 @@
   programs.fzf = {
     enable = true;
     package = pkgs-unstable.fzf;
-  }; 
-  
-  ## tmux
-  programs.tmux = {
-    enable = true;
-  };
-
+  };   
 }