From 3d28ac926032e1817e6da01b29d67b6ef374d3da Mon Sep 17 00:00:00 2001 From: aleidk Date: Thu, 8 Aug 2024 15:50:41 -0400 Subject: [PATCH] handle symlink when removing chezmoi --- README.md | 4 ++-- chezmoi/.chezmoi.toml.tmpl | 1 + chezmoi/.chezmoiignore | 2 -- chezmoi/.chezmoiignore.tmpl | 4 ++++ chezmoi/dot_config/nvim/symlink_lazy-lock.json.tmpl | 6 +++++- 5 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 chezmoi/.chezmoiignore create mode 100644 chezmoi/.chezmoiignore.tmpl diff --git a/README.md b/README.md index a1eb6b2..367b170 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ Please ensure the that git is installed and you have an ssh key registered, then execute the following command: ```bash -sh -c "$(curl -fsLS get.chezmoi.io)" -- -b $HOME/.local/bin init --apply aleee-idk/mini-dots +sh -c "$(curl -fsLS get.chezmoi.io)" -- -b $HOME/.local/bin init --promptBool 'keep chezmoi?=false' --apply aleee-idk/mini-dots ``` To set up the dotfiles and then delete all traces of the manager, run: ```bash -sh -c "$(curl -fsLS get.chezmoi.io)" -- init --apply --one-shot aleee-idk/mini-dots +sh -c "$(curl -fsLS get.chezmoi.io)" -- -b $HOME/.local/bin init --promptBool 'keep chezmoi?=false' --one-shot aleee-idk/mini-dots ``` diff --git a/chezmoi/.chezmoi.toml.tmpl b/chezmoi/.chezmoi.toml.tmpl index 9037de9..0443bec 100644 --- a/chezmoi/.chezmoi.toml.tmpl +++ b/chezmoi/.chezmoi.toml.tmpl @@ -5,3 +5,4 @@ [data] osid = {{ $osid | quote }} + persistent = {{ promptBoolOnce . "persistent" "keep chezmoi?" true }} diff --git a/chezmoi/.chezmoiignore b/chezmoi/.chezmoiignore deleted file mode 100644 index e09c792..0000000 --- a/chezmoi/.chezmoiignore +++ /dev/null @@ -1,2 +0,0 @@ -**/original_* -.config/lazygit/state.yml diff --git a/chezmoi/.chezmoiignore.tmpl b/chezmoi/.chezmoiignore.tmpl new file mode 100644 index 0000000..b4983bd --- /dev/null +++ b/chezmoi/.chezmoiignore.tmpl @@ -0,0 +1,4 @@ +{{- if .persistent }} + **/original_* +{{ end }} +.config/lazygit/state.yml diff --git a/chezmoi/dot_config/nvim/symlink_lazy-lock.json.tmpl b/chezmoi/dot_config/nvim/symlink_lazy-lock.json.tmpl index efac3ee..e673d9f 100644 --- a/chezmoi/dot_config/nvim/symlink_lazy-lock.json.tmpl +++ b/chezmoi/dot_config/nvim/symlink_lazy-lock.json.tmpl @@ -1,2 +1,6 @@ -{{ .chezmoi.sourceDir }}/dot_config/nvim/original_lazy-lock.json +{{ if .persistent }} + {{ .chezmoi.sourceDir }}/dot_config/nvim/original_lazy-lock.json +{{ else }} + {{ .chezmoi.homeDir }}/.config/nvim/original_lazy-lock.json +{{ end }}