From 78b98495c7012b96a488da5257cb91199bf4c742 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Sun, 27 Nov 2022 16:17:07 +0000 Subject: [PATCH] Update dotfiles/.local/share/chezmoi/home/private_dot_config/shell/encrypted_private_dot_private, dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl, dotfiles/.local/share/chezmoi/home/private_dot_config/tabby/config.yaml.tmpl, dotfiles/.local/share/chezmoi/home/dot_ssh/run_onchanges_after_generate-public-keys.tmpl, dotfiles/.local/share/chezmoi/home/dot_local/bin/executable_run, dotfiles/.local/share/chezmoi/home/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json, dotfiles/.local/share/chezmoi/home/dot_local/state/bash/remove_dot_gitkeep, dotfiles/.local/share/chezmoi/home/dot_local/state/zsh/remove_dot_gitkeep, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_after_60-cleanup.tmpl, dotfiles/.local/share/chezmoi/home/dot_local/.config/symlink_taskfiles, dotfiles/.local/share/chezmoi/home/dot_local/symlink_Taskfile-upstream.yml.tmpl, dotfiles/.local/share/chezmoi/home/dot_local/Taskfile-local.yml, dotfiles/.local/share/chezmoi/home/private_dot_config/rofi/config.rasi.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoidata.yml Deleted dotfiles/.local/share/chezmoi/home/dot_local/state/bash/.gitkeep, dotfiles/.local/share/chezmoi/home/dot_local/state/zsh/.gitkeep --- .../share/chezmoi/home/.chezmoi.yaml.tmpl | 7 ++ .../share/chezmoi/home/.chezmoidata.yml | 16 ++++ .../run_onchange_after_60-cleanup.tmpl | 17 +--- .../home/dot_local/.config/symlink_taskfiles | 3 + .../bash/.gitkeep => Taskfile-local.yml} | 0 .../chezmoi/home/dot_local/bin/executable_run | 2 +- .../{zsh/.gitkeep => bash/remove_dot_gitkeep} | 0 .../dot_local/state/zsh/remove_dot_gitkeep | 0 .../symlink_Taskfile-upstream.yml.tmpl | 3 + ..._onchanges_after_generate-public-keys.tmpl | 4 +- .../oh-my-posh/Betelgeuse-minimal.omp.json | 2 +- ...config.rasi.tmpl.TODO => config.rasi.tmpl} | 90 +++++++++---------- .../shell/encrypted_private_dot_private | 25 ++++++ .../shell/private_dot_private | 6 -- .../private_dot_config/tabby/config.yaml.tmpl | 2 +- 15 files changed, 109 insertions(+), 68 deletions(-) create mode 100644 dotfiles/.local/share/chezmoi/home/.chezmoidata.yml create mode 100644 dotfiles/.local/share/chezmoi/home/dot_local/.config/symlink_taskfiles rename dotfiles/.local/share/chezmoi/home/dot_local/{state/bash/.gitkeep => Taskfile-local.yml} (100%) rename dotfiles/.local/share/chezmoi/home/dot_local/state/{zsh/.gitkeep => bash/remove_dot_gitkeep} (100%) create mode 100644 dotfiles/.local/share/chezmoi/home/dot_local/state/zsh/remove_dot_gitkeep create mode 100644 dotfiles/.local/share/chezmoi/home/dot_local/symlink_Taskfile-upstream.yml.tmpl rename dotfiles/.local/share/chezmoi/home/private_dot_config/rofi/{config.rasi.tmpl.TODO => config.rasi.tmpl} (73%) create mode 100644 dotfiles/.local/share/chezmoi/home/private_dot_config/shell/encrypted_private_dot_private delete mode 100644 dotfiles/.local/share/chezmoi/home/private_dot_config/shell/private_dot_private diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl index f672bae4..9c836d2c 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl @@ -16,6 +16,7 @@ {{- $locale := (output "echo" "$LANG") }} {{- $ngrokAuthToken := "" -}} {{- $slackApiToken := "" -}} +{{- $tabbyConfigId := "" -}} {{- $tabbySyncToken := "" -}} {{- $timezone := "" -}} {{- $toolchains := list "docker" "iac" "java" "kubernetes" "node" "python" "rust" "extra" -}} @@ -108,6 +109,7 @@ {{- $gmailAddressAppPassword = promptStringOnce $data.user "gmailAddressAppPassword" "G-mail app password" $gmailAddressAppPassword -}} {{- $ngrokAuthToken = promptStringOnce $data.user "ngrokAuthToken" "Ngrok authentication token" $ngrokAuthToken -}} {{- $slackApiToken = promptStringOnce $data.user "slackApiToken" "Slack API token" $slackApiToken -}} +{{- $tabbyConfigId = promptStringOnce $data.user "tabbyConfigId" "Tabby Configuration ID" $tabbyConfigId -}} {{- $tabbySyncToken = promptStringOnce $data.user "tabbySyncToken" "Tabby Sync Token" $tabbySyncToken -}} {{- else -}} @@ -154,10 +156,15 @@ data: CLOUDFLARE_ACCESS_KEY_ID: "{{ $cloudflareAccessKeyId }}" CLOUDFLARE_SECRET_ACCESS_KEY: "{{ $cloudflareSecretAccessKey }}" CLOUDFLARE_R2_ACCOUNT_ID: "{{ $cloudflareR2AccountId }}" + CLOUDSDK_CORE_PROJECT: "megabyte-labs" + GCE_CREDENTIALS_FILE: "{{ joinPath .chezmoi.homeDir ".config" "gcp.json" }}" + GCE_SERVICE_ACCOUNT_EMAIL: "molecule@megabyte-labs.iam.gserviceaccount.com" GITHUB_READ_TOKEN: "{{ $githubReadToken }}" GITLAB_READ_TOKEN: "{{ $gitlabReadToken }}" NGROK_AUTH_TOKEN: "{{ $ngrokAuthToken }}" SLACK_API_TOKEN: "{{ $slackApiToken }}" + SNAPCRAFT_EMAIL: "{{ $email }}" + TABBY_CONFIG_ID: "{{ $tabbyConfigId }}" TABBY_SYNC_TOKEN: "{{ $tabbySyncToken }}" diff: format: "git" diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoidata.yml b/dotfiles/.local/share/chezmoi/home/.chezmoidata.yml new file mode 100644 index 00000000..fe560644 --- /dev/null +++ b/dotfiles/.local/share/chezmoi/home/.chezmoidata.yml @@ -0,0 +1,16 @@ +--- +colors: + color1: + color2: + color3: + color4: + color5: + color6: + color7: + color8: + color9: + color10: + color11: + color12: + color13: + color14: 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 index 69c739a1..4e29e2c5 100644 --- 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 @@ -3,17 +3,8 @@ {{- includeTemplate "universal/profile" }} {{- includeTemplate "universal/logg" }} -logg 'Ensuring Taskfiles are linked properly' -if [ -d "$HOME/.local/shared-common" ]; then - cp ~/.local/shared-common/Taskfile.yml ~/.local/Taskfile.yml - sed -i 's/\.\/\.config\/taskfiles/taskfiles/g' ~/.local/Taskfile.yml - ln -s ~/.local/taskfiles ~/.local/shared-common/common/.config/taskfiles +if [ -d "$HOME/.local/src/shared-common" ]; then + logg 'Ensuring Taskfiles are linked properly' + cp "$HOME/.local/shared-common/Taskfile.yml" "$HOME/.local/Taskfile.yml" + ln -s "$HOME/.local/taskfiles" "$HOME/.local/src/shared-common/common/.config/taskfiles" fi - -{{ if (eq .chezmoi.os "darwin") }} -if command -v gsed > /dev/null; then - gsed -i 's/\.\/\.config\/taskfiles/taskfiles/g' ~/.local/Taskfile.yml -else - logg warn 'Unable to fix `~/.local/Taskfile.yml` because gsed GNU compatibility tool is not installed.' -fi -{{- end }} diff --git a/dotfiles/.local/share/chezmoi/home/dot_local/.config/symlink_taskfiles b/dotfiles/.local/share/chezmoi/home/dot_local/.config/symlink_taskfiles new file mode 100644 index 00000000..9ad0c3e7 --- /dev/null +++ b/dotfiles/.local/share/chezmoi/home/dot_local/.config/symlink_taskfiles @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .chezmoi.homeDir }}.local/src/shared-common/common/.config/taskfiles +{{- end -}} \ No newline at end of file diff --git a/dotfiles/.local/share/chezmoi/home/dot_local/state/bash/.gitkeep b/dotfiles/.local/share/chezmoi/home/dot_local/Taskfile-local.yml similarity index 100% rename from dotfiles/.local/share/chezmoi/home/dot_local/state/bash/.gitkeep rename to dotfiles/.local/share/chezmoi/home/dot_local/Taskfile-local.yml diff --git a/dotfiles/.local/share/chezmoi/home/dot_local/bin/executable_run b/dotfiles/.local/share/chezmoi/home/dot_local/bin/executable_run index 1ae2f2ee..4303285f 100644 --- a/dotfiles/.local/share/chezmoi/home/dot_local/bin/executable_run +++ b/dotfiles/.local/share/chezmoi/home/dot_local/bin/executable_run @@ -1,3 +1,3 @@ #!/usr/bin/env bash -task --taskfile $HOME/.local/common/shared/Taskfile.yml $@ +task --taskfile $HOME/.local/src/shared-common/Taskfile.yml $@ diff --git a/dotfiles/.local/share/chezmoi/home/dot_local/state/zsh/.gitkeep b/dotfiles/.local/share/chezmoi/home/dot_local/state/bash/remove_dot_gitkeep similarity index 100% rename from dotfiles/.local/share/chezmoi/home/dot_local/state/zsh/.gitkeep rename to dotfiles/.local/share/chezmoi/home/dot_local/state/bash/remove_dot_gitkeep diff --git a/dotfiles/.local/share/chezmoi/home/dot_local/state/zsh/remove_dot_gitkeep b/dotfiles/.local/share/chezmoi/home/dot_local/state/zsh/remove_dot_gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/dotfiles/.local/share/chezmoi/home/dot_local/symlink_Taskfile-upstream.yml.tmpl b/dotfiles/.local/share/chezmoi/home/dot_local/symlink_Taskfile-upstream.yml.tmpl new file mode 100644 index 00000000..502549ba --- /dev/null +++ b/dotfiles/.local/share/chezmoi/home/dot_local/symlink_Taskfile-upstream.yml.tmpl @@ -0,0 +1,3 @@ +{{- if true -}} +{{ .chezmoi.homeDir }}/.local/src/shared-common/Taskfile.yml +{{- end -}} \ No newline at end of file diff --git a/dotfiles/.local/share/chezmoi/home/dot_ssh/run_onchanges_after_generate-public-keys.tmpl b/dotfiles/.local/share/chezmoi/home/dot_ssh/run_onchanges_after_generate-public-keys.tmpl index 860f3792..07fc246b 100644 --- a/dotfiles/.local/share/chezmoi/home/dot_ssh/run_onchanges_after_generate-public-keys.tmpl +++ b/dotfiles/.local/share/chezmoi/home/dot_ssh/run_onchanges_after_generate-public-keys.tmpl @@ -7,7 +7,9 @@ {{ end -}} {{- end }} -source "$HOME/.config/shell/exports" +{{- includeTemplate "universal/profile" }} +{{- includeTemplate "universal/logg" }} + logg 'Ensuring RSA public keys are present' find "$HOME/.ssh" -type f | while read FILE; do diff --git a/dotfiles/.local/share/chezmoi/home/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json b/dotfiles/.local/share/chezmoi/home/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json index 24167e12..3926e60b 100644 --- a/dotfiles/.local/share/chezmoi/home/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json +++ b/dotfiles/.local/share/chezmoi/home/private_dot_config/oh-my-posh/Betelgeuse-minimal.omp.json @@ -108,4 +108,4 @@ ], "final_space": true, "version": 2 -} \ No newline at end of file +} diff --git a/dotfiles/.local/share/chezmoi/home/private_dot_config/rofi/config.rasi.tmpl.TODO b/dotfiles/.local/share/chezmoi/home/private_dot_config/rofi/config.rasi.tmpl similarity index 73% rename from dotfiles/.local/share/chezmoi/home/private_dot_config/rofi/config.rasi.tmpl.TODO rename to dotfiles/.local/share/chezmoi/home/private_dot_config/rofi/config.rasi.tmpl index bdb9b806..48459a96 100644 --- a/dotfiles/.local/share/chezmoi/home/private_dot_config/rofi/config.rasi.tmpl.TODO +++ b/dotfiles/.local/share/chezmoi/home/private_dot_config/rofi/config.rasi.tmpl @@ -42,10 +42,10 @@ window { padding: 0px; border: 0px solid; border-radius: 10px; // - border-color: {{ .colors.nord9 }}; + border-color: {{ .colors.color9 }}; cursor: "default"; /* Backgroud Colors */ - background-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color1 }}; // nord0 /* Backgroud Image */ //background-image: url("/path/to/image.png", none); /* Simple Linear Gradient */ @@ -64,7 +64,7 @@ mainbox { padding: 20px; border: 0px solid; border-radius: 0px 0px 0px 0px; - border-color: {{ .colors.nord9 }}; + border-color: {{ .colors.color9 }}; background-color: transparent; children: [ "inputbar", "mode-switcher", "message", "listview" ]; } @@ -78,10 +78,10 @@ inputbar { // padding: 0px; border: 0px solid; border-radius: 0px; - border-color: {{ .colors.nord9 }}; - background-color: {{ .colors.nord0 }}; + border-color: {{ .colors.color9 }}; + background-color: {{ .colors.color0 }}; // background-color: transparent; - text-color: {{ .colors.nord5 }}; + text-color: {{ .colors.color5 }}; children: [ "textbox-prompt-colon", "entry" ]; } @@ -151,16 +151,16 @@ listview { padding: 0px; border: 0px solid; border-radius: 0px; - border-color: {{ .colors.nord9 }}; + border-color: {{ .colors.color9 }}; background-color: transparent; - text-color: {{ .colors.nord5 }}; + text-color: {{ .colors.color5 }}; cursor: "default"; } scrollbar { handle-width: 5px ; - handle-color: {{ .colors.nord9 }}; + handle-color: {{ .colors.color9 }}; border-radius: 10px; - background-color: {{ .colors.nord1 }}; + background-color: {{ .colors.color1 }}; } /*****----- Elements -----*****/ @@ -171,46 +171,46 @@ element { padding: 10px; border: 0px solid; border-radius: 8px; - border-color: {{ .colors.nord9 }}; + border-color: {{ .colors.color9 }}; background-color: transparent; - text-color: {{ .colors.nord5 }}; + text-color: {{ .colors.color5 }}; cursor: pointer; } element normal.normal { - background-color: {{ .colors.nord1 }}; // nord0 - text-color: {{ .colors.nord5 }}; + background-color: {{ .colors.color1 }}; // nord0 + text-color: {{ .colors.color5 }}; } element normal.urgent { - background-color: {{ .colors.nord11 }}; - text-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color11 }}; + text-color: {{ .colors.color1 }}; // nord0 } element normal.active { - background-color: {{ .colors.nord14 }}; - text-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color14 }}; + text-color: {{ .colors.color1 }}; // nord0 } element selected.normal { - background-color: {{ .colors.nord9 }}; - text-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color9 }}; + text-color: {{ .colors.color1 }}; // nord0 } element selected.urgent { - background-color: {{ .colors.nord14 }}; - text-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color14 }}; + text-color: {{ .colors.color1 }}; // nord0 } element selected.active { - background-color: {{ .colors.nord11 }}; - text-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color11 }}; + text-color: {{ .colors.color1 }}; // nord0 } element alternate.normal { - background-color: {{ .colors.nord1 }}; // nord0 - text-color: {{ .colors.nord5 }}; + background-color: {{ .colors.color1 }}; // nord0 + text-color: {{ .colors.color5 }}; } element alternate.urgent { - background-color: {{ .colors.nord11 }}; - text-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color11 }}; + text-color: {{ .colors.color1 }}; // nord0 } element alternate.active { - background-color: {{ .colors.nord14 }}; - text-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color14 }}; + text-color: {{ .colors.color1 }}; // nord0 } element-icon { background-color: transparent; @@ -236,22 +236,22 @@ mode-switcher{ padding: 0px; border: 0px solid; border-radius: 0px; - border-color: {{ .colors.nord9 }}; + border-color: {{ .colors.color9 }}; background-color: transparent; - text-color: {{ .colors.nord5 }}; + text-color: {{ .colors.color5 }}; } button { padding: 12px; border: 0px solid; border-radius: 8px; - border-color: {{ .colors.nord9 }}; - background-color: {{ .colors.nord0 }}; // nord1 + border-color: {{ .colors.color9 }}; + background-color: {{ .colors.color0 }}; // nord1 text-color: inherit; cursor: pointer; } button selected { - background-color: {{ .colors.nord14 }}; // nord9 - text-color: {{ .colors.nord1 }}; // nord0 + background-color: {{ .colors.color14 }}; // nord9 + text-color: {{ .colors.color1 }}; // nord0 } /*****----- Message -----*****/ @@ -261,21 +261,21 @@ message { padding: 0px; border: 0px solid; border-radius: 0px 0px 0px 0px; - border-color: {{ .colors.nord9 }}; + border-color: {{ .colors.color9 }}; background-color: transparent; - text-color: {{ .colors.nord5 }}; + text-color: {{ .colors.color5 }}; } textbox { padding: 12px; border: 0px solid; border-radius: 8px; - border-color: {{ .colors.nord9 }}; - background-color: {{ .colors.nord1 }}; - text-color: {{ .colors.nord5 }}; + border-color: {{ .colors.color9 }}; + background-color: {{ .colors.color1 }}; + text-color: {{ .colors.color5 }}; vertical-align: 0.5; horizontal-align: 0.0; highlight: none; - placeholder-color: {{ .colors.nord5 }}; + placeholder-color: {{ .colors.color5 }}; blink: true; markup: true; } @@ -283,7 +283,7 @@ error-message { padding: 0px; border: 2px solid; border-radius: 8px; - border-color: {{ .colors.nord9 }}; - background-color: {{ .colors.nord1 }}; // nord0 - text-color: {{ .colors.nord5 }}; + border-color: {{ .colors.color9 }}; + background-color: {{ .colors.color1 }}; // nord0 + text-color: {{ .colors.color5 }}; } diff --git a/dotfiles/.local/share/chezmoi/home/private_dot_config/shell/encrypted_private_dot_private b/dotfiles/.local/share/chezmoi/home/private_dot_config/shell/encrypted_private_dot_private new file mode 100644 index 00000000..3e87255b --- /dev/null +++ b/dotfiles/.local/share/chezmoi/home/private_dot_config/shell/encrypted_private_dot_private @@ -0,0 +1,25 @@ +#!/usr/bin/env bash + +export LEXICON_CLOUDFLARE_USERNAME={{ .user.CLOUDFLARE_USERNAME }} + +export ANSIBLE_GALAXY_TOKEN="" +export ANSIBLE_VAULT_PASSWORD="" +export CLOUDSDK_CORE_PROJECT={{ .user.CLOUDSDK_CORE_PROJECT }} +export GCE_SERVICE_ACCOUNT_EMAIL={{ .user.GCE_SERVICE_ACCOUNT_EMAIL }} +export GCE_CREDENTIALS_FILE={{ .user.GCE_CREDENTIALS_FILE }} +export DOCKERHUB_TOKEN="" +export DOCKERHUB_REGISTRY_PASSWORD="$DOCKERHUB_TOKEN" +export GH_TOKEN="" +export GITHUB_TOKEN="$GH_TOKEN" +export GL_TOKEN="" +export GITLAB_TOKEN="$GL_TOKEN" +export HEROKU_API_KEY="" +export LEXICON_CLOUDFLARE_TOKEN="" +export NPM_TOKEN="" +export PYPI_TOKEN="" +export SNAPCRAFT_EMAIL={{ .user.SNAPCRAFT_EMAIL }} +export SNAPCRAFT_MACAROON="" +export SNAPCRAFT_UNBOUND_DISCHARGE="" +export VAGRANT_CLOUD_TOKEN="" + +export FULLY_AUTOMATED_TASKS=true diff --git a/dotfiles/.local/share/chezmoi/home/private_dot_config/shell/private_dot_private b/dotfiles/.local/share/chezmoi/home/private_dot_config/shell/private_dot_private deleted file mode 100644 index d1f56361..00000000 --- a/dotfiles/.local/share/chezmoi/home/private_dot_config/shell/private_dot_private +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -export LEXICON_CLOUDFLARE_USERNAME={{ .user.CLOUDFLARE_USERNAME }} - -# TODO - Secure following: -# export LEXICON_CLOUDFLARE_TOKEN="" diff --git a/dotfiles/.local/share/chezmoi/home/private_dot_config/tabby/config.yaml.tmpl b/dotfiles/.local/share/chezmoi/home/private_dot_config/tabby/config.yaml.tmpl index 3a25bf23..9a131bb2 100644 --- a/dotfiles/.local/share/chezmoi/home/private_dot_config/tabby/config.yaml.tmpl +++ b/dotfiles/.local/share/chezmoi/home/private_dot_config/tabby/config.yaml.tmpl @@ -222,6 +222,6 @@ configSync: parts: {} token: >- {{ .user.TABBY_SYNC_TOKEN }} - configID: 15899 + configID: {{ .user.TABBY_CONFIG_ID }} auto: true workspaceManager: {}