Compare commits
No commits in common. "3bf1da9427cd927353cc8187a1081d53df982469" and "b0bbea6df87d815da34e4fcddb2267b14d2966b6" have entirely different histories.
3bf1da9427
...
b0bbea6df8
4 changed files with 23 additions and 25 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit cd91bf774d4c964953160cf04c7e6b3bbd820baf
|
Subproject commit 7de28493eb8103c71336144c4a9350002bfdbbb9
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
# except:
|
# except:
|
||||||
!.zshrc
|
!.zshrc
|
||||||
!.zprofile
|
|
||||||
!.vimrc
|
!.vimrc
|
||||||
!.ideavimrc
|
!.ideavimrc
|
||||||
!.config
|
!.config
|
||||||
|
|
14
.zprofile
14
.zprofile
|
@ -1,14 +0,0 @@
|
||||||
export SSH_AUTH_SOCK=~/.ssh/ssh-agent.$USER.sock
|
|
||||||
function ssh-agent-start ()
|
|
||||||
{
|
|
||||||
# if that socket does not exist, start the ssh-agent on it
|
|
||||||
if [[ -z $SSH_AGENT_PID ]]
|
|
||||||
then
|
|
||||||
rm $SSH_AUTH_SOCK
|
|
||||||
eval $(ssh-agent -a "$SSH_AUTH_SOCK") > /dev/null
|
|
||||||
# using ssh-add might ask for a password, we don't want that here.
|
|
||||||
# If only using ssh keys without passphrases, you can do this here
|
|
||||||
# ssh-add
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
ssh-agent-start
|
|
27
.zshrc
27
.zshrc
|
@ -43,8 +43,8 @@ function largefiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(G|T|P|E)\
|
||||||
function midfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(M|G|T|P|E)\s" }
|
function midfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(M|G|T|P|E)\s" }
|
||||||
function smallfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(B|K)\s" }
|
function smallfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(B|K)\s" }
|
||||||
function cachekeys () { exec 2>/dev/null;
|
function cachekeys () { exec 2>/dev/null;
|
||||||
ssh-agent-start # see ~/.zprofile
|
eval $(ssh-agent)
|
||||||
ssh-add
|
ssh-add ~/.ssh/id_rsa
|
||||||
}
|
}
|
||||||
function newpass() {
|
function newpass() {
|
||||||
LC_ALL=C tr -dc '[:alnum:]' < /dev/urandom | head -c${1:-40}
|
LC_ALL=C tr -dc '[:alnum:]' < /dev/urandom | head -c${1:-40}
|
||||||
|
@ -198,6 +198,24 @@ else
|
||||||
eval "$(zoxide init zsh)"
|
eval "$(zoxide init zsh)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
### --- conda Config -------------------------------------
|
||||||
|
# >>> conda initialize >>>
|
||||||
|
# !! Contents within this block are managed by 'conda init' !!
|
||||||
|
__conda_setup="$('/home/plex/.local/share/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
eval "$__conda_setup"
|
||||||
|
else
|
||||||
|
if [ -f "/home/plex/.local/share/miniconda3/etc/profile.d/conda.sh" ]; then
|
||||||
|
. "/home/plex/.local/share/miniconda3/etc/profile.d/conda.sh"
|
||||||
|
else
|
||||||
|
export PATH="/home/plex/.local/share/miniconda3/bin:$PATH"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
unset __conda_setup
|
||||||
|
# <<< conda initialize <<<
|
||||||
|
# we don't want to see (base) constantly, so we do this:
|
||||||
|
PS1=$(echo $PS1 | sed 's/(base) //') # remove base
|
||||||
|
|
||||||
### load unversioned zsh code
|
### load unversioned zsh code
|
||||||
if [ -f ~/.zsh.local ]; then
|
if [ -f ~/.zsh.local ]; then
|
||||||
source ~/.zsh.local
|
source ~/.zsh.local
|
||||||
|
@ -205,8 +223,3 @@ else
|
||||||
touch ~/.zsh.local
|
touch ~/.zsh.local
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### --- pyenv Config -------------------------------------
|
|
||||||
export PYENV_ROOT="$HOME/.pyenv"
|
|
||||||
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
|
||||||
eval "$(pyenv init -)"
|
|
||||||
eval "$(pyenv virtualenv-init - zsh)"
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue