From 677780abc63f01182c729f0022d3ec60f627ff95 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Thu, 26 Jan 2023 07:08:57 +0000 Subject: [PATCH] Update 9 files - /home/.chezmoitemplates/secrets/ssh-config-fallback - /home/.chezmoitemplates/secrets/ssh-config - /home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl - /home/dot_zshrc - /home/dot_config/Code/User/extensions.json - /home/.chezmoidata.yaml - /home/dot_ssh/private_config.tmpl - /software.yml - /docs/TODO.md --- docs/TODO.md | 10 +++++ home/.chezmoidata.yaml | 5 +++ ...un_onchange_after_80-bash-completions.tmpl | 7 +++ home/.chezmoitemplates/secrets/ssh-config | 18 ++++++++ .../secrets/ssh-config-fallback | 22 ++++++++++ home/dot_config/Code/User/extensions.json | 2 + home/dot_ssh/private_config.tmpl | 36 +++------------- home/dot_zshrc | 43 +++++++++---------- software.yml | 11 +++++ 9 files changed, 101 insertions(+), 53 deletions(-) create mode 100644 home/.chezmoitemplates/secrets/ssh-config create mode 100644 home/.chezmoitemplates/secrets/ssh-config-fallback diff --git a/docs/TODO.md b/docs/TODO.md index 656ad90a..5e274671 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -1,5 +1,9 @@ https://drasite.com/blog/Pimp%20my%20terminal +https://github.com/checkly/headless-recorder +https://github.com/DustinBrett/daedalOS +https://github.com/ansh/jiffyreader.com +https://github.com/allinurl/goaccess ### Ensure these PATHs are added on Windows add to PATH: '%ProgramFiles(x86)%\mitmproxy\bin' @@ -161,3 +165,9 @@ WAZUH_AGENT_GROUP Assigns the agent to one or more existing groups (separated by commas). See agent_groups. ENROLLMENT_DELAY Assigns the time that agentd should wait after a successful registration. See delay_after_enrollment. + + + +### Docker +https://github.com/filebrowser/filebrowser +https://github.com/coder/code-server \ No newline at end of file diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index c4ee6364..b0e71f9d 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -21,11 +21,14 @@ colors: color16: '#FFFFFF' config: gpg: https://raw.githubusercontent.com/drduh/config/master/gpg.conf +chromeExtensions: + - https://chrome.google.com/webstore/detail/chatgpt-for-google/jgjaeacdkonaoafenlfkkkmbaopkbilf firefoxAddOns: - automa - bitwarden-password-manager - buffer-for-firefox - canvasblocker + - chatgpt-for-google - clearurls - decentraleyes - dictionary-anyvhere @@ -41,6 +44,7 @@ firefoxAddOns: - languagetool - mailvelope - markdown-here + - medium-unlimited-read-for-free - multi-account-containers - noscript - privacy-badger17 @@ -561,6 +565,7 @@ softwareGroups: Orchestration: &Orchestration - nomad - pm2 + - sake - waypoint PHP: &PHP - composer diff --git a/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl index 8248ee09..8b7727a6 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions.tmpl @@ -152,6 +152,13 @@ elif [ -f "$COMPLETION_DIR/poetry.bash" ]; then rm "$COMPLETION_DIR/poetry.bash" fi +### Sake +if command -v sake > /dev/null; then + sake completion bash > "$COMPLETION_DIR/sake.bash" +elif [ -f "$COMPLETION_DIR/sake.bash" ]; then + rm "$COMPLETION_DIR/sake.bash" +fi + ### Volta if command -v volta > /dev/null; then volta completions bash > "$COMPLETION_DIR/volta.bash" diff --git a/home/.chezmoitemplates/secrets/ssh-config b/home/.chezmoitemplates/secrets/ssh-config new file mode 100644 index 00000000..c15e48f8 --- /dev/null +++ b/home/.chezmoitemplates/secrets/ssh-config @@ -0,0 +1,18 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPbGhxR24xWjJCOUk0OEpT +YzE1MUF3cGkwTEgrQWM4QklxeUFzQ00yMnpVCjRON21rTzV4NHFHbjRnck5VZFZK +Vk8zM3ptbWVzVWt5WWVGdVNpM0N2bkkKLS0tIGJxVnRaM0hqb1Ryamhkd0lBSW9r +RENpWE1BRHNJaDlkTjFZVDU1NzMvT3MKAOgcMKuLNIAjthnyITLCPZCNN/VECZ3v +nDwEkZ8QzNATedJAmIR1VHzebnyI9RFMYEnEgsgmPUZkSD1fJR7A+ytET7W+nW80 +6IXCn+TJKk7z801HeBXX1RbmohSG8x1kRcB/DynvD2ceQQBRu6f+lTY5Oyf2MSD5 +PI0ObmBkj0IeIwk4pHSX3lh9siAQwmYGA+9atIhS1zLPzrHrbGADtoFPh0DxyX2f +fRKRohI28OnXd2QSZhUNdjFnX8lbziU/2GZyC9ToR9LxchbGjExn7LY/SmDZzCtu +JA211bLQ4DQTqpOZV0kObS8BuBWL5kWSwO/UPNzZ+lLscD4yu+rcEmonNpsOVlZb +N0yLvsnPux1Q05OR2y7x/xCnOKaF3TL92bFSrY7PaqM1p5SVfcWg2tepemOw1bc+ +q/hIEgaiGaxmf80KArEJteD56VxIW3LXRDBgTpsLsNFKhHAUVWDxhBN4PrEIZ+Ix +CpfEA9o6Tm+i7/w0rhlr1mTK3FCAGzlt2h+XHeQx4ulmi5WcfWp9elfn9nNFkagm +mthhO8m0sdV8fD//tbZrTqUUJbIKrd9TdElXyJNoxIg6l9IUHdQavtysKYbDDHkj +w6EgJK3S3UIN5HNM9nCXwxP5KvSs7CJZvKjCGYRVumsm+oqY4un+ucdT8ubF5dvU +BFhgiZPslAWkMPJc9RzCeVNUi1/ci5KvFGnmWgAMzjOT2K6iXk/IlGx90xc/a3Bp +inW08O/z +-----END AGE ENCRYPTED FILE----- \ No newline at end of file diff --git a/home/.chezmoitemplates/secrets/ssh-config-fallback b/home/.chezmoitemplates/secrets/ssh-config-fallback new file mode 100644 index 00000000..b5cf29b6 --- /dev/null +++ b/home/.chezmoitemplates/secrets/ssh-config-fallback @@ -0,0 +1,22 @@ +Host * + AddKeysToAgent yes + UseKeychain yes + Compression no + ControlPath ~/.ssh/master-%r@%h:%p + ControlMaster auto + ControlPersist 5 + ExitOnForwardFailure yes + ForwardAgent yes + ForwardX11 no + ForwardX11Trusted no + GSSAPIAuthentication no + IgnoreUnknown AddKeysToAgent,UseKeychain + PreferredAuthentications publickey + Protocol 2 + ServerAliveInterval 60 + ServerAliveCountMax 30 + IdentitiesOnly yes +Host gitlab.com + UpdateHostKeys no +Host github.com + UpdateHostKeys no diff --git a/home/dot_config/Code/User/extensions.json b/home/dot_config/Code/User/extensions.json index e5462ee3..41d1f209 100644 --- a/home/dot_config/Code/User/extensions.json +++ b/home/dot_config/Code/User/extensions.json @@ -24,11 +24,13 @@ "HashiCorp.terraform", "hediet.vscode-drawio", "IBM.output-colorizer", + "JSONHero.jsonhero-vscode", "Kelvin.vscode-sshfs", "mads-hartmann.bash-ide-vscode", "ms-azuretools.vscode-docker", "ms-kubernetes-tools.vscode-kubernetes-tools", "ms-python.python", + "ms-vscode.live-server", "ms-vscode-remote.remote-containers", "ms-vscode-remote.remote-ssh", "ms-vscode-remote.remote-wsl", diff --git a/home/dot_ssh/private_config.tmpl b/home/dot_ssh/private_config.tmpl index 6cc9efe7..d7aa3fdd 100644 --- a/home/dot_ssh/private_config.tmpl +++ b/home/dot_ssh/private_config.tmpl @@ -1,31 +1,5 @@ -Host * - AddKeysToAgent no - Compression no - ControlMaster auto - ControlPath /tmp/ssh-%r@%h:%p - ControlPersist 5 - ExitOnForwardFailure yes - ForwardAgent no - ForwardX11 no - ForwardX11Trusted no - GSSAPIAuthentication no - IgnoreUnknown UseKeychain - PreferredAuthentications publickey - Protocol 2 - ServerAliveInterval 60 - ServerAliveCountMax 30 - IdentitiesOnly yes -Host gitlab.com - UpdateHostKeys no -{{- if ne .host.distro.family "windows" }} - ControlMaster auto - ControlPath /tmp/ssh-%r@%h:%p - ControlPersist 5 -{{- end }} -{{- if eq .host.distro.family "darwin" }} - AddKeysToAgent yes - UseKeychain yes -{{- end }} - ExitOnForwardFailure yes - ForwardAgent yes - ForwardX11 no +{{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ssh-config")) -}} +{{ includeTemplate "secrets/ssh-config" | decrypt -}} +{{ else if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ssh-config-fallback")) -}} +{{ includeTemplate "secrets/ssh-config-fallback" }} +{{- end -}} \ No newline at end of file diff --git a/home/dot_zshrc b/home/dot_zshrc index e526dbea..b1e9e25f 100644 --- a/home/dot_zshrc +++ b/home/dot_zshrc @@ -264,43 +264,42 @@ if command -v antigen > /dev/null; then antigen use oh-my-zsh antigen bundle adb # antigen bundle colored-man-pages - # antigen bundle command-not-found - # antigen bundle copyfile - # antigen bundle copybuffer - # antigen bundle encode64 + antigen bundle command-not-found + antigen bundle copybuffer + # TODO: Add as an alias available to Bash as well + antigen bundle encode64 antigen bundle fd - # antigen bundle git-auto-fetch + antigen bundle git-auto-fetch # antigen bundle gnu-utils # antigen bundle heroku # antigen bundle keychain - # antigen bundle kubectx - # antigen bundle macos - # antigen bundle magic-enter - # antigen bundle minikube + antigen bundle kubectx + antigen bundle macos + antigen bundle magic-enter + antigen bundle minikube antigen bundle ng - # antigen bundle nomad + antigen bundle nomad antigen bundle npm - # antigen bundle redis-cli + antigen bundle redis-cli antigen bundle ripgrep - # antigen bundle rust - # antigen bundle safe-paste - # antigen bundle salt + antigen bundle rust + antigen bundle safe-paste # antigen bundle shell-proxy # antigen bundle ssh-agent antigen bundle sudo - # antigen bundle ufw - # antigen bundle web-search + antigen bundle ufw + antigen bundle web-search antigen bundle docker antigen bundle docker-compose antigen bundle ionic - # antigen bundle multipass - # antigen bundle pip - # antigen bundle pm2 - # antigen bundle terraform + antigen bundle multipass + antigen bundle pip + antigen bundle pm2 + antigen bundle terraform antigen bundle vagrant - # antigen bundle yarn + antigen bundle yarn - # antigen bundle zsh-interactive-cd + antigen bundle zsh-interactive-cd # antigen bundle zsh-navigation-tools antigen bundle zsh-users/zsh-completions src antigen bundle zsh-users/zsh-syntax-highlighting diff --git a/software.yml b/software.yml index 954f8c33..710966b8 100644 --- a/software.yml +++ b/software.yml @@ -6473,6 +6473,17 @@ softwarePackages: pacman: sad _service: false _type: cli + sake: + _bin: sake + _desc: Sake is a task runner for local and remote hosts + _docs: https://sakecli.com/examples + _github: https://github.com/alajmo/sake + _home: https://sakecli.com/ + _name: Sake + brew: alajmo/sake/sake + go: github.com/alajmo/sake@latest + script:darwin: curl -sfL https://raw.githubusercontent.com/alajmo/sake/main/install.sh | sh + script:linux: curl -sfL https://raw.githubusercontent.com/alajmo/sake/main/install.sh | sh samba: _bin: smbd _bin:dnf: smb