merge: main

This commit is contained in:
AngeD 2022-12-13 10:44:27 +01:00
commit 0c36458c4e
9 changed files with 18 additions and 5 deletions

1
.config/zsh/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
.zcompdump*

View file

@ -7,9 +7,9 @@ alias vi='$EDITOR'
# conf
alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
alias viconf='$EDITOR $XDG_CONFIG_HOME/nvim'
alias wconf='$EDITOR $HOME/.config/awesome'
alias zshconf='$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc'
alias viconf='(cd $XDG_CONFIG_HOME/nvim && $EDITOR .)'
alias wconf='(cd $HOME/.config/awesome && $EDITOR .)'
alias zshconf='(cd $ZDOTDIR/ && $EDITOR . && . $ZDOTDIR/.zshrc)'
# dev
alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash'

View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
KUBE_PS1_KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}"
KUBE_PS1_KUBECONFIGMD5=
KUBE_PS1_CTX=