From f6b1c5ff2eb9513ab9451e3baa3d6b0485d3d461 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 19 Sep 2024 11:03:36 +0200 Subject: [PATCH 1/3] vcs: Fix git program structure --- .dotter/global.toml | 2 +- vcs/git/{ => config}/git/config | 0 vcs/git/{ => config}/git/ignore | 0 vcs/git/{ => config}/sh/alias.d/git.sh | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename vcs/git/{ => config}/git/config (100%) rename vcs/git/{ => config}/git/ignore (100%) rename vcs/git/{ => config}/sh/alias.d/git.sh (100%) diff --git a/.dotter/global.toml b/.dotter/global.toml index 504b5b7..34ad5fa 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -15,7 +15,7 @@ sh = "~" [vcs.files] "vcs/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" } -"vcs/git" = "~/.config" +"vcs/git/config" = "~/.config" "vcs/jj" = "~/.config" "vcs/gitignore/config" = "~/.config" "vcs/gitignore/local" = "~/.local" diff --git a/vcs/git/git/config b/vcs/git/config/git/config similarity index 100% rename from vcs/git/git/config rename to vcs/git/config/git/config diff --git a/vcs/git/git/ignore b/vcs/git/config/git/ignore similarity index 100% rename from vcs/git/git/ignore rename to vcs/git/config/git/ignore diff --git a/vcs/git/sh/alias.d/git.sh b/vcs/git/config/sh/alias.d/git.sh similarity index 100% rename from vcs/git/sh/alias.d/git.sh rename to vcs/git/config/sh/alias.d/git.sh From fee876b87ff84aace90be8b328719054bf5223f7 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 19 Sep 2024 11:04:54 +0200 Subject: [PATCH 2/3] vcs: Fix jj program structure --- .dotter/global.toml | 2 +- vcs/jj/{ => config}/jj/config.toml | 2 +- vcs/jj/{ => config}/sh/alias.d/jj.sh | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename vcs/jj/{ => config}/jj/config.toml (92%) rename vcs/jj/{ => config}/sh/alias.d/jj.sh (100%) diff --git a/.dotter/global.toml b/.dotter/global.toml index 34ad5fa..8b0306c 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -16,7 +16,7 @@ sh = "~" [vcs.files] "vcs/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" } "vcs/git/config" = "~/.config" -"vcs/jj" = "~/.config" +"vcs/jj/config" = "~/.config" "vcs/gitignore/config" = "~/.config" "vcs/gitignore/local" = "~/.local" vcs = "~" diff --git a/vcs/jj/jj/config.toml b/vcs/jj/config/jj/config.toml similarity index 92% rename from vcs/jj/jj/config.toml rename to vcs/jj/config/jj/config.toml index 603c3b2..eadbfc9 100644 --- a/vcs/jj/jj/config.toml +++ b/vcs/jj/config/jj/config.toml @@ -3,7 +3,7 @@ email = "marty.oehme@gmail.com" name = "Marty Oehme" [signing] -sign-all = true +sign-all = false backend = "gpg" key = "73BA40D5AFAF49C9" diff --git a/vcs/jj/sh/alias.d/jj.sh b/vcs/jj/config/sh/alias.d/jj.sh similarity index 100% rename from vcs/jj/sh/alias.d/jj.sh rename to vcs/jj/config/sh/alias.d/jj.sh From c14710aa98536fff97bbd8a886da29c10b4f9f2c Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 19 Sep 2024 11:18:54 +0200 Subject: [PATCH 3/3] vcs: Fix writing module structure --- .dotter/global.toml | 14 +++++++------- writing/jrnl/{ => config/jrnl}/jrnl.yaml | 0 writing/papis/{ => config/papis}/config | 0 writing/papis/{ => config/papis}/config.py | 0 writing/papis/{ => config/papis}/headerformat | 0 writing/papis/{ => config/papis}/papistui.yaml | 0 .../papis/{ => config/papis}/scripts/papis-marvin | 0 .../papis/{ => config/papis}/scripts/papis-reload | 0 .../papis/{ => config/papis}/scripts/papis-show | 0 .../papis/{ => config/papis}/scripts/papis-tags | 0 .../sioyek/{ => config/sioyek}/keys_user.config | 0 .../sioyek/{ => config/sioyek}/prefs_user.config | 0 writing/zathura/{ => config/zathura}/zathurarc | 0 writing/zk/{ => config}/sh/alias.d/zk.sh | 0 writing/zk/{ => config}/sh/env.d/zk.sh | 0 15 files changed, 7 insertions(+), 7 deletions(-) rename writing/jrnl/{ => config/jrnl}/jrnl.yaml (100%) rename writing/papis/{ => config/papis}/config (100%) rename writing/papis/{ => config/papis}/config.py (100%) rename writing/papis/{ => config/papis}/headerformat (100%) rename writing/papis/{ => config/papis}/papistui.yaml (100%) rename writing/papis/{ => config/papis}/scripts/papis-marvin (100%) rename writing/papis/{ => config/papis}/scripts/papis-reload (100%) rename writing/papis/{ => config/papis}/scripts/papis-show (100%) rename writing/papis/{ => config/papis}/scripts/papis-tags (100%) rename writing/sioyek/{ => config/sioyek}/keys_user.config (100%) rename writing/sioyek/{ => config/sioyek}/prefs_user.config (100%) rename writing/zathura/{ => config/zathura}/zathurarc (100%) rename writing/zk/{ => config}/sh/alias.d/zk.sh (100%) rename writing/zk/{ => config}/sh/env.d/zk.sh (100%) diff --git a/.dotter/global.toml b/.dotter/global.toml index 8b0306c..5ebdea0 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -71,13 +71,13 @@ social = "~" [writing.files] "writing/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" } -"writing/jrnl" = "~/.config/jrnl" -"writing/papis/papistui.yaml" = { target = "~/.config/papis/papistui.yaml", type = "symbolic" } -"writing/papis" = "~/.config/papis" -"writing/sioyek/prefs_user.config" = { target = "~/.config/sioyek/prefs_user.config", type = "template", prepend = "# TEMPLATED BY DOTTER\n" } -"writing/sioyek" = "~/.config/sioyek" -"writing/zathura" = "~/.config/zathura" -"writing/zk" = "~/.config" +"writing/jrnl/config" = "~/.config" +"writing/papis/config/papis/papistui.yaml" = { target = "~/.config/papis/papistui.yaml", type = "symbolic" } +"writing/papis/config" = "~/.config" +"writing/sioyek/config/sioyek/prefs_user.config" = { target = "~/.config/sioyek/prefs_user.config", type = "template", prepend = "# TEMPLATED BY DOTTER\n" } +"writing/sioyek/config" = "~/.config" +"writing/zathura/config" = "~/.config" +"writing/zk/config" = "~/.config" "writing/pandoc/local" = "~/.local" writing = "~" diff --git a/writing/jrnl/jrnl.yaml b/writing/jrnl/config/jrnl/jrnl.yaml similarity index 100% rename from writing/jrnl/jrnl.yaml rename to writing/jrnl/config/jrnl/jrnl.yaml diff --git a/writing/papis/config b/writing/papis/config/papis/config similarity index 100% rename from writing/papis/config rename to writing/papis/config/papis/config diff --git a/writing/papis/config.py b/writing/papis/config/papis/config.py similarity index 100% rename from writing/papis/config.py rename to writing/papis/config/papis/config.py diff --git a/writing/papis/headerformat b/writing/papis/config/papis/headerformat similarity index 100% rename from writing/papis/headerformat rename to writing/papis/config/papis/headerformat diff --git a/writing/papis/papistui.yaml b/writing/papis/config/papis/papistui.yaml similarity index 100% rename from writing/papis/papistui.yaml rename to writing/papis/config/papis/papistui.yaml diff --git a/writing/papis/scripts/papis-marvin b/writing/papis/config/papis/scripts/papis-marvin similarity index 100% rename from writing/papis/scripts/papis-marvin rename to writing/papis/config/papis/scripts/papis-marvin diff --git a/writing/papis/scripts/papis-reload b/writing/papis/config/papis/scripts/papis-reload similarity index 100% rename from writing/papis/scripts/papis-reload rename to writing/papis/config/papis/scripts/papis-reload diff --git a/writing/papis/scripts/papis-show b/writing/papis/config/papis/scripts/papis-show similarity index 100% rename from writing/papis/scripts/papis-show rename to writing/papis/config/papis/scripts/papis-show diff --git a/writing/papis/scripts/papis-tags b/writing/papis/config/papis/scripts/papis-tags similarity index 100% rename from writing/papis/scripts/papis-tags rename to writing/papis/config/papis/scripts/papis-tags diff --git a/writing/sioyek/keys_user.config b/writing/sioyek/config/sioyek/keys_user.config similarity index 100% rename from writing/sioyek/keys_user.config rename to writing/sioyek/config/sioyek/keys_user.config diff --git a/writing/sioyek/prefs_user.config b/writing/sioyek/config/sioyek/prefs_user.config similarity index 100% rename from writing/sioyek/prefs_user.config rename to writing/sioyek/config/sioyek/prefs_user.config diff --git a/writing/zathura/zathurarc b/writing/zathura/config/zathura/zathurarc similarity index 100% rename from writing/zathura/zathurarc rename to writing/zathura/config/zathura/zathurarc diff --git a/writing/zk/sh/alias.d/zk.sh b/writing/zk/config/sh/alias.d/zk.sh similarity index 100% rename from writing/zk/sh/alias.d/zk.sh rename to writing/zk/config/sh/alias.d/zk.sh diff --git a/writing/zk/sh/env.d/zk.sh b/writing/zk/config/sh/env.d/zk.sh similarity index 100% rename from writing/zk/sh/env.d/zk.sh rename to writing/zk/config/sh/env.d/zk.sh