From 36c7259c6673474dcee55d53c2a8f01cfa818a95 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Thu, 24 Nov 2022 21:48:06 +0000
Subject: [PATCH] Update
 dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_10_install-aqua-packages.sh.tmpl,
 dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_15_install-asdf-packages.tmpl,
 dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_50-crontab.tmpl,
 dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_60-cleanup.tmpl,
 dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_80-bash-completions.tmpl,
 dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_99_bootstrap-z4h.tmpl,
 dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_1-logging-deps,
 dotfiles/.local/share/chezmoi/home/.chezmoiignore,
 dotfiles/.local/share/chezmoi/home/.chezmoiremove,
 dotfiles/.local/share/chezmoi/home/.chezmoidata.yaml,
 dotfiles/.local/share/chezmoi/home/private_dot_config/rclone/merge_rclone.conf,
 dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl

---
 .../share/chezmoi/home/.chezmoi.yaml.tmpl     |  7 ++++++
 .../share/chezmoi/home/.chezmoidata.yaml      | 11 ++++++++++
 .../.local/share/chezmoi/home/.chezmoiignore  |  1 +
 .../.local/share/chezmoi/home/.chezmoiremove  |  4 ++++
 ...nge_after_10_install-aqua-packages.sh.tmpl |  0
 ...change_after_15_install-asdf-packages.tmpl |  0
 .../run_onchange_after_50-crontab.tmpl        |  0
 .../run_onchange_after_60-cleanup.tmpl        |  0
 ...un_onchange_after_80-bash-completions.tmpl |  0
 .../run_onchange_after_99_bootstrap-z4h.tmpl  |  0
 .../run_onchange_before_1-logging-deps        |  0
 .../rclone/merge_rclone.conf                  | 22 +++++++++++++++++++
 12 files changed, 45 insertions(+)
 rename dotfiles/.local/share/chezmoi/home/.chezmoiscripts/{universal => _universal}/run_onchange_after_10_install-aqua-packages.sh.tmpl (100%)
 rename dotfiles/.local/share/chezmoi/home/.chezmoiscripts/{universal => _universal}/run_onchange_after_15_install-asdf-packages.tmpl (100%)
 rename dotfiles/.local/share/chezmoi/home/.chezmoiscripts/{universal => _universal}/run_onchange_after_50-crontab.tmpl (100%)
 rename dotfiles/.local/share/chezmoi/home/.chezmoiscripts/{universal => _universal}/run_onchange_after_60-cleanup.tmpl (100%)
 rename dotfiles/.local/share/chezmoi/home/.chezmoiscripts/{universal => _universal}/run_onchange_after_80-bash-completions.tmpl (100%)
 rename dotfiles/.local/share/chezmoi/home/.chezmoiscripts/{universal => _universal}/run_onchange_after_99_bootstrap-z4h.tmpl (100%)
 rename dotfiles/.local/share/chezmoi/home/.chezmoiscripts/{universal => _universal}/run_onchange_before_1-logging-deps (100%)
 create mode 100644 dotfiles/.local/share/chezmoi/home/private_dot_config/rclone/merge_rclone.conf

diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
index cdd9dd94..b19a7c85 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
@@ -7,6 +7,10 @@
 {{- $domain := "megabyte.space" -}}
 {{- $cloudflareUsername := "noreply@megabyte.space" -}}
 {{- $cloudflareToken := "" -}}
+{{- $cloudflareAccessKeyId := "" -}}
+{{- $cloudflareSecretAccessKey := "" -}}
+{{- $cloudflareR2AccountId := "" -}}
+{{- $digitalOceanSpacesAccessKeyId
 {{- $githubReadToken := "" -}}
 {{- $gitlabReadToken := "" -}}
 {{- $ngrokAuthToken := "" -}}
@@ -151,6 +155,9 @@ git:
   autoCommit: true
   autoPush: true
 scriptEnv:
+  CLOUDFLARE_ACCESS_KEY_ID: "{{ $cloudflareAccessKeyId }}"
+  CLOUDFLARE_SECRET_ACCESS_KEY: "{{ $cloudflareSecretAccessKey }}"
+  CLOUDFLARE_R2_ACCOUNT_ID: "{{ $cloudflareR2AccountId }}"
   LEXICON_CLOUDFLARE_USERNAME: "{{ $cloudflareUsername }}"
   LEXICON_CLOUDFLARE_TOKEN: "{{ $cloudflareToken }}"
 textconv:
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoidata.yaml b/dotfiles/.local/share/chezmoi/home/.chezmoidata.yaml
index a2fa8f78..898e25dd 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoidata.yaml
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoidata.yaml
@@ -59,6 +59,8 @@ softwarePackages:
     port: bat
     scoop: bat
     zypper: bat
+  blockinfile:
+    go: github.com/ProfessorManhattan/blockinfile@latest
   bundler:
     gem: bundler
   delta:
@@ -395,6 +397,15 @@ softwarePackages:
     port: pywhat
   ramda:
     npm: ramda-cli
+  rclone:
+    apt: rclone
+    brew: rclone
+    choco:
+      - rclone
+      - winfsp
+      - nssm
+    dnf: rclone
+    pacman: rclone
   ripgrep:
     _bin: rg
     apt: ripgrep
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiignore b/dotfiles/.local/share/chezmoi/home/.chezmoiignore
index b5e816ea..4055bacc 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiignore
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiignore
@@ -2,6 +2,7 @@
 !.chezmoiscripts/{{ .host.distro.id }}/**/*
 
 {{- if ne .host.distro.id "windows" }}
+!.chezmoiscripts/_universal/**/*
 !.chezmoiscripts/universal/**/*
 {{- end }}
 
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiremove b/dotfiles/.local/share/chezmoi/home/.chezmoiremove
index bf0a4cfa..96f27ae7 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiremove
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiremove
@@ -1,3 +1,5 @@
+.CFUserTextEncoding
+.DS_Store
 .asdf
 Brewfile
 .bash_logout
@@ -10,9 +12,11 @@ Brewfile
 .krew
 .m2
 .npmrc
+.profile
 .rustup
 .subversion
 .tmux.conf
+.tmux.conf.local
 .wgetrc
 .zlogin
 .zlogout
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10_install-aqua-packages.sh.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_10_install-aqua-packages.sh.tmpl
similarity index 100%
rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10_install-aqua-packages.sh.tmpl
rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_10_install-aqua-packages.sh.tmpl
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_15_install-asdf-packages.tmpl
similarity index 100%
rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_15_install-asdf-packages.tmpl
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_50-crontab.tmpl
similarity index 100%
rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab.tmpl
rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_50-crontab.tmpl
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_60-cleanup.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_60-cleanup.tmpl
similarity index 100%
rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_60-cleanup.tmpl
rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_60-cleanup.tmpl
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_80-bash-completions.tmpl
similarity index 100%
rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl
rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_80-bash-completions.tmpl
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_99_bootstrap-z4h.tmpl
similarity index 100%
rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl
rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_99_bootstrap-z4h.tmpl
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_1-logging-deps
similarity index 100%
rename from dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps
rename to dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_1-logging-deps
diff --git a/dotfiles/.local/share/chezmoi/home/private_dot_config/rclone/merge_rclone.conf b/dotfiles/.local/share/chezmoi/home/private_dot_config/rclone/merge_rclone.conf
new file mode 100644
index 00000000..b7e61984
--- /dev/null
+++ b/dotfiles/.local/share/chezmoi/home/private_dot_config/rclone/merge_rclone.conf
@@ -0,0 +1,22 @@
+{{- if and (ne .scriptEnv.CLOUDFLARE_ACCESS_KEY_ID "") (ne .scriptEnv.CLOUDFLARE_SECRET_ACCESS_KEY "") (ne .scriptEnv.CLOUDFLARE_R2_ACCOUNT_ID "") }}
+#!/usr/bin/env bash
+R2_CONFIG=$(cat <<EOT
+[r2-user]
+type = s3
+provider = Cloudflare
+access_key_id = {{ .user.cloudflareAccessKeyId }}
+secret_access_key = {{ .user.cloudflareSecretAccessKey }}
+region = auto
+endpoint = https://{{ .user.cloudflareR2AccountId }}.r2.cloudflarestorage.com
+acl = private
+EOT
+)
+
+# Consider https://github.com/dustinsand/blockinfile
+if cat $HOME/.config/rclone/rclone.conf | grep '[r2-user]'; then
+  # TODO: Remove old block
+fi
+
+# TODO:
+#tee -a
+{{- end -}}