diff options
Diffstat (limited to 'Common/zshrc')
| -rw-r--r-- | Common/zshrc | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/Common/zshrc b/Common/zshrc index d3d8253..87f7b7c 100644 --- a/Common/zshrc +++ b/Common/zshrc @@ -12,7 +12,10 @@ export KEYTIMEOUT=1 # Check if env setup file exists if [ ! -f ~/.zsh_env_setup ]; then echo "export ZSH=$HOME/.oh-my-zsh" > ~/.zsh_env_setup - echo "DEFAULT_USER=$USER" >> ~/.zsh_env_setup + echo "DEFAULT_USER=$USER" >> ~/.zsh_env_setup + echo "export GIT_EDITOR=\"nvim\"" >> ~/.zsh_env_setup + echo "export GIT_AUTHOR_NAME=\"jakobst1n\"" >> ~/.zsh_env_setup + echo "export GIT_AUTHOR_EMAIL=\"jakob.stendahl@outlook.com\"" >> ~/.zsh_env_setup fi # Source env setup file @@ -35,18 +38,18 @@ plugins=( git zsh-autosuggestions zsh-syntax-highlighting - zsh-vi-mode + #zsh-vi-mode ) # zsh-vi-mode-setup #ZVM_CURSOR_STYLE_ENABLED=false -zvm_config() { - ZVM_INSERT_MODE_CURSOR=$ZVM_CURSOR_BLOCK - ZVM_NORMAL_MODE_CURSOR=$ZVM_CURSOR_UNDERLINE - ZVM_VISUAL_MODE_CURSOR=$ZVM_CURSOR_UNDERLINE - ZVM_VISUAL_LINE_MODE_CURSOR=$ZVM_CURSOR_UNDERLINE - ZVM_OPPEND_MODE_CURSOR=$ZVM_CURSOR_BLINKING_BLOCK -} +# zvm_config() { +# ZVM_INSERT_MODE_CURSOR=$ZVM_CURSOR_BLOCK +# ZVM_NORMAL_MODE_CURSOR=$ZVM_CURSOR_UNDERLINE +# ZVM_VISUAL_MODE_CURSOR=$ZVM_CURSOR_UNDERLINE +# ZVM_VISUAL_LINE_MODE_CURSOR=$ZVM_CURSOR_UNDERLINE +# ZVM_OPPEND_MODE_CURSOR=$ZVM_CURSOR_BLINKING_BLOCK +# } # Setup oh-my-zsh source $ZSH/oh-my-zsh.sh @@ -55,10 +58,8 @@ source $ZSH/oh-my-zsh.sh export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 -# Enable vi mode -bindkey -v -# Set vim as default editor -# export EDITOR=$(which vim) +# Set editor +export EDITOR="nvim" # Enable vim keybindings (This is enabled using zsh-vi-mode now. # bindkey -v @@ -69,8 +70,6 @@ alias lsa="ls -la" alias lsg="ls | grep" alias lsag="ls -la | grep" alias ls="tput setaf 3 && echo \"'lsa' for 'ls -la', \n'lsg' for 'ls | grep',\n'lsag' for 'ls -la | grep',\n'lsp' for 'ps -ax |grep'\" && tput sgr0 && ls" -alias notes="vim ~/Documents/notes.txt" -alias todo="vim ~/Documents/todo.txt" alias _vi=$(which vi) alias _vim=$(which vim) @@ -150,17 +149,12 @@ case "$OSTYPE" in ;; esac -export EDITOR="nvim" -#export GIT_AUTHOR_NAME="jakob.stendahl" -#export GIT_AUTHOR_EMAIL="jakob.stendahl@infomedia.dk" - # start only one ssh-agent and reuse the created one -# this is used for sway, althou keys added do not persist on reboot -#SSH_DIR="$HOME" -#if ! pgrep -u "$USER" ssh-agent > /dev/null; then -# ssh-agent > "$SSH_DIR/ssh-agent.env" -#fi -#source "$SSH_DIR/ssh-agent.env" > /dev/null -[ -z "$SSH\_AGENT\_PID" ] || eval "$(ssh-agent -s)" > /dev/null +# this is used for sway, although keys added do not persist on reboot +SSH_DIR="$HOME" +if ! pgrep -u "$USER" ssh-agent > /dev/null; then + ssh-agent > "$SSH_DIR/ssh-agent.env" +fi +source "$SSH_DIR/ssh-agent.env" > /dev/null [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh |