From da9ae85de30fc668a004d76956b1a77a2120850f Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 16 May 2022 08:56:56 -0500 Subject: [PATCH] fix direnv installation check --- .config/nvim/init.vim | 3 +++ .tmux.conf | 4 ++++ .zprofile | 18 +++++++++--------- .zshenv | 1 + .zshrc | 6 +++++- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 7a1a9af..d047833 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -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'} diff --git a/.tmux.conf b/.tmux.conf index 799287a..3516a79 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -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' diff --git a/.zprofile b/.zprofile index cbf3fb1..6daea10 100644 --- a/.zprofile +++ b/.zprofile @@ -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" diff --git a/.zshenv b/.zshenv index aa13ad7..9316223 100644 --- a/.zshenv +++ b/.zshenv @@ -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" diff --git a/.zshrc b/.zshrc index f12c972..7592f41 100644 --- a/.zshrc +++ b/.zshrc @@ -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