mirror of
https://github.com/shokinn/.files.git
synced 2025-01-18 13:22:25 +00:00
Compare commits
4 commits
4b0a1c3fa6
...
9ec699d16e
Author | SHA1 | Date | |
---|---|---|---|
Philip Henning | 9ec699d16e | ||
Philip Henning | cdf4a224a9 | ||
Philip Henning | 2deb21d942 | ||
Philip Henning | 09129cdd55 |
|
@ -103,9 +103,9 @@ gen-user-key() {
|
|||
local keyname="${1}"
|
||||
local public_key="${2}"
|
||||
local working_directory="${3:-$(pwd)}"
|
||||
local begin_marker='#-----BEGIN USER-SECRETS-----'
|
||||
local end_marker='#------END USER-SECRETS------'
|
||||
local input_file="${working_directory}/secrets.nix"
|
||||
local begin_marker='#-----BEGIN USER PUBLIC KEYS-----'
|
||||
local end_marker='#------END USER PUBLIC KEYS------'
|
||||
local input_file="${working_directory}/secrets/secrets.nix"
|
||||
local userkey
|
||||
|
||||
if [[ ${public_key} == "EMPTY" ]]; then
|
||||
|
@ -130,9 +130,9 @@ get-host-key() {
|
|||
local target="${2}"
|
||||
local type="${3:-ssh-ed25519}"
|
||||
local working_directory="${4:-$(pwd)}"
|
||||
local begin_marker='#-----BEGIN SYSTEM-SECRETS-----'
|
||||
local end_marker='#------END SYSTEM-SECRETS------'
|
||||
local input_file="${working_directory}/secrets.nix"
|
||||
local begin_marker='#-----BEGIN SYSTEM PUBLIC KEYS-----'
|
||||
local end_marker='#------END SYSTEM PUBLIC KEYS------'
|
||||
local input_file="${working_directory}/secrets/secrets.nix"
|
||||
local hostkey
|
||||
|
||||
echo "getting host public key for host ${keyname}"
|
||||
|
|
|
@ -7,6 +7,9 @@ Include /Users/phg/.colima/ssh_config
|
|||
Include config.d/*.config
|
||||
Include config.d/*/*.config
|
||||
|
||||
{%@@ if profile == 'susanoo.local' or profile == 'WVDEWOBMC001307' @@%}Host *
|
||||
{%@@ if profile == 'susanoo.local' or profile == 'WVDEWOBMC001307' @@%}#
|
||||
# This have to be LAST
|
||||
#
|
||||
Host *
|
||||
IdentityAgent "~/Library/Group Containers/group.strongbox.mac.mcguill/agent.sock"
|
||||
{%@@ endif @@%}
|
||||
|
|
|
@ -80,7 +80,6 @@ ZSH_PYENV_VIRTUALENV="true"
|
|||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||
# Add wisely, as too many plugins slow down shell startup.
|
||||
plugins=(
|
||||
ag
|
||||
aws
|
||||
colored-man-pages
|
||||
cp
|
||||
|
@ -109,7 +108,6 @@ plugins=(
|
|||
tig
|
||||
themes
|
||||
vscode
|
||||
#zsh-completions (https://github.com/zsh-users/zsh-completions/issues/603)
|
||||
zsh-navigation-tools
|
||||
zsh-ssh
|
||||
{%@@ if profile == 'ymir' or profile == 'susanoo.local' @@%} # Mac specifics
|
||||
|
@ -174,6 +172,7 @@ source ${ZSH}/oh-my-zsh.sh
|
|||
|
||||
alias ssh-no-check="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
|
||||
alias ssh-strongbox-keys="SSH_AUTH_SOCK=~/Library/Group\ Containers/group.strongbox.mac.mcguill/agent.sock ssh-add -l"
|
||||
alias agenix='RULES='\''./secrets/secrets.nix'\'' agenix'
|
||||
alias agenix-edit="agenix -i {{@@ env['HOME'] @@}}/.ssh/agenix-phg -e"
|
||||
|
||||
# Initialize pyenv
|
||||
|
|
Loading…
Reference in a new issue