Merge branch 'master' of ssh://git.pehjota.net/dotfiles/mr

17 files changed, 30 insertions, 8 deletions

diff --git a/.config/mr/available.d/anacron.vcsh b/.config/mr/available.d/anacron.vcsh
new file mode 100644
index 0000000..0b437ee
--- /dev/null
+++ b/.config/mr/available.d/anacron.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/anacron.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/anacron.git anacron
diff --git a/.config/mr/available.d/claws-mail.vcsh b/.config/mr/available.d/claws-mail.vcsh
index 05f3276..7d581da 100644
--- a/.config/mr/available.d/claws-mail.vcsh
+++ b/.config/mr/available.d/claws-mail.vcsh
@@ -1,2 +1,2 @@
 [$HOME/.config/vcsh/repo.d/claws-mail.git]
-checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/claws-mail.git claws-mail
+checkout = vcsh clone -b host/$(cat /etc/hostname) ssh://git@git.pehjota.net/dotfiles/claws-mail.git claws-mail
diff --git a/.config/mr/available.d/fluxbox.vcsh b/.config/mr/available.d/fluxbox.vcsh
index 74e3cbf..8c5abd6 100644
--- a/.config/mr/available.d/fluxbox.vcsh
+++ b/.config/mr/available.d/fluxbox.vcsh
@@ -1,2 +1,2 @@
 [$HOME/.config/vcsh/repo.d/fluxbox.git]
-checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/fluxbox.git fluxbox
+checkout = vcsh clone -b host/$(cat /etc/hostname) ssh://git@git.pehjota.net/dotfiles/fluxbox.git fluxbox
diff --git a/.config/mr/available.d/geeqie.vcsh b/.config/mr/available.d/geeqie.vcsh
new file mode 100644
index 0000000..44ec04a
--- /dev/null
+++ b/.config/mr/available.d/geeqie.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/geeqie.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/geeqie.git geeqie
diff --git a/.config/mr/available.d/homerc.vcsh b/.config/mr/available.d/homerc.vcsh
new file mode 100644
index 0000000..0829e5c
--- /dev/null
+++ b/.config/mr/available.d/homerc.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/homerc.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/homerc.git homerc
diff --git a/.config/mr/available.d/htop.vcsh b/.config/mr/available.d/htop.vcsh
new file mode 100644
index 0000000..7c327e4
--- /dev/null
+++ b/.config/mr/available.d/htop.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/htop.git]
+checkout = vcsh clone -b host/$(cat /etc/hostname) ssh://git@git.pehjota.net/dotfiles/htop.git htop
diff --git a/.config/mr/available.d/icecat.vcsh b/.config/mr/available.d/icecat.vcsh
new file mode 100644
index 0000000..7861450
--- /dev/null
+++ b/.config/mr/available.d/icecat.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/icecat.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/icecat.git icecat
diff --git a/.config/mr/available.d/keychain.vcsh b/.config/mr/available.d/keychain.vcsh
new file mode 100644
index 0000000..e155bfe
--- /dev/null
+++ b/.config/mr/available.d/keychain.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/keychain.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/keychain.git keychain
diff --git a/.config/mr/available.d/midori.vcsh b/.config/mr/available.d/midori.vcsh
index caa8935..fee256b 100644
--- a/.config/mr/available.d/midori.vcsh
+++ b/.config/mr/available.d/midori.vcsh
@@ -1,2 +1,2 @@
 [$HOME/.config/vcsh/repo.d/midori.git]
-checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/midori.git midori
+checkout = vcsh clone -b host/$(cat /etc/hostname) ssh://git@git.pehjota.net/dotfiles/midori.git midori
diff --git a/.config/mr/available.d/mpd.vcsh b/.config/mr/available.d/mpd.vcsh
index 3f1a08e..c8b06ac 100644
--- a/.config/mr/available.d/mpd.vcsh
+++ b/.config/mr/available.d/mpd.vcsh
@@ -1,2 +1,2 @@
 [$HOME/.config/vcsh/repo.d/mpd.git]
-checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/mpd.git mpd
+checkout = vcsh clone -b host/$(cat /etc/hostname) ssh://git@git.pehjota.net/dotfiles/mpd.git mpd
diff --git a/.config/mr/available.d/mpv.vcsh b/.config/mr/available.d/mpv.vcsh
index 904d7cf..c85d01d 100644
--- a/.config/mr/available.d/mpv.vcsh
+++ b/.config/mr/available.d/mpv.vcsh
@@ -1,2 +1,2 @@
 [$HOME/.config/vcsh/repo.d/mpv.git]
-checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/mpv.git mpv
+checkout = vcsh clone -b host/$(cat /etc/hostname) ssh://git@git.pehjota.net/dotfiles/mpv.git mpv
diff --git a/.config/mr/available.d/offlineimap.vcsh b/.config/mr/available.d/offlineimap.vcsh
new file mode 100644
index 0000000..fe025fe
--- /dev/null
+++ b/.config/mr/available.d/offlineimap.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/offlineimap.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/offlineimap.git offlineimap
diff --git a/.config/mr/available.d/partsdb-backup.vcsh b/.config/mr/available.d/partsdb-backup.vcsh
new file mode 100644
index 0000000..6c54b9f
--- /dev/null
+++ b/.config/mr/available.d/partsdb-backup.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/partsdb-backup.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/partsdb-backup.git partsdb-backup
diff --git a/.config/mr/available.d/pbuilder.vcsh b/.config/mr/available.d/pbuilder.vcsh
new file mode 100644
index 0000000..e9af2b2
--- /dev/null
+++ b/.config/mr/available.d/pbuilder.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/pbuilder.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/pbuilder.git pbuilder
diff --git a/.config/mr/available.d/trisquel.vcsh b/.config/mr/available.d/trisquel.vcsh
new file mode 100644
index 0000000..9542aec
--- /dev/null
+++ b/.config/mr/available.d/trisquel.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/trisquel.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/trisquel.git trisquel
diff --git a/.config/mr/available.d/xfce4-terminal.vcsh b/.config/mr/available.d/xfce4-terminal.vcsh
new file mode 100644
index 0000000..5322e3f
--- /dev/null
+++ b/.config/mr/available.d/xfce4-terminal.vcsh
@@ -0,0 +1,2 @@
+[$HOME/.config/vcsh/repo.d/xfce4-terminal.git]
+checkout = vcsh clone ssh://git@git.pehjota.net/dotfiles/xfce4-terminal.git xfce4-terminal
diff --git a/bin/dfen b/bin/dfen
index 3cf4aef..6c3e588 100755
--- a/bin/dfen
+++ b/bin/dfen
@@ -18,7 +18,7 @@ for repo in "${@}"; do
 	# Enable repository in mr configuration
 	ln -s "../available.d/${repo}.vcsh" \
 		"${HOME}/.config/mr/config.d/${repo}.vcsh"
-
-	# Clone repository
-	mr checkout
 done
+
+# Clone repositories
+mr checkout