diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml index 96c3b9e1..b1f1be4b 100644 --- a/home/.chezmoidata.yaml +++ b/home/.chezmoidata.yaml @@ -409,8 +409,6 @@ softwareGroups: - github-desktop - intellij-idea-ce - iterm2 - - lepton - - masscode - meld - powershell - redis-desktop-manager @@ -1181,10 +1179,14 @@ softwareGroups: - hyper - jenv - kitty + - pkg: lepton + note: Deprecated in favor of [Pieces](https://pieces.app/). The core components of Pieces are not open-source but the functionality is significantly better than massCode. - license - lpass - lsd - mackup + - pkg: masscode # Deprecated in favor of Pieces + note: Deprecated in favor of [Pieces](https://pieces.app/). The core components of Pieces are not open-source but the functionality is significantly better than massCode. - nordvpn - nvm - pyenv diff --git a/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-darwin.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-darwin.sh.tmpl index c9a51b5e..f006c53b 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-darwin.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-darwin.sh.tmpl @@ -24,6 +24,9 @@ {{ includeTemplate "universal/profile" }} {{ includeTemplate "universal/logg" }} +# TODO - Populate Tunnelblick on macOS using the .ovpn profiles located in $HOME/.config/vpn +# along with the secrets for the protonVPN OpenVPN (check vpn-linux.tmpl) + # @description Backs up previous network settings to `/Library/Preferences/com.apple.networkextension.plist.old` before applying new VPN profiles if [ -f /Library/Preferences/com.apple.networkextension.plist ]; then logg info 'Backing up /Library/Preferences/com.apple.networkextension.plist to /Library/Preferences/com.apple.networkextension.plist.old' diff --git a/home/.chezmoitemplates/secrets/WAKATIME_API_KEY b/home/.chezmoitemplates/secrets/WAKATIME_API_KEY new file mode 100644 index 00000000..97078d28 --- /dev/null +++ b/home/.chezmoitemplates/secrets/WAKATIME_API_KEY @@ -0,0 +1,8 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtaEFzNURGQU82Q3dhK09M +Zy9CQ3NJV04wN05OenkzVVV6T3VmKy9PdnlnCmNDUFVtUTYxZ2h1OVFvM2xtQXIr +My9qbzNLNmk1V0tKSlkzVjBqMklaUG8KLS0tIDI4ZnNqNUFYdks0QURjVGd2cW0y +bzdSL2QyUlVjMVcvdFI1OTdHL21yUkUKSncR0A7+wtIWGYPa37qWbd66hjukM46Y +XgD3o2iXKvKwiYyfUbw6s7Il+Hz5VQhi6w2603zVLgJOxMJ5/NaCBHeA6IrSzOWU +ip8= +-----END AGE ENCRYPTED FILE----- \ No newline at end of file diff --git a/home/dot_config/Code/User/extensions.json b/home/dot_config/Code/User/extensions.json index 7fa4cdb3..c7e9c9b8 100644 --- a/home/dot_config/Code/User/extensions.json +++ b/home/dot_config/Code/User/extensions.json @@ -36,8 +36,8 @@ "cs50.vscode-presentation-mode", "cucumberopen.cucumber-official", "cweijan.vscode-mysql-client2", - "dart-code.dart-code", - "dart-code.flutter", + // "dart-code.dart-code", Creates a ~/.dart and ~/.dartServer folder. Does not respect XDG spec. + // "dart-code.flutter", "davidanson.vscode-markdownlint", "dbaeumer.vscode-eslint", "denoland.vscode-deno", @@ -96,8 +96,8 @@ "hediet.vscode-drawio", "htmlhint.vscode-htmlhint", "humao.rest-client", - "ibm.codewind", - "ibm.ibm-developer", + // "ibm.codewind", Creates a ~/.codewind folder. Does not respect XDG spec. + // "ibm.ibm-developer", "ibm.output-colorizer", "idered.npm", "infracost.infracost", @@ -106,7 +106,7 @@ "ionic.ionic", "jasonn-porch.gitlab-mr", "jerrygoyal.shortcut-menu-bar", - "jfrog.jfrog-vscode-extension", + // "jfrog.jfrog-vscode-extension", Creates a ~/.jfrog-vscode-extension folder. Does not respect XDG spec. "johnpapa.vscode-peacock", "jsayol.firebase-explorer", "jsonhero.jsonhero-vscode", @@ -120,7 +120,7 @@ "l13rary.l13-diff", "lennartlence.chadcommit", "leonardssh.vscord", - "lightrun.lightrunplugin-saas", + // "lightrun.lightrunplugin-saas", Creates a ~/.lightrun folder. Does not respect XDG spec. "logerfo.gitlab-notifications", "lottiefiles.vscode-lottie", "loyieking.smalise", @@ -180,7 +180,6 @@ "ms-vscode-remote.remote-containers", "ms-vscode-remote.remote-ssh-edit", "ms-vscode-remote.remote-ssh", - "ms-vscode-remote.remote-ssh-edit" "ms-vscode-remote.remote-wsl", "ms-vscode-remote.vscode-remote-extensionpack", "ms-vscode.azure-account", @@ -226,7 +225,7 @@ "pdconsec.vscode-print", "philnash.ngrok-for-vscode", "pkief.material-icon-theme", - "platformio.platformio-ide", + // "platformio.platformio-ide", Creates ~/.platformio folder. Does not respect XDG spec. "pnp.polacode", "postman.postman-for-vscode", "pranaygp.vscode-css-peek", @@ -250,8 +249,8 @@ "redhat.vscode-yaml", "reduckted.vscode-gitweblinks", "richie5um2.vscode-sort-json", - "robocorp.robocorp-code", - "robocorp.robotframework-lsp", + // "robocorp.robocorp-code", Creates a ~/.robocorp and ~/.robocorp-code folder. Does not respect XDG spec. + // "robocorp.robotframework-lsp", "rogalmic.bash-debug", "rubymaniac.vscode-paste-and-indent", "rust-lang.rust-analyzer", @@ -265,9 +264,9 @@ "snipsnapdev.snipsnap-vscode", "snyk-security.snyk-vulnerability-scanner", "softwaredotcom.swdc-vscode", - "sonarsource.sonarlint-vscode", + // "sonarsource.sonarlint-vscode", Creates a ~/.sonarlint folder. Does not respect XDG spec. "spmeesseman.vscode-taskexplorer", - "sprkldev.sprkl-vscode", + // "sprkldev.sprkl-vscode", Creates a ~/.sprkl folder. Does not respect XDG spec. "stamusnetworks.suricata-ls", "statelyai.stately-vscode", "steoates.autoimport", diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl index 25acdb04..35afea97 100644 --- a/home/dot_config/shell/exports.sh.tmpl +++ b/home/dot_config/shell/exports.sh.tmpl @@ -146,6 +146,7 @@ export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker" export MACHINE_STORAGE_PATH="$XDG_DATA_HOME/docker-machine" ### Dotnet +export DOTNET_CLI_HOME="$XDG_CONFIG_HOME/dotnet" if [ -d /Applications ] && [ -d /Library ]; then export DOTNET_ROOT="/usr/local/opt/dotnet/libexec" elif [ -d /home/linuxbrew/.linuxbrew/opt/dotnet ]; then @@ -227,6 +228,9 @@ export KODI_DATA="$XDG_DATA_HOME/kodi" ### Krew export KREW_ROOT="$XDG_DATA_HOME/krew" +### Kube +export KUBECONFIG="$XDG_CONFIG_HOME/kube/config" + ### Maven export MAVEN_CONFIG="$XDG_CONFIG_HOME/maven/settings.xml" alias mvn="mvn -s $MAVEN_CONFIG" @@ -242,6 +246,9 @@ export MINIKUBE_HOME="$XDG_DATA_HOME/minikube" ### MySQL export MYSQL_HISTFILE="$XDG_DATA_HOME/mysql_history" +### .netrc +export NETRC="$XDG_CONFIG_HOME/netrc" + ### nnn if command -v nnn > /dev/null; then alias n='nnn -de' @@ -263,6 +270,9 @@ export NTL_RERUN_CACHE_DIR="$XDG_DATA_HOME/ntl" export NTL_RERUN_CACHE_NAME="cache" export NTL_RERUN_CACHE_MAX="100" +### NuGet +export NUGET_PACKAGES="$XDG_DATA_HOME/nuget" + ### Parallels export PARALLEL_HOME="$XDG_CONFIG_HOME/parallel" @@ -316,6 +326,9 @@ export VAGRANT_HOME="$XDG_DATA_HOME/vagrant.d" export VOLTA_HOME="$XDG_DATA_HOME/volta" export PATH="$VOLTA_HOME/bin:$PATH" +### Wakatime +export WAKATIME_HOME="$XDG_CONFIG_HOME/wakatime" + ### wget export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" diff --git a/home/dot_config/vim/vimrc b/home/dot_config/vim/vimrc index d40b9069..ad20fbbe 100644 --- a/home/dot_config/vim/vimrc +++ b/home/dot_config/vim/vimrc @@ -101,5 +101,8 @@ let g:syntastic_check_on_wq = 0 " Settings for plugin https://github.com/ryanoasis/vim-devicons.git set encoding=UTF-8 +" Set location of viminfo file +set viminfo+=n~/.config/vim/viminfo + " Automatically apply with Chezmoi anytime a source file is modified autocmd BufWritePost ~/.local/share/chezmoi/* ! chezmoi apply --source-path "%" diff --git a/home/dot_config/wakatime/.wakatime.cfg b/home/dot_config/wakatime/.wakatime.cfg new file mode 100644 index 00000000..23c07030 --- /dev/null +++ b/home/dot_config/wakatime/.wakatime.cfg @@ -0,0 +1,4 @@ +{{- if (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) -}} +[settings] +api_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "WAKATIME_API_KEY")) }}{{ includeTemplate "secrets/VAGRANT_CLOUD_TOKEN" | decrypt }}{{ else }}{{ env "WAKATIME_API_KEY" }}{{ end }} +{{- end }}