From 28bda511d9d5ff6f5ad725a67fd988043f24350d Mon Sep 17 00:00:00 2001
From: "martin f. krafft" <madduck@madduck.net>
Date: Fri, 23 Jun 2017 07:47:45 -0700
Subject: [PATCH] Cleanup for new vcsh-setup

---
 .config/myrepos/base-config.d/crontab.vcsh | 4 +---
 .config/myrepos/base-config.d/git.vcsh     | 3 +--
 .config/myrepos/base-config.d/mr.vcsh      | 2 --
 .config/myrepos/base-config.d/myrepos.vcsh | 2 ++
 .config/myrepos/base-config.d/screen.vcsh  | 2 +-
 .config/myrepos/base-config.d/ssh.vcsh     | 4 +---
 .config/myrepos/base-config.d/tmux.vcsh    | 2 +-
 .config/myrepos/base-config.d/top.vcsh     | 2 +-
 .config/myrepos/base-config.d/vim.vcsh     | 2 +-
 .config/myrepos/base-config.d/zsh.vcsh     | 2 +-
 .mrconfig                                  | 7 +++----
 11 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 .config/myrepos/base-config.d/mr.vcsh
 create mode 100644 .config/myrepos/base-config.d/myrepos.vcsh

diff --git a/.config/myrepos/base-config.d/crontab.vcsh b/.config/myrepos/base-config.d/crontab.vcsh
index 9c81528..899db96 100644
--- a/.config/myrepos/base-config.d/crontab.vcsh
+++ b/.config/myrepos/base-config.d/crontab.vcsh
@@ -1,4 +1,2 @@
 [${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/crontab.git]
-checkout = vcsh clone madduck:pub/etc/crontab.git
-post_checkout = for i in rewrite merge commit rewrite; do ln -rs $MR_REPO/../../hooks-available/crontab.post-run+enter $MR_REPO/hooks/post-$i; done
-fixups = $MR_REPO/../../hooks-available/crontab.post-run+enter
+checkout = vcsh clone madduck-anon:etc/crontab.git
diff --git a/.config/myrepos/base-config.d/git.vcsh b/.config/myrepos/base-config.d/git.vcsh
index 64efe7d..bfe068d 100644
--- a/.config/myrepos/base-config.d/git.vcsh
+++ b/.config/myrepos/base-config.d/git.vcsh
@@ -1,3 +1,2 @@
 [${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/git.git]
-checkout = vcsh clone ssh://git.madduck.net/madduck/pub/etc/git.git
-post_checkout = vcsh run git git config remote.origin.url madduck:pub/etc/git.git
+checkout = vcsh clone madduck-anon:etc/git.git
diff --git a/.config/myrepos/base-config.d/mr.vcsh b/.config/myrepos/base-config.d/mr.vcsh
deleted file mode 100644
index e7238fd..0000000
--- a/.config/myrepos/base-config.d/mr.vcsh
+++ /dev/null
@@ -1,2 +0,0 @@
-[${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/mr.git]
-checkout = vcsh clone madduck:pub/etc/mr.git
diff --git a/.config/myrepos/base-config.d/myrepos.vcsh b/.config/myrepos/base-config.d/myrepos.vcsh
new file mode 100644
index 0000000..c9b5fb8
--- /dev/null
+++ b/.config/myrepos/base-config.d/myrepos.vcsh
@@ -0,0 +1,2 @@
+[${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/myrepos.git]
+checkout = vcsh clone madduck-anon:etc/myrepos.git
diff --git a/.config/myrepos/base-config.d/screen.vcsh b/.config/myrepos/base-config.d/screen.vcsh
index f2d7577..e9bb706 100644
--- a/.config/myrepos/base-config.d/screen.vcsh
+++ b/.config/myrepos/base-config.d/screen.vcsh
@@ -1,2 +1,2 @@
 [${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/screen.git]
-checkout = vcsh clone madduck:pub/etc/screen.git
+checkout = vcsh clone madduck-anon:etc/screen.git
diff --git a/.config/myrepos/base-config.d/ssh.vcsh b/.config/myrepos/base-config.d/ssh.vcsh
index d988575..77fd71e 100644
--- a/.config/myrepos/base-config.d/ssh.vcsh
+++ b/.config/myrepos/base-config.d/ssh.vcsh
@@ -1,4 +1,2 @@
 [${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/ssh.git]
-checkout = vcsh clone madduck:pub/etc/ssh.git
-post_checkout = for i in rewrite merge commit checkout; do ln -rs $MR_REPO/../../hooks-available/ssh.post-run+enter $MR_REPO/hooks/post-$i; done
-fixups = $MR_REPO/../../hooks-available/ssh.post-run+enter
+checkout = vcsh clone madduck-anon:etc/ssh.git
diff --git a/.config/myrepos/base-config.d/tmux.vcsh b/.config/myrepos/base-config.d/tmux.vcsh
index bd1512c..df9d079 100644
--- a/.config/myrepos/base-config.d/tmux.vcsh
+++ b/.config/myrepos/base-config.d/tmux.vcsh
@@ -1,2 +1,2 @@
 [${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/tmux.git]
-checkout = vcsh clone madduck:pub/etc/tmux.git
+checkout = vcsh clone madduck-anon:etc/tmux.git
diff --git a/.config/myrepos/base-config.d/top.vcsh b/.config/myrepos/base-config.d/top.vcsh
index 306f9dc..d5914bf 100644
--- a/.config/myrepos/base-config.d/top.vcsh
+++ b/.config/myrepos/base-config.d/top.vcsh
@@ -1,2 +1,2 @@
 [${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/top.git]
-checkout = vcsh clone madduck:pub/etc/top.git
+checkout = vcsh clone madduck-anon:etc/top.git
diff --git a/.config/myrepos/base-config.d/vim.vcsh b/.config/myrepos/base-config.d/vim.vcsh
index ba0942f..4f302d7 100644
--- a/.config/myrepos/base-config.d/vim.vcsh
+++ b/.config/myrepos/base-config.d/vim.vcsh
@@ -1,2 +1,2 @@
 [${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/vim.git]
-checkout = vcsh clone madduck:pub/etc/vim.git
+checkout = vcsh clone madduck-anon:etc/vim.git
diff --git a/.config/myrepos/base-config.d/zsh.vcsh b/.config/myrepos/base-config.d/zsh.vcsh
index edb3e50..95421af 100644
--- a/.config/myrepos/base-config.d/zsh.vcsh
+++ b/.config/myrepos/base-config.d/zsh.vcsh
@@ -1,2 +1,2 @@
 [${XDG_CONFIG_HOME:-$HOME/.config}/vcsh/repo.d/zsh.git]
-checkout = vcsh clone madduck:pub/etc/zsh.git
+checkout = vcsh clone madduck-anon:etc/zsh.git
diff --git a/.mrconfig b/.mrconfig
index d3bffa3..d8b55dd 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -1,4 +1,3 @@
-[DEFAULT]
-include = ls ${XDG_CONFIG_HOME:-$HOME/.config}/myrepos/lib.d/[a-z]* >/dev/null 2>&1 && cat ${XDG_CONFIG_HOME:-$HOME/.config}/myrepos/lib.d/[a-z]* || :
-include = ls ${XDG_CONFIG_HOME:-$HOME/.config}/myrepos/base-config.d/[a-z]* >/dev/null 2>&1 && cat ${XDG_CONFIG_HOME:-$HOME/.config}/myrepos/base-config.d/[a-z]* || :
-include = ls ${XDG_CONFIG_HOME:-$HOME/.config}/myrepos/config.d/[a-z]* >/dev/null 2>&1 && cat ${XDG_CONFIG_HOME:-$HOME/.config}/myrepos/config.d/[a-z]* || :
+include = cat ${XDG_CONFIG_HOME:-$HOME/.config}/lib.d/[a-z]* 2>/dev/null || :
+include = cat ${XDG_CONFIG_HOME:-$HOME/.config}/myrepos/base-config.d/[a-z]* 2>/dev/null || :
+include = cat ${XDG_CONFIG_HOME:-$HOME/.config}/myrepos/config.d/[a-z]* 2>/dev/null || :
-- 
2.39.5