fix direnv installation check

This commit is contained in:
Josh Thomas 2022-05-16 08:56:56 -05:00
parent a1ec73531f
commit da9ae85de3
5 changed files with 22 additions and 10 deletions

View file

@ -78,6 +78,9 @@ Plug 'editorconfig/editorconfig-vim'
" code completion
Plug 'neoclide/coc.nvim', {'branch': 'release'}
" elixir
Plug 'elixir-lsp/coc-elixir', {'do': 'yarn install && yarn prepack'}
" treesitter syntax highlighting
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}

View file

@ -66,6 +66,10 @@ bind-key -n C-M-h resize-pane -L
bind-key -n C-M-Right resize-pane -R
bind-key -n C-M-l resize-pane -R
# Fix Home and End keys
bind-key -n Home send Escape "OH"
bind-key -n End send Escape "OF"
set -g @plugin 'tmux-plugins/tpm'
run '~/.tmux/plugins/tpm/tpm'

View file

@ -1,15 +1,15 @@
# file runs once at login
# ssh-agent
if [ -z "$SSH_AUTH_SOCK" ]; then
# Check for a currently running instance of the agent
RUNNING_AGENT="`ps -ax | grep 'ssh-agent -s' | grep -v grep | wc -l | tr -d '[:space:]'`"
if [ "$RUNNING_AGENT" = "0" ]; then
# Launch a new instance of the agent
ssh-agent -s &> $HOME/.ssh/ssh-agent
fi
eval `cat $HOME/.ssh/ssh-agent`
fi
# if [ -z "$SSH_AUTH_SOCK" ]; then
# # Check for a currently running instance of the agent
# RUNNING_AGENT="`ps -ax | grep 'ssh-agent -s' | grep -v grep | wc -l | tr -d '[:space:]'`"
# if [ "$RUNNING_AGENT" = "0" ]; then
# # Launch a new instance of the agent
# ssh-agent -s &> $HOME/.ssh/ssh-agent
# fi
# eval `cat $HOME/.ssh/ssh-agent`
# fi
if [ -d "$HOME/.pyenv" ] ; then
export PYENV_ROOT="$HOME/.pyenv"

View file

@ -14,3 +14,4 @@ export PATH="$FLYCTL_INSTALL/bin:$PATH"
export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
skip_global_compinit=1
. "$HOME/.cargo/env"

6
.zshrc
View file

@ -10,6 +10,7 @@ plugins=(
nvm
python
pyenv
ssh-agent
virtualenv
z
# zsh-autosuggestions
@ -17,6 +18,9 @@ plugins=(
# zsh-syntax-highlighting
)
# ssh-agent plugin config
zstyle :omz:plugins:ssh-agent identities hetzner id_ed25519 id_ed25519_do id_ed25519_twc
source $ZSH/oh-my-zsh.sh
for file in ${DOTFILES}/utils/*; do
@ -33,7 +37,7 @@ else
export EDITOR='nvim'
fi
export SSH_KEY_PATH="~/.ssh/id_ed25519:~/.ssh/id_ed25519_twc:~/.ssh/id_ed25519_do"
# export SSH_KEY_PATH="~/.ssh/id_ed25519:~/.ssh/id_ed25519_twc:~/.ssh/id_ed25519_do"
if [ -f ~/.aliases ]; then
source ${HOME}/.aliases