add atuin client to alastor, fix espanso secrets · jaspermayone.com/dots@d4f2791

+6

hosts/alastor/configuration.nix

··· 124 124 owner = "pds"; 125 125 group = "pds"; 126 126 }; 127 + atuin-key = { 128 + file = ../../secrets/atuin-key.age; 129 + path = "/home/jsp/.local/share/atuin/key"; 130 + owner = "jsp"; 131 + mode = "400"; 132 + }; 127 133 }; 128 134 129 135 # FRP tunnel server

+13 -14

modules/configs.nix

··· 3 3 { config, lib, pkgs, isDarwin, ... }: 4 4 5 5 let 6 - # Paths for secrets 7 - secretsDir = ../secrets; 8 - dotsDir = "/Users/jsp/dev/dots"; # Adjust if needed 6 + # Paths for secrets - platform-specific 7 + dotsDir = if isDarwin then "/Users/jsp/dev/dots" else "/home/jsp/dots"; 9 8 in 10 9 { 11 10 # btop configuration ··· 52 51 # This runs on every home-manager activation 53 52 home.activation.decryptUserSecrets = lib.hm.dag.entryAfter ["writeBoundary"] '' 54 53 SECRETS_DIR="${dotsDir}/secrets" 55 - AGENIX="${pkgs.age}/bin/age" 54 + AGE="${pkgs.age}/bin/age" 56 55 SSH_KEY="$HOME/.ssh/id_ed25519" 56 + ${if isDarwin then '' 57 + ESPANSO_DIR="$HOME/Library/Application Support/espanso/match" 58 + '' else '' 59 + ESPANSO_DIR="$HOME/.config/espanso/match" 60 + ''} 57 61 58 62 # Only proceed if we have the SSH key for decryption 59 63 if [ -f "$SSH_KEY" ]; then 60 64 # Decrypt espanso secrets 61 65 ESPANSO_SECRETS="$SECRETS_DIR/espanso-secrets.age" 62 66 if [ -f "$ESPANSO_SECRETS" ]; then 63 - ${if isDarwin then '' 64 - ESPANSO_DIR="$HOME/Library/Application Support/espanso/match" 65 - '' else '' 66 - ESPANSO_DIR="$HOME/.config/espanso/match" 67 - ''} 68 - mkdir -p "$ESPANSO_DIR" 69 - $AGENIX -d -i "$SSH_KEY" "$ESPANSO_SECRETS" > "$ESPANSO_DIR/secrets.yml" 2>/dev/null || true 67 + $DRY_RUN_CMD mkdir -p "$ESPANSO_DIR" 68 + $DRY_RUN_CMD $AGE -d -i "$SSH_KEY" "$ESPANSO_SECRETS" > "$ESPANSO_DIR/secrets.yml" 2>/dev/null || echo "Warning: Failed to decrypt espanso secrets" 70 69 fi 71 70 72 71 # Decrypt wakatime API key and merge with config 73 72 WAKATIME_SECRET="$SECRETS_DIR/wakatime-api-key.age" 74 73 if [ -f "$WAKATIME_SECRET" ]; then 75 - API_KEY=$($AGENIX -d -i "$SSH_KEY" "$WAKATIME_SECRET" 2>/dev/null || echo "") 74 + API_KEY=$($AGE -d -i "$SSH_KEY" "$WAKATIME_SECRET" 2>/dev/null || echo "") 76 75 if [ -n "$API_KEY" ]; then 77 - cat > "$HOME/.wakatime.cfg" << EOF 76 + $DRY_RUN_CMD cat > "$HOME/.wakatime.cfg" << EOF 78 77 [settings] 79 78 api_url = https://waka.hogwarts.dev/api 80 79 api_key = $API_KEY ··· 88 87 # Decrypt npmrc (contains registry auth tokens) 89 88 NPMRC_SECRET="$SECRETS_DIR/npmrc.age" 90 89 if [ -f "$NPMRC_SECRET" ]; then 91 - $AGENIX -d -i "$SSH_KEY" "$NPMRC_SECRET" > "$HOME/.npmrc" 2>/dev/null || true 90 + $DRY_RUN_CMD $AGE -d -i "$SSH_KEY" "$NPMRC_SECRET" > "$HOME/.npmrc" 2>/dev/null || echo "Warning: Failed to decrypt npmrc" 92 91 fi 93 92 fi 94 93 '';

secrets/atuin-key.age