Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	repos.zsh
	zshrc

1 files changed, 7 insertions, 8 deletions

diff --git a/zshrc b/zshrc
index 908643f..4e3c2ce 100644
--- a/zshrc
+++ b/zshrc
@@ -1,4 +1,4 @@
-# Load zgen
+Load zgen
 source "/home/urbain/.zgen/zgen.zsh"
 
 if ! zgen saved; then
@@ -20,13 +20,13 @@ if ! zgen saved; then
     zgen load zsh-users/zsh-syntax-highlighting
 
     # Appearance
-    zgen load mafredri/zsh-async
-    zgen load sindresorhus/pure
-    # zgen oh-my-zsh themes/eastwood
+    # zgen load mafredri/zsh-async
+    # zgen load sindresorhus/pure
+    zgen oh-my-zsh themes/eastwood
 
     # My plugins
     zgen load uvaes/fzf-marks
-    zgen load uvaes/grm
+    # zgen load uvaes/grm
 
     # Other plugins
     zgen load rupa/z
@@ -50,7 +50,6 @@ bindkey '^y' autosuggest-execute-suggestion
 AUTOSUGGESTION_HIGHLIGHT_COLOR='fg=6'
 REPOFILE=/home/urbain/dotfiles/repos.zsh
 
-
 # Autosuggestion
 zle-line-init() {
     zle autosuggest-start
@@ -146,7 +145,6 @@ fshow() {
     xargs -I % sh -c "git show --color=always % | less -R"'
 }
 
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 
 if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
@@ -162,7 +160,7 @@ fi
 
 # Colors
 # export TERM=xterm-256color
-export COLORSCHEME=dark
+export COLORSCHEME=light
 
 function colo {
 
@@ -200,3 +198,4 @@ z() {
     _z "$@"
   fi
 }
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh