diff --git a/dot_profile b/dot_profile index d7a1b57..258324a 100644 --- a/dot_profile +++ b/dot_profile @@ -25,9 +25,9 @@ export PATH="$PATH:~/.spoof-dpi/bin" # ┌───────────┐ # │ 1PASSWORD │ # └───────────┘ -_is_linux && export SSH_AUTH_SOCK=~/.1password/agent.sock -_is_darwin && \ - export SSH_AUTH_SOCK=~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock +# _is_linux && export SSH_AUTH_SOCK=~/.1password/agent.sock +# _is_darwin && \ +# export SSH_AUTH_SOCK=~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock # ┌──────────┐ # │ HOMEBREW │ diff --git a/dot_zsh/env.zsh b/dot_zsh/env.zsh deleted file mode 100644 index fceb2af..0000000 --- a/dot_zsh/env.zsh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/zsh -# vim:filetype=sh:tw=80 - -# ┌────────────┐ -# │ COMMON ENV │ -# └────────────┘ -export CLICOLOR=1 -export CLICOLOR_FORCE=1 - -# esc key delay -export KEYTIMEOUT=1 - -# default editor -export EDITOR=nvim - -# PATHS -export PATH="$HOME/.local/bin:$PATH" -export PATH="$HOME/.scripts/git:$PATH" - diff --git a/dot_zshenv b/dot_zshenv index b2fc07e..3f21d3a 100644 --- a/dot_zshenv +++ b/dot_zshenv @@ -1,5 +1,13 @@ #!/bin/zsh +# ┌─────────────┐ +# │ ZSH_OPTIONS │ +# └─────────────┘ +setopt no_global_rcs + +# ┌───────────┐ +# │ DETECT_OS │ +# └───────────┘ export CUR_OS=$(uname) if [ "$CUR_OS" = "Darwin" ]; then @@ -14,4 +22,19 @@ else function _is_linux() { return 1 } fi -setopt no_global_rcs +# ┌────────────┐ +# │ COMMON ENV │ +# └────────────┘ +export CLICOLOR=1 +export CLICOLOR_FORCE=1 + +# reduce esc delay +export KEYTIMEOUT=1 + +# set default editor to nvim +export EDITOR=nvim + +# PATHS +export PATH="$HOME/.local/bin:$PATH" +export PATH="$HOME/.scripts/git:$PATH" + diff --git a/dot_zshrc b/dot_zshrc index 428cfed..9c663d0 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -18,7 +18,6 @@ fpath+="$DOT_ZSH/_completion" source "$DOT_ZSH/oh-my-zsh/oh-my-zsh.sh" source "$DOT_ZSH/style.zsh" source "$DOT_ZSH/alias.zsh" -source "$DOT_ZSH/env.zsh" source "$DOT_ZSH/opt.zsh" source "$DOT_ZSH/keymap.zsh" source "$DOT_ZSH/func.zsh" diff --git a/init_private_resources.sh b/init_private_resources.sh index f17028d..b9df376 100755 --- a/init_private_resources.sh +++ b/init_private_resources.sh @@ -14,17 +14,26 @@ check-1password() { open -a 1Password error "Login 1password app" fi - - if ! ssh-add -l &>/dev/null; then - open -a 1Password - error "Setup 1password ssh-agent" - fi } check-1password -op read "op://Personal/SSH Github xvzc/public key" >~/.ssh/xvzc.pub && +op read --force \ + "op://mbqg52gjbireiglzwrrck5nbcm/br6vmskxg3yyesbwjfv2zev46y/public key" \ + | tr -d "\015" > ~/.ssh/xvzc.pub && \ chmod 600 ~/.ssh/xvzc.pub -op read "op://Personal/SSH Arch Linux/public key" >~/.ssh/arch.pub && - chmod 600 ~/.ssh/arch.pub +op read --force \ + "op://mbqg52gjbireiglzwrrck5nbcm/br6vmskxg3yyesbwjfv2zev46y/private key?ssh-format=openssh" \ + | tr -d '\015' > ~/.ssh/xvzc && \ + chmod 600 ~/.ssh/xvzc + +op read --force \ + "op://mbqg52gjbireiglzwrrck5nbcm/6dnb4xqgeh2voofslw3dr35dw4/public key" \ + | tr -d '\015' > ~/.ssh/arch.pub && \ + chmod 600 ~/.ssh/arch.pub + +op read --force \ + "op://mbqg52gjbireiglzwrrck5nbcm/6dnb4xqgeh2voofslw3dr35dw4/private key?ssh-format=openssh" \ + | tr -d '\015' > ~/.ssh/arch && \ + chmod 600 ~/.ssh/arch diff --git a/private_dot_ssh/private_config b/private_dot_ssh/private_config index 0388f2e..f9515c6 100644 --- a/private_dot_ssh/private_config +++ b/private_dot_ssh/private_config @@ -7,11 +7,10 @@ Host home HostName home.xvzc.dev User jerry IdentitiesOnly yes - IdentityFile ~/.ssh/arch.pub + IdentityFile ~/.ssh/arch Host xvzc.github.com - HostName github.com - ForwardAgent yes + HostName github.com IdentitiesOnly yes - IdentityFile ~/.ssh/xvzc.pub + IdentityFile ~/.ssh/xvzc