diff options
Diffstat (limited to 'config/doom/config.org')
| -rw-r--r-- | config/doom/config.org | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/config/doom/config.org b/config/doom/config.org index e373589..fcb6979 100644 --- a/config/doom/config.org +++ b/config/doom/config.org @@ -61,9 +61,11 @@ Doom manages packages separately. Keep that file separate (defun on/fetch-password (&rest params) (if-let* ((match (car (apply #'auth-source-search params))) (secret (plist-get match :secret))) - (if (functionp secret) - (funcall secret) - secret) + (values + (if (functionp secret) + (funcall secret) + secret) + match) (user-error "Password not found for %S" params)))) #+end_src ** Keybindings @@ -807,21 +809,24 @@ skills: (use-package json-rpc) (defun on/bitcoin-rpc-connect () (interactive) - (let* ((networks '(:mainnet 8332 - :mainnet-r 8335 - :testnet 18332 - :testnet-r 18335 - :regtest 18443)) - (host "localhost") - (user "crazy") - (port (plist-get networks - (intern (completing-read "Pick network: " networks)))) - (secret (on/fetch-password :host host))) + (let* ((networks '(mainnet 8332 + mainnet-r 8335 + testnet 18332 + testnet-r 18335 + regtest 18443 + )) + (pick (completing-read "Pick network: " networks)) + (host (thread-first pick (split-string "-") car)) + (port (plist-get networks pick #'string-equal)) + (user "rpc-emacs")) (when (and btc-explorer-bitcoind (json-rpc-live-p btc-explorer-bitcoind)) (json-rpc-close btc-explorer-bitcoind)) (setq btc-explorer-bitcoind - (json-rpc-connect host port user secret))))) + (cl-multiple-value-bind + (secret match) (on/fetch-password :host host :user user) + (json-rpc-connect + "localhost" port (plist-get match :user) secret)))))) (use-package! lnd :load-path "~/dev/emacs-lisp/btc-explorer/" @@ -829,6 +834,12 @@ skills: :config (setq lnd-nodes '(("local" "https://localhost:8480/v1/" "/run/media/titan/ext_backup/personal/bitcoin/lnd/data/chain/bitcoin/testnet/admin.macaroon") + ("reg-ali" "https://localhost:8001/v1/" + "/scratch/titan/lnd/reg-ali/data/chain/bitcoin/regtest/admin.macaroon") + ("reg-carl" "https://localhost:8002/v1/" + "/scratch/titan/lnd/reg-carl/data/chain/bitcoin/regtest/admin.macaroon") + ("reg-bob" "https://localhost:8003/v1/" + "/scratch/titan/lnd/reg-bob/data/chain/bitcoin/regtest/admin.macaroon") ("remote" "https://localhost:8481/v1/" "~/dev/emacs-lisp/btc-explorer/admin.macaroon")))) |