From 8104ea2f7a6d8bd4e4034bc45116d431bf6ff27a Mon Sep 17 00:00:00 2001 From: Tyrone Meijn Date: Tue, 3 Dec 2024 13:50:20 +0000 Subject: [PATCH] fix: cleanup after leaving Kabisa --- README.md | 13 +- ...nchange_30_install_extensions_list.sh.tmpl | 6 +- chezmoi/dot_aws/config | 273 ------------------ chezmoi/dot_bash_aliases | 2 +- chezmoi/dot_bashrc | 10 +- chezmoi/dot_config/aquaproj-aqua/aqua.yaml | 6 + chezmoi/dot_config/ghorg/reclone.yaml | 8 - chezmoi/dot_config/mise/config.toml | 13 +- chezmoi/dot_config/mise/settings.toml | 4 - create_arm64_vm.sh | 10 + 10 files changed, 48 insertions(+), 297 deletions(-) delete mode 100644 chezmoi/dot_config/mise/settings.toml create mode 100644 create_arm64_vm.sh diff --git a/README.md b/README.md index f21840a3..7c8f20b8 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,13 @@ sh -c "$(wget -qO- get.chezmoi.io) -- init --apply --verbose tmeijn" ``` 1. Navigate to the chezmoi dir by executing `chezmoi cd` -1. Update the remote url with `git remote set-url origin git@gitlab.com:tmeijn/dotfiles.git` -1. Run the script that will generate SSH key and upload both to gitlab.com and github.com: +1. Update the git remote url: + + ```bash + git remote set-url origin git@gitlab.com:el-capitano/dotfiles.git + ``` + +1. Run the script that will generate an SSH key and uploads the public key both to gitlab.com and github.com: ```bash bash gen_ssh_key_and_add_to_scms.sh @@ -85,7 +90,7 @@ Login to following sites: ### Configure VS Code 🎹 -down-right, login using your GitHub account. Everything should be synced afterwards. +In the left sidebar, down left, login using your GitHub account. Everything should be synced afterwards. ### Configure Microsoft Account @@ -119,7 +124,7 @@ Feel free to explore and modify these dotfiles according to your preferences. Ha - https://github.com/halostatue/dotfiles -## (Legacy) -- References accumulated when trying out Nix +## (Legacy) - References accumulated when trying out Nix - [paholg/dotfiles: Some of my config files and scripts I find useful.](https://github.com/paholg/dotfiles) - [GitHub - gvolpe/nix-config: NixOS configuration](https://github.com/gvolpe/nix-config) diff --git a/chezmoi/.chezmoiscripts/run_onchange_30_install_extensions_list.sh.tmpl b/chezmoi/.chezmoiscripts/run_onchange_30_install_extensions_list.sh.tmpl index 5665e5fc..0fe65230 100644 --- a/chezmoi/.chezmoiscripts/run_onchange_30_install_extensions_list.sh.tmpl +++ b/chezmoi/.chezmoiscripts/run_onchange_30_install_extensions_list.sh.tmpl @@ -9,4 +9,8 @@ echo "===============================================================" echo "" # dconf.ini hash: {{ include "installed-extensions.txt" | sha256sum }} -cat {{ joinPath .chezmoi.sourceDir "installed-extensions.txt" | quote }} | xargs -I {} gext install {} + +if command -v gext &> /dev/null; then + cat {{ joinPath .chezmoi.sourceDir "installed-extensions.txt" | quote }} | xargs -I {} gext install {} +fi + diff --git a/chezmoi/dot_aws/config b/chezmoi/dot_aws/config index bc5076b8..c97a9367 100644 --- a/chezmoi/dot_aws/config +++ b/chezmoi/dot_aws/config @@ -29,276 +29,3 @@ granted_sso_start_url = https://capitano.awsapps.com/start granted_sso_account_id = 963859772442 granted_sso_role_name = AdministratorAccess credential_process = granted credential-process --profile capitano_prod - -# ██╗ ██╗ █████╗ ██████╗ ██╗███████╗ █████╗ -# ██║ ██╔╝██╔══██╗██╔══██╗██║██╔════╝██╔══██╗ -# █████╔╝ ███████║██████╔╝██║███████╗███████║ -# ██╔═██╗ ██╔══██║██╔══██╗██║╚════██║██╔══██║ -# ██║ ██╗██║ ██║██████╔╝██║███████║██║ ██║ -# ╚═╝ ╚═╝╚═╝ ╚═╝╚═════╝ ╚═╝╚══════╝╚═╝ ╚═╝ -[profile kabisa-iam] -mfa_serial = arn:aws:iam::977189580908:mfa/tyrone.meijn -duration_seconds = 14400 -region = eu-west-1 -credential_process = granted credential-process --profile kabisa-iam - -[profile kabisa-playground] -source_profile = kabisa-iam -role_arn = arn:aws:iam::820116308106:role/admin - -[profile kabisa-ops] -source_profile = kabisa-iam -role_arn = arn:aws:iam::003476575487:role/admin - -# ███████╗██╗ ██████╗ ███╗ ██╗██╗███████╗██╗ ██╗ ██████╗ ██████╗ ███╗ ██╗███████╗████████╗███████╗██╗ ██╗ █████╗ ████████╗██╗ ██████╗ ███╗ ██╗ -# ██╔════╝██║██╔════╝ ████╗ ██║██║██╔════╝╚██╗ ██╔╝ ██╔════╝██╔═══██╗████╗ ██║██╔════╝╚══██╔══╝██╔════╝██║ ██║ ██╔══██╗╚══██╔══╝██║██╔═══██╗████╗ ██║ -# ███████╗██║██║ ███╗██╔██╗ ██║██║█████╗ ╚████╔╝ █████╗ ██║ ██║ ██║██╔██╗ ██║███████╗ ██║ █████╗ ██║ ██║ ███████║ ██║ ██║██║ ██║██╔██╗ ██║ -# ╚════██║██║██║ ██║██║╚██╗██║██║██╔══╝ ╚██╔╝ ╚════╝ ██║ ██║ ██║██║╚██╗██║╚════██║ ██║ ██╔══╝ ██║ ██║ ██╔══██║ ██║ ██║██║ ██║██║╚██╗██║ -# ███████║██║╚██████╔╝██║ ╚████║██║██║ ██║ ╚██████╗╚██████╔╝██║ ╚████║███████║ ██║ ███████╗███████╗███████╗██║ ██║ ██║ ██║╚██████╔╝██║ ╚████║ -# ╚══════╝╚═╝ ╚═════╝ ╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═══╝╚══════╝ ╚═╝ ╚══════╝╚══════╝╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═══╝ -[sso-session signify] -sso_region = eu-west-1 -sso_start_url = https://d-936704647b.awsapps.com/start - -[profile constellation-ops] -granted_sso_region = eu-west-1 -granted_sso_start_url = https://d-936704647b.awsapps.com/start -granted_sso_account_id = 639160412879 -granted_sso_role_name = AdministratorAccess -region = eu-central-1 -credential_process = granted credential-process --profile constellation-ops - -[profile constellation-dev] -granted_sso_region = eu-west-1 -granted_sso_start_url = https://d-936704647b.awsapps.com/start -granted_sso_account_id = 461594237321 -granted_sso_role_name = AdministratorAccess -region = eu-central-1 -credential_process = granted credential-process --profile constellation-dev - -[profile constellation-qa] -granted_sso_region = eu-west-1 -granted_sso_start_url = https://d-936704647b.awsapps.com/start -granted_sso_account_id = 779611895282 -granted_sso_role_name = AdministratorAccess -region = eu-central-1 -credential_process = granted credential-process --profile constellation-qa - -[profile constellation-acc] -granted_sso_region = eu-west-1 -granted_sso_start_url = https://d-936704647b.awsapps.com/start -granted_sso_account_id = 942181379715 -granted_sso_role_name = AdministratorAccess -region = eu-central-1 -credential_process = granted credential-process --profile constellation-acc - -[profile constellation-prod] -granted_sso_region = eu-west-1 -granted_sso_start_url = https://d-936704647b.awsapps.com/start -granted_sso_account_id = 876065752144 -granted_sso_role_name = AdministratorAccess -region = eu-central-1 -credential_process = granted credential-process --profile constellation-prod - -[profile smart-agreements] -credential_process = granted credential-process --profile=smart-agreements - -[profile kabisa-dovetail-reseller/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 741917399688 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-dovetail-reseller/AdministratorAccess - -[profile buurkracht-app/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 204197918388 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile buurkracht-app/AdministratorAccess - -[profile viaviela-production/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 926227716945 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile viaviela-production/AdministratorAccess - -[profile kabisa-security/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 472643443173 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-security/AdministratorAccess - -[profile mijnacmo-acceptance/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 745032881143 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile mijnacmo-acceptance/AdministratorAccess - -[profile kivi-production/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 375479831194 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kivi-production/AdministratorAccess - -[profile kabisa-backups/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 190384451510 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-backups/AdministratorAccess - -[profile kabisa-billing/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 229276128807 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-billing/AdministratorAccess - -[profile Kabisa/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 702056794978 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile Kabisa/AdministratorAccess - -[profile belron-cms-production/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 722754894782 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile belron-cms-production/AdministratorAccess - -[profile kabisa-ops/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 003476575487 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-ops/AdministratorAccess - -[profile kabisa-monitor/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 070346990155 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-monitor/AdministratorAccess - -[profile viaviela-playground/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 475608054092 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile viaviela-playground/AdministratorAccess - -[profile viaviela-acceptance/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 485050134664 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile viaviela-acceptance/AdministratorAccess - -[profile kivi-staging/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 626161977071 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kivi-staging/AdministratorAccess - -[profile kabisa-training/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 050004364584 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-training/AdministratorAccess - -[profile viaviela-production-2024/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 903891933481 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile viaviela-production-2024/AdministratorAccess - -[profile belron-cms-staging/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 349090710563 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile belron-cms-staging/AdministratorAccess - -[profile viaviela-acceptance-2/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 874694617209 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile viaviela-acceptance-2/AdministratorAccess - -[profile kabisa-tools/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 952084545409 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-tools/AdministratorAccess - -[profile aws+kabisa-websites/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 299159644482 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile aws+kabisa-websites/AdministratorAccess - -[profile kabisa-iam/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 977189580908 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-iam/AdministratorAccess - -[profile kabisa-playground/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 820116308106 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile kabisa-playground/AdministratorAccess - -[profile viaviela-staging/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 854413872844 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile viaviela-staging/AdministratorAccess - -[profile mijnamco-production/AdministratorAccess] -granted_sso_start_url = https://kabisa.awsapps.com/start -granted_sso_region = eu-west-1 -granted_sso_account_id = 295715172212 -granted_sso_role_name = AdministratorAccess -common_fate_generated_from = aws-sso -credential_process = granted credential-process --profile mijnamco-production/AdministratorAccess diff --git a/chezmoi/dot_bash_aliases b/chezmoi/dot_bash_aliases index d6c86156..13c6623a 100644 --- a/chezmoi/dot_bash_aliases +++ b/chezmoi/dot_bash_aliases @@ -45,7 +45,7 @@ fi # Mise installed: no arm64 binary if command -v moar &> /dev/null; then - export PAGER=moar + export PAGER="moar -no-clear-on-exit" fi # mise installed: Python package diff --git a/chezmoi/dot_bashrc b/chezmoi/dot_bashrc index ad7be8e8..3d93913d 100644 --- a/chezmoi/dot_bashrc +++ b/chezmoi/dot_bashrc @@ -62,6 +62,7 @@ export PATH="$HOME/bin:$PATH" # Activate Mise: https://github.com/jdx/mise. if command -v mise &> /dev/null; then eval "$(mise activate bash)" + eval "$(mise env -s bash)" # Mise itself doesn't export this as a variable as Aqua does do, so we do it ourself MISE_GLOBAL_CONFIG="$(mise config ls --no-header | awk '{print $1}')" MISE_GLOBAL_CONFIG="${MISE_GLOBAL_CONFIG//\~/$HOME}" @@ -123,6 +124,13 @@ fi if command -v terraform &> /dev/null; then complete -C "$(which terraform)" terraform; fi if command -v aws_completer &> /dev/null; then complete -C "$(which aws_completer)" aws; fi +# Can be used as fallback when rbw is broken. +if [ -f ~/.env ]; then + set -a + source ~/.env + set +a +fi + ############################################## # BITWARDEN: auto load tokens if DB unlocked # ############################################## @@ -155,7 +163,7 @@ function set_win_title() { starship_precmd_user_func="set_win_title" -if command -v thefuck &> /dev/null; then eval "$(thefuck --alias fuck)"; fi +# if command -v thefuck &> /dev/null; then eval "$(thefuck --alias fuck)"; fi # disabled until https://github.com/nvbn/thefuck/pull/1404 is fixed. Unlikely as the issue is over a month old. if command -v zoxide &> /dev/null; then eval "$(zoxide init --cmd cd bash)"; fi if command -v starship &> /dev/null; then eval "$(starship init bash --print-full-init)"; fi if command -v atuin &> /dev/null; then eval "$(atuin init bash)"; fi diff --git a/chezmoi/dot_config/aquaproj-aqua/aqua.yaml b/chezmoi/dot_config/aquaproj-aqua/aqua.yaml index 48afac66..2f5f1d7d 100644 --- a/chezmoi/dot_config/aquaproj-aqua/aqua.yaml +++ b/chezmoi/dot_config/aquaproj-aqua/aqua.yaml @@ -319,3 +319,9 @@ packages: - name: achristmascarl/rainfrog@v0.2.10 description: a database management tui for postgres link: https://github.com/achristmascarl/rainfrog +- name: errata-ai/vale@v3.9.1 + description: A syntax-aware linter for prose built with speed and extensibility in mind + link: https://github.com/errata-ai/vale +- name: quantumsheep/sshs@4.5.1 + description: Terminal user interface for SSH + link: https://github.com/quantumsheep/sshs diff --git a/chezmoi/dot_config/ghorg/reclone.yaml b/chezmoi/dot_config/ghorg/reclone.yaml index 6c4d34eb..aad76c29 100644 --- a/chezmoi/dot_config/ghorg/reclone.yaml +++ b/chezmoi/dot_config/ghorg/reclone.yaml @@ -10,11 +10,3 @@ el-capitano: cmd: "ghorg clone el-capitano" description: "Clones our personal group, El Capitano." - -kabisa: - cmd: "ghorg clone kabisa --scm=github" - description: "Clones the full Kabisa B.V. organization." - -constellation: - cmd: "ghorg clone signify1/constellation" - description: "Clones the full Constellation project." diff --git a/chezmoi/dot_config/mise/config.toml b/chezmoi/dot_config/mise/config.toml index 3078ca83..f4d3d030 100644 --- a/chezmoi/dot_config/mise/config.toml +++ b/chezmoi/dot_config/mise/config.toml @@ -1,11 +1,9 @@ [tools] aws-nuke = "latest" -glab = "1.46.1" +glab = "1.50.0" go = "1.23.3" kubectl = "1.31.3" node = "20.18.1" -kubectl = "1.31.2" -node = "20.18.1" python = "3.13.0" pre-commit = "latest" protoc = "latest" @@ -22,7 +20,7 @@ pipx = "latest" "pipx:ansible-lint" = "latest" "pipx:aws-gate" = "latest" "pipx:gnome-extensions-cli" = "0.10.3" -"pipx:harlequin" = { version = "latest", extras = "postgres" } +"pipx:harlequin" = { version = "latest", extras = "postgres", uvx_args = "--python 3.12" } # Python 3.13 not yet supported: https://github.com/tconbeer/harlequin/issues/697 "pipx:pgcli" = "latest" "pipx:readmeai" = "latest" "pipx:smassh" = "latest" @@ -40,11 +38,11 @@ pipx = "latest" "cargo:oha" = "latest" "cargo:onefetch" = "latest" "cargo:pik" = "latest" -"cargo:rbw" = "latest" "cargo:ripgrep_all" = "latest" "cargo:serie" = "latest" "cargo:zeitfetch" = "latest" "cargo:https://github.com/fioncat/otree" = "HEAD" +"cargo:davla/rbw" = "rev:e07f0d7e0" # PR which fixes broken rbw: https://github.com/doy/rbw/pull/219 ############### # Go Packages # @@ -68,3 +66,8 @@ pipx = "latest" [settings] pipx_uvx = true +pin = true +experimental = true + +[settings.python] +compile = true diff --git a/chezmoi/dot_config/mise/settings.toml b/chezmoi/dot_config/mise/settings.toml deleted file mode 100644 index 52fa5c62..00000000 --- a/chezmoi/dot_config/mise/settings.toml +++ /dev/null @@ -1,4 +0,0 @@ -#:schema https://mise.jdx.dev/schema/settings.json -experimental = true -# Otherwise I cannot build the cffi module, see https://github.com/indygreg/python-build-standalone/issues/33 -python_compile = true diff --git a/create_arm64_vm.sh b/create_arm64_vm.sh new file mode 100644 index 00000000..4fb83d4e --- /dev/null +++ b/create_arm64_vm.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +incus launch images:ubuntu/24.04 v1 --vm -c limits.cpu=4 -c limits.memory=4GiB + +incus exec ubuntu-vm3 bash + +# adduser tmeijn + +apt update && apt upgrade +apt install ubuntu-desktop