summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-12-11 01:36:43 +0000
committerUrbain Vaes <urbain@vaes.uk>2015-12-11 01:36:43 +0000
commit89454a326e97597967a4bec8bb979797b927557c (patch)
treedeb5ae34dd2fdcc44252e0000eec2e57558e7b86
parent5d2bf58c850b28089931b86ac6b794babcb0fd34 (diff)
Remove submodules (Use mr instead)
-rw-r--r--.gitignore5
-rw-r--r--.gitmodules21
-rw-r--r--.mrconfig18
m---------.passwords0
-rw-r--r--.tmux/Makefile15
m---------.tmux/tpm0
m---------.vim/vim-plug0
m---------.zsh/zgen0
-rw-r--r--.zsh/zshrc3
-rw-r--r--tmux.conf (renamed from .tmux/tmux.conf)0
10 files changed, 24 insertions, 38 deletions
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
-Subproject 613b0d784cdd7494af670398f6e434bbf5801e4
+Subproject 61c9ef7210acd2a42c334f8f7c3f5714881c8a6
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/tpm b/.tmux/tpm
deleted file mode 160000
-Subproject 527d12321108d52cc5b53cd251f2a058fd07bf0
diff --git a/.vim/vim-plug b/.vim/vim-plug
-Subproject 26e4a77317926e170f1b422673c4ebfad83f005
+Subproject ba97f4458eae000143dc412a3c4479bb7777aec
diff --git a/.zsh/zgen b/.zsh/zgen
-Subproject 6ac1bf1b201f52d9f5493988f8b3f26b7c0299e
+Subproject 3a0f26ed2f2d0b7b2f34fa5bac3c3a58d58cfc5
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/tmux.conf b/tmux.conf
index 989a487..989a487 100644
--- a/.tmux/tmux.conf
+++ b/tmux.conf