fix(1password): move env template out of ~/.config/op to avoid permission conflict
HM creating ~/.config/op/ with 755 prevents op CLI from running (requires 700). Move template to ~/.config/1password/, use nix-darwin programs._1password module.
This commit is contained in:
@@ -49,9 +49,6 @@
|
|||||||
|
|
||||||
# Secrets management (WSL uses Windows op.exe via interop)
|
# Secrets management (WSL uses Windows op.exe via interop)
|
||||||
]
|
]
|
||||||
++ lib.optionals pkgs.stdenv.isDarwin [
|
|
||||||
_1password-cli
|
|
||||||
]
|
|
||||||
++ (with pkgs; [
|
++ (with pkgs; [
|
||||||
# AI coding agent
|
# AI coding agent
|
||||||
opencode
|
opencode
|
||||||
|
|||||||
+3
-3
@@ -3,7 +3,7 @@
|
|||||||
{
|
{
|
||||||
# ── 1Password env template ──────────────────────────
|
# ── 1Password env template ──────────────────────────
|
||||||
# op:// references only — no real secrets, safe to commit
|
# op:// references only — no real secrets, safe to commit
|
||||||
xdg.configFile."op/env.tpl".text = ''
|
xdg.configFile."1password/env.tpl".text = ''
|
||||||
AI_GATEWAY_BASE_URL={{ op://Private/AI Gateway API/URL }}
|
AI_GATEWAY_BASE_URL={{ op://Private/AI Gateway API/URL }}
|
||||||
AI_GATEWAY_API_KEY={{ op://Private/AI Gateway API/credential }}
|
AI_GATEWAY_API_KEY={{ op://Private/AI Gateway API/credential }}
|
||||||
EXA_API_KEY={{ op://Private/Exa API/credential }}
|
EXA_API_KEY={{ op://Private/Exa API/credential }}
|
||||||
@@ -62,10 +62,10 @@
|
|||||||
|
|
||||||
# 1Password → env vars (single op call, silent if locked)
|
# 1Password → env vars (single op call, silent if locked)
|
||||||
function op-env --description "Load secrets from 1Password"
|
function op-env --description "Load secrets from 1Password"
|
||||||
if not type -q op; or not test -f ~/.config/op/env.tpl
|
if not type -q op; or not test -f ~/.config/1password/env.tpl
|
||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
for line in (op inject < ~/.config/op/env.tpl 2>/dev/null)
|
for line in (op inject < ~/.config/1password/env.tpl 2>/dev/null)
|
||||||
string match -qr '^\s*(#|$)' -- $line; and continue
|
string match -qr '^\s*(#|$)' -- $line; and continue
|
||||||
set -l kv (string split -m 1 '=' $line)
|
set -l kv (string split -m 1 '=' $line)
|
||||||
if test (count $kv) -ge 2
|
if test (count $kv) -ge 2
|
||||||
|
|||||||
@@ -7,6 +7,9 @@
|
|||||||
# ── Shell ──────────────────────────────────────────
|
# ── Shell ──────────────────────────────────────────
|
||||||
programs.fish.enable = true;
|
programs.fish.enable = true;
|
||||||
|
|
||||||
|
# ── 1Password CLI ───────────────────────────────────
|
||||||
|
programs._1password.enable = true;
|
||||||
|
|
||||||
# ── SSH ───────────────────────────────────────────
|
# ── SSH ───────────────────────────────────────────
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user