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

Conflicts:
	repos.zsh
	zshrc

6 files changed, 39 insertions, 56 deletions

diff --git a/discours b/discours
new file mode 100644
index 0000000..107952b
--- /dev/null
+++ b/discours
@@ -0,0 +1,4 @@
+Chers amis, 
+
+nous sommes reunis aujourd'hui pour celebrer le mariage de Catherine et Victor. 
+Nous allons commencer par quelques annecdote que nous avons eu 
diff --git a/repos.zsh b/repos.zsh
index 2fd1b11..2d0326f 100644
--- a/repos.zsh
+++ b/repos.zsh
@@ -1,28 +1,25 @@
-home=/home/urbain
-dir=$home/dotfiles
-olddir=$home/dotfiles_old
-
 declare -A repodirs
+declare -A actions
 
-# General purpose programs
-repodirs[alols/xcape]=$home/xcape
-repodirs[icholy/ttygif]=$home/github/ttygif
+# General purpose
+repodirs[icholy/ttygif]=/home/urbain/github/ttygif
+repodirs[alols/xcape]=/home/urbain/xcape
 
-# Solarized for mutt
-repodirs[altercation/mutt-colors-solarized]=$home/github/mutt-colors-solarized
+# Solarized
+repodirs[altercation/mutt-colors-solarized]=/home/urbain/github/mutt-colors-solarized
 
-# My repositories
-repodirs[uvaes/fzf-marks]=$home/github/fzf-marks
-repodirs[uvaes/grm]=$home/github/grm
+# My plugins
+repodirs[uvaes/fzf-marks]=/home/urbain/github/fzf-marks
+repodirs[uvaes/grm]=/home/urbain/.grm
 
 # fzf-related
-repodirs[atweiden/fzf-extras]=$home/github/fzf-extras
-repodirs[junegunn/fzf]=$home/.fzf
+repodirs[junegunn/fzf]=/home/urbain/.fzf
+repodirs[atweiden/fzf-extras]=/home/urbain/github/fzf-extras
 
-# Plugin managers for tmux/vim/zsh
-repodirs[tmux-plugins/tpm]=$home/.tmux/plugins/tpm
-repodirs[junegunn/vim-plug]=$dir/vim/vim-plug
-repodirs[tarjoilija/zgen]=$home/.zgen
+# Plugin managers
+repodirs[junegunn/vim-plug]=/home/urbain/.vim/vim-plug
+repodirs[tmux-plugins/tpm]=/home/urbain/.tmux/plugins/tpm
+# repodirs[tarjoilija/zgen]=/home/urbain/.zgen
 
 function after_vimplug {
     cd ..
diff --git a/sed b/sed
new file mode 100644
index 0000000..4e4198d
--- /dev/null
+++ b/sed
@@ -0,0 +1,11 @@
+		repodirs[alols/xcape]=$home/xcape
+		repodirs[altercation/mutt-colors-solarized]=$home/github/mutt-colors-solarized
+		repodirs[atweiden/fzf-extras]=$home/github/fzf-extras
+		repodirs[icholy/ttygif]=$home/github/ttygif
+		repodirs[junegunn/fzf]=$home/.fzf
+		repodirs[junegunn/vim-plug]=$dir/vim/vim-plug
+repodirs[seebi/dircolors-solarized]=$home/github/dircolors
+		repodirs[tarjoilija/zgen]=$home/.zgen
+		repodirs[tmux-plugins/tpm]=$home/.tmux/plugins/tpm
+		repodirs[uvaes/fzf-marks]=$home/github/fzf-marks
+		repodirs[uvaes/grm]=$home/github/grm s/^[^[].*\(\[.*\]\).*$/\1/g
diff --git a/tmuxlinerc b/tmuxlinerc
deleted file mode 100644
index 5b7120a..0000000
--- a/tmuxlinerc
+++ /dev/null
@@ -1,29 +0,0 @@
-# This tmux statusbar config was created by tmuxline.vim
-# on Sat, 25 Apr 2015
-
-set -g status-bg "colour7"
-set -g message-command-fg "colour7"
-set -g status-justify "centre"
-set -g status-left-length "100"
-set -g status "on"
-set -g pane-active-border-fg "colour11"
-set -g message-bg "colour14"
-set -g status-right-length "100"
-set -g status-right-attr "none"
-set -g message-fg "colour7"
-set -g message-command-bg "colour14"
-set -g status-attr "none"
-set -g status-utf8 "on"
-set -g pane-border-fg "colour14"
-set -g status-left-attr "none"
-setw -g window-status-fg "colour14"
-setw -g window-status-attr "none"
-setw -g window-status-activity-bg "colour7"
-setw -g window-status-activity-attr "none"
-setw -g window-status-activity-fg "colour11"
-setw -g window-status-separator ""
-setw -g window-status-bg "colour7"
-set -g status-left "#[fg=colour7,bg=colour11,bold] #H #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] #S #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]"
-set -g status-right "#[fg=colour7,bg=colour7,nobold,nounderscore,noitalics]#[fg=colour14,bg=colour7] %R #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] %a #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour11] %Y "
-setw -g window-status-format "#[fg=colour7,bg=colour7,nobold,nounderscore,noitalics]#[default] #W #[fg=colour7,bg=colour7,nobold,nounderscore,noitalics]"
-setw -g window-status-current-format "#[fg=colour7,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] #W #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]"
diff --git a/vim/.netrwhist b/vim/.netrwhist
index 41f3d6c..637791c 100644
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,4 +1,5 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =2
+let g:netrw_dirhist_cnt =3
 let g:netrw_dirhist_1='/home/urbain/Dropbox/phd/code/spectral/develop/cpp'
 let g:netrw_dirhist_2='/home/urbain/dotfiles'
+let g:netrw_dirhist_3='/home/urbain'
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