Cleanup for new vcsh-setup

diff --git a/.config/myrepos/base-config.d/crontab.vcsh b/.config/myrepos/base-config.d/crontab.vcsh
index 9c8152899e5508ef09007327a602cca82520353b..899db96502c196222edba1be163edeef27286f57 100644 (file)
--- 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]
 [${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 64efe7d04f27ed0144a9b41b59ae139351ffc5ed..bfe068d65a1a9e0f1620c69aab29854f7ebb10de 100644 (file)
--- 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]
 [${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 (file)
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 (file)
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 f2d75772c63329bc02176f032c367dce30d14cc2..e9bb7068d16d6c271814a95801c32d6be6244a9e 100644 (file)
--- 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]
 [${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 d988575effebe4ebc1a9f42a7ee01cd0bf254235..77fd71e594681c37cab997bceb18b5fab56917f7 100644 (file)
--- 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]
 [${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 bd1512c41b1c8ae199c9f3bcc903c5853299e7d4..df9d07934816a8bc64428451cde9dc84c657be2d 100644 (file)
--- 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]
 [${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 306f9dc633dfd2bd3ecbd64397c10f86ec68f24b..d5914bfb709eff3739b5a4446149e25835a522f8 100644 (file)
--- 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]
 [${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 ba0942ffdd081c7357f4b128acb7fb7f4af5ee65..4f302d7f8e742974a5cab36d296460576badd2e4 100644 (file)
--- 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]
 [${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 edb3e50d7cb8cea5631dae76d8e189b84ae9c611..95421af264118b58956594b6d95d023abbabeb41 100644 (file)
--- 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]
 [${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 d3bffa3aa090bb8c08a677cc9f0a0a6e3737b94b..d8b55dd9fc0a13b31c7faa9137ee92937de87189 100644 (file)
--- 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 || :