Compare commits

..

No commits in common. "96081bb9b00a10ee1b08aff26125283186ac9126" and "5d42ef2539050c7df63f9dd763a4a54dab79a4d0" have entirely different histories.

4 changed files with 370 additions and 384 deletions

View File

@ -1 +1 @@
export EDITOR=nvim # MIKAELA_GREP MIKAELA_GREPENVIRONMENT export EDITOR=vim # MIKAELA_GREP MIKAELA_GREPENVIRONMENT

View File

@ -182,7 +182,7 @@ fi
# Things after this are just examples and should be put to some other file, which is sourced above. # Things after this are just examples and should be put to some other file, which is sourced above.
# Sets the default editor. # Sets the default editor.
#export EDITOR=nvim # MIKAELA_GREP MIKAELA_GREP_ENVIRONMENT #export EDITOR=vim # MIKAELA_GREP MIKAELA_GREP_ENVIRONMENT
# Set TZ to local timezone for sending over SSH # Set TZ to local timezone for sending over SSH
TZ=$(date +%Z) TZ=$(date +%Z)
@ -536,13 +536,6 @@ fi
# More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink # More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file" alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
# I use nvim, while I keep running vim instead
if hash nvim 2>/dev/null; then
alias vim="echo 'using nvim instead' && nvim"
else
alias vim="echo 'nvim not found' && \vim"
fi
# Allow custom aliases to be put in .aliases or .bash_aliases . # Allow custom aliases to be put in .aliases or .bash_aliases .
# .aliases # .aliases

View File

@ -139,7 +139,7 @@ export TERM=screen-256color
fi fi
# Sets the default editor. # Sets the default editor.
#export EDITOR=nvim # MIKAELA_GREP MIKAELA_GREP_ENVIRONMENT #export EDITOR=vim # MIKAELA_GREP MIKAELA_GREP_ENVIRONMENT
# Set TZ to local timezone for sending over SSH # Set TZ to local timezone for sending over SSH
TZ=$(date +%Z) TZ=$(date +%Z)
@ -513,13 +513,6 @@ fi
# More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink # More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file" alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
# I use nvim, while I keep running vim instead
if hash nvim 2>/dev/null; then
alias vim="echo 'using nvim instead' && nvim"
else
alias vim="echo 'nvim not found' && \vim"
fi
# Allow custom aliases to be put in .aliases or .zsh_aliases . # Allow custom aliases to be put in .aliases or .zsh_aliases .
# .aliases # .aliases