From 85c152a07c0eff8aaa0b397fd72a4fbd1c0da9b5 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Wed, 18 Sep 2024 16:43:15 +0200 Subject: [PATCH] writing: Restructure module layout per-program Similarly to the qutebrowser module we change the layout to have a program name at the top-level and all required files for that specific program within, whether they reside within .config, .local or anywhere else. We use dotter mappings to achieve this. --- .dotter/global.toml | 10 ++++++++-- writing/{.config => }/jrnl/jrnl.yaml | 0 .../local}/share/pandoc/templates/default.latex.BAK | 0 .../local}/share/pandoc/templates/letter.latex | 0 .../local}/share/pandoc/templates/paper.latex | 0 .../local}/share/pandoc/templates/resume.latex | 0 writing/{.config => }/papis/config | 0 writing/{.config => }/papis/config.py | 0 writing/{.config => }/papis/headerformat | 0 writing/{.config => }/papis/papistui.yaml | 0 writing/{.config => }/papis/scripts/papis-marvin | 0 writing/{.config => }/papis/scripts/papis-reload | 0 writing/{.config => }/papis/scripts/papis-show | 0 writing/{.config => }/papis/scripts/papis-tags | 0 writing/{.config => }/sioyek/keys_user.config | 0 writing/{.config => }/sioyek/prefs_user.config | 0 writing/{.config => }/zathura/zathurarc | 0 writing/{.config => zk}/sh/alias.d/zk.sh | 0 writing/{.config => zk}/sh/env.d/zk.sh | 0 19 files changed, 8 insertions(+), 2 deletions(-) rename writing/{.config => }/jrnl/jrnl.yaml (100%) rename writing/{.local => pandoc/local}/share/pandoc/templates/default.latex.BAK (100%) rename writing/{.local => pandoc/local}/share/pandoc/templates/letter.latex (100%) rename writing/{.local => pandoc/local}/share/pandoc/templates/paper.latex (100%) rename writing/{.local => pandoc/local}/share/pandoc/templates/resume.latex (100%) rename writing/{.config => }/papis/config (100%) rename writing/{.config => }/papis/config.py (100%) rename writing/{.config => }/papis/headerformat (100%) rename writing/{.config => }/papis/papistui.yaml (100%) rename writing/{.config => }/papis/scripts/papis-marvin (100%) rename writing/{.config => }/papis/scripts/papis-reload (100%) rename writing/{.config => }/papis/scripts/papis-show (100%) rename writing/{.config => }/papis/scripts/papis-tags (100%) rename writing/{.config => }/sioyek/keys_user.config (100%) rename writing/{.config => }/sioyek/prefs_user.config (100%) rename writing/{.config => }/zathura/zathurarc (100%) rename writing/{.config => zk}/sh/alias.d/zk.sh (100%) rename writing/{.config => zk}/sh/env.d/zk.sh (100%) diff --git a/.dotter/global.toml b/.dotter/global.toml index cf2ca37..22633cd 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -67,8 +67,14 @@ social = "~" [writing.files] "writing/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" } -"writing/.config/papis/papistui.yaml" = { target = "~/.config/papis/papistui.yaml", type = "symbolic" } -"writing/.config/sioyek/prefs_user.config" = { target = "~/.config/sioyek/prefs_user.config", type = "template", prepend = "# TEMPLATED BY DOTTER\n" } +"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/pandoc/local" = "~/.local" writing = "~" # WORKSTATION: A desktop machine, with wayland environment and display attached. diff --git a/writing/.config/jrnl/jrnl.yaml b/writing/jrnl/jrnl.yaml similarity index 100% rename from writing/.config/jrnl/jrnl.yaml rename to writing/jrnl/jrnl.yaml diff --git a/writing/.local/share/pandoc/templates/default.latex.BAK b/writing/pandoc/local/share/pandoc/templates/default.latex.BAK similarity index 100% rename from writing/.local/share/pandoc/templates/default.latex.BAK rename to writing/pandoc/local/share/pandoc/templates/default.latex.BAK diff --git a/writing/.local/share/pandoc/templates/letter.latex b/writing/pandoc/local/share/pandoc/templates/letter.latex similarity index 100% rename from writing/.local/share/pandoc/templates/letter.latex rename to writing/pandoc/local/share/pandoc/templates/letter.latex diff --git a/writing/.local/share/pandoc/templates/paper.latex b/writing/pandoc/local/share/pandoc/templates/paper.latex similarity index 100% rename from writing/.local/share/pandoc/templates/paper.latex rename to writing/pandoc/local/share/pandoc/templates/paper.latex diff --git a/writing/.local/share/pandoc/templates/resume.latex b/writing/pandoc/local/share/pandoc/templates/resume.latex similarity index 100% rename from writing/.local/share/pandoc/templates/resume.latex rename to writing/pandoc/local/share/pandoc/templates/resume.latex diff --git a/writing/.config/papis/config b/writing/papis/config similarity index 100% rename from writing/.config/papis/config rename to writing/papis/config diff --git a/writing/.config/papis/config.py b/writing/papis/config.py similarity index 100% rename from writing/.config/papis/config.py rename to writing/papis/config.py diff --git a/writing/.config/papis/headerformat b/writing/papis/headerformat similarity index 100% rename from writing/.config/papis/headerformat rename to writing/papis/headerformat diff --git a/writing/.config/papis/papistui.yaml b/writing/papis/papistui.yaml similarity index 100% rename from writing/.config/papis/papistui.yaml rename to writing/papis/papistui.yaml diff --git a/writing/.config/papis/scripts/papis-marvin b/writing/papis/scripts/papis-marvin similarity index 100% rename from writing/.config/papis/scripts/papis-marvin rename to writing/papis/scripts/papis-marvin diff --git a/writing/.config/papis/scripts/papis-reload b/writing/papis/scripts/papis-reload similarity index 100% rename from writing/.config/papis/scripts/papis-reload rename to writing/papis/scripts/papis-reload diff --git a/writing/.config/papis/scripts/papis-show b/writing/papis/scripts/papis-show similarity index 100% rename from writing/.config/papis/scripts/papis-show rename to writing/papis/scripts/papis-show diff --git a/writing/.config/papis/scripts/papis-tags b/writing/papis/scripts/papis-tags similarity index 100% rename from writing/.config/papis/scripts/papis-tags rename to writing/papis/scripts/papis-tags diff --git a/writing/.config/sioyek/keys_user.config b/writing/sioyek/keys_user.config similarity index 100% rename from writing/.config/sioyek/keys_user.config rename to writing/sioyek/keys_user.config diff --git a/writing/.config/sioyek/prefs_user.config b/writing/sioyek/prefs_user.config similarity index 100% rename from writing/.config/sioyek/prefs_user.config rename to writing/sioyek/prefs_user.config diff --git a/writing/.config/zathura/zathurarc b/writing/zathura/zathurarc similarity index 100% rename from writing/.config/zathura/zathurarc rename to writing/zathura/zathurarc diff --git a/writing/.config/sh/alias.d/zk.sh b/writing/zk/sh/alias.d/zk.sh similarity index 100% rename from writing/.config/sh/alias.d/zk.sh rename to writing/zk/sh/alias.d/zk.sh diff --git a/writing/.config/sh/env.d/zk.sh b/writing/zk/sh/env.d/zk.sh similarity index 100% rename from writing/.config/sh/env.d/zk.sh rename to writing/zk/sh/env.d/zk.sh