olivier/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of forge.o9.re:olivier/dotfiles

Browse Source
This commit is contained in:
Olivier DOSSMANN
2020-01-31 14:38:32 +01:00
parent cca9fc4468 20b5fdb08a
commit b6caf22938
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.zshrc
View File

@@ -68,7 +68,11 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
# Example format: plugins=(rails git textmate ruby lighthouse) # Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup. # Add wisely, as too many plugins slow down shell startup.
<<<<<<< HEAD
plugins=(git httpie ng npm nvm pass pip pyenv sudo virtualenvwrapper wd)
=======
plugins=(git httpie ng npm nvm pass pip pyenv sudo wd) plugins=(git httpie ng npm nvm pass pip pyenv sudo wd)
>>>>>>> 3be7111b37ae91585798c3e046fc8cf9f9cceb0e
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh