From 89454a326e97597967a4bec8bb979797b927557c Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Fri, 11 Dec 2015 01:36:43 +0000
Subject: Remove submodules (Use mr instead)

---
 .gitignore      |  5 +++++
 .gitmodules     | 21 ---------------------
 .mrconfig       | 18 ++++++++++++++++++
 .passwords      |  2 +-
 .tmux/Makefile  | 15 ---------------
 .tmux/tmux.conf | 42 ------------------------------------------
 .tmux/tpm       |  1 -
 .vim/vim-plug   |  2 +-
 .zsh/zgen       |  2 +-
 .zsh/zshrc      |  3 +--
 tmux.conf       | 42 ++++++++++++++++++++++++++++++++++++++++++
 11 files changed, 69 insertions(+), 84 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 .mrconfig
 delete mode 100644 .tmux/Makefile
 delete mode 100644 .tmux/tmux.conf
 delete mode 160000 .tmux/tpm
 create mode 100644 tmux.conf

diff --git a/.gitignore b/.gitignore
index 41d0c11..c4f3e4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,8 @@
 .vifm/vimfiles
 .nvim/.netrwhist
 .vim/.netrwhist
+.mutt/solarized
+.urxvt/ext
+.vim/vim-plug
+.zsh/zgen
+.personal
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 102bb5d..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,21 +0,0 @@
-[submodule ".vim/vim-plug"]
-	path = .vim/vim-plug
-	url = https://github.com/junegunn/vim-plug
-[submodule ".zsh/zgen"]
-	path = .zsh/zgen
-	url = https://github.com/tarjoilija/zgen
-[submodule ".tmux/tpm"]
-	path = .tmux/tpm
-	url = https://github.com/tmux-plugins/tpm
-[submodule ".mutt/solarized"]
-	path = .mutt/solarized
-	url = https://github.com/altercation/mutt-colors-solarized
-[submodule ".urxvt/ext"]
-	path = .urxvt/ext
-	url = https://github.com/muennich/urxvt-perls
-[submodule ".passwords"]
-	path = .passwords
-	url = git@github.com:uvaes/passwords
-[submodule ".personal"]
-	path = .personal
-	url = git@github.com:uvaes/personal
diff --git a/.mrconfig b/.mrconfig
new file mode 100644
index 0000000..352ccfa
--- /dev/null
+++ b/.mrconfig
@@ -0,0 +1,18 @@
+
+[dotfiles/.passwords]
+checkout = git clone 'git@github.com:uvaes/passwords' '.passwords'
+
+[dotfiles/.zsh/zgen]
+checkout = git clone 'https://github.com/tarjoilija/zgen' 'zgen'
+
+[dotfiles/.vim/vim-plug]
+checkout = git clone 'https://github.com/junegunn/vim-plug' 'vim-plug'
+
+[dotfiles/.urxvt/ext]
+checkout = git clone 'https://github.com/muennich/urxvt-perls' 'ext'
+
+[dotfiles/.mutt/solarized]
+checkout = git clone 'https://github.com/altercation/mutt-colors-solarized' 'solarized'
+
+[dotfiles/.personal]
+checkout = git clone 'git@github.com:uvaes/personal' '.personal'
diff --git a/.passwords b/.passwords
index 613b0d7..61c9ef7 160000
--- a/.passwords
+++ b/.passwords
@@ -1 +1 @@
-Subproject commit 613b0d784cdd7494af670398f6e434bbf5801e47
+Subproject commit 61c9ef7210acd2a42c334f8f7c3f5714881c8a63
diff --git a/.tmux/Makefile b/.tmux/Makefile
deleted file mode 100644
index bbe8e6e..0000000
--- a/.tmux/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-HOME=/home/urbain
-TARGETS=$(addprefix $(HOME)/,.tmux.conf .tmux/plugins/tpm)
-
-all : $(TARGETS)
-
-$(HOME)/.tmux.conf :
-	rm -f $@ && ln -s $(PWD)/tmux.conf $@
-
-$(HOME)/.tmux/plugins/tpm :
-	mkdir -p $(HOME)/.tmux/plugins
-	rm -f $@ && ln -s $(PWD)/tpm $@
-
-clean :
-	rm -f $(TARGETS)
-	rm -rf $(HOME)/.tmux
diff --git a/.tmux/tmux.conf b/.tmux/tmux.conf
deleted file mode 100644
index 989a487..0000000
--- a/.tmux/tmux.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-# set -g default-terminal "screen-256color"
-set -g default-terminal screen
-if "[[ ${TERM} =~ 256color || ${TERM} == fbterm ]]" 'set -g default-terminal screen-256color'
-
-set -g mode-mouse on
-set -g mouse-resize-pane on
-set -g mouse-select-pane on
-
-unbind C-b
-set -g prefix C-s
-bind s send-prefix
-
-unbind r
-bind r source-file ~/.tmux.conf
-
-set -s escape-time 0
-set-option -g allow-rename off
-
-set -g @tpm_plugins '           \
-  tmux-plugins/tpm              \
-  tmux-plugins/tmux-sensible    \
-  tmux-plugins/tmux-resurrect   \
-'
-
-set -g @resurrect-strategy-vim 'session'
-set -g @resurrect-save 'S'
-set -g @resurrect-restore 'R'
-set -g status off
-
-is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
-bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
-bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
-bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
-bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
-
-bind C-n next-window
-bind C-p previous-window
-
-bind-key -n C-S-Left swap-window -t -1
-bind-key -n C-S-Right swap-window -t +1
-
-run-shell '~/.tmux/plugins/tpm/tpm'
diff --git a/.tmux/tpm b/.tmux/tpm
deleted file mode 160000
index 527d123..0000000
--- a/.tmux/tpm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 527d12321108d52cc5b53cd251f2a058fd07bf0e
diff --git a/.vim/vim-plug b/.vim/vim-plug
index 26e4a77..ba97f44 160000
--- a/.vim/vim-plug
+++ b/.vim/vim-plug
@@ -1 +1 @@
-Subproject commit 26e4a77317926e170f1b422673c4ebfad83f0051
+Subproject commit ba97f4458eae000143dc412a3c4479bb7777aec8
diff --git a/.zsh/zgen b/.zsh/zgen
index 6ac1bf1..3a0f26e 160000
--- a/.zsh/zgen
+++ b/.zsh/zgen
@@ -1 +1 @@
-Subproject commit 6ac1bf1b201f52d9f5493988f8b3f26b7c0299e0
+Subproject commit 3a0f26ed2f2d0b7b2f34fa5bac3c3a58d58cfc59
diff --git a/.zsh/zshrc b/.zsh/zshrc
index a638db7..8957fe8 100644
--- a/.zsh/zshrc
+++ b/.zsh/zshrc
@@ -10,8 +10,7 @@ bindkey '^P' history-beginning-search-backward
 bindkey '^N' history-beginning-search-forward
 
 # Paths of executables
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
-export PATH="$PATH:/home/urbain/.local/bin"
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/bin/core_perl"
 
 # Editor
 export EDITOR=/usr/bin/vim
diff --git a/tmux.conf b/tmux.conf
new file mode 100644
index 0000000..989a487
--- /dev/null
+++ b/tmux.conf
@@ -0,0 +1,42 @@
+# set -g default-terminal "screen-256color"
+set -g default-terminal screen
+if "[[ ${TERM} =~ 256color || ${TERM} == fbterm ]]" 'set -g default-terminal screen-256color'
+
+set -g mode-mouse on
+set -g mouse-resize-pane on
+set -g mouse-select-pane on
+
+unbind C-b
+set -g prefix C-s
+bind s send-prefix
+
+unbind r
+bind r source-file ~/.tmux.conf
+
+set -s escape-time 0
+set-option -g allow-rename off
+
+set -g @tpm_plugins '           \
+  tmux-plugins/tpm              \
+  tmux-plugins/tmux-sensible    \
+  tmux-plugins/tmux-resurrect   \
+'
+
+set -g @resurrect-strategy-vim 'session'
+set -g @resurrect-save 'S'
+set -g @resurrect-restore 'R'
+set -g status off
+
+is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
+bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
+bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
+bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
+bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
+
+bind C-n next-window
+bind C-p previous-window
+
+bind-key -n C-S-Left swap-window -t -1
+bind-key -n C-S-Right swap-window -t +1
+
+run-shell '~/.tmux/plugins/tpm/tpm'
-- 
cgit v1.2.3