From bc8debfd231585a83f70845cf8a158844d7aaa5b Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Tue, 21 Jan 2025 15:27:06 +0000 Subject: [PATCH 01/13] feat(neovim): upgrade kickstart to latest commit (#159) Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/159 Co-authored-by: Joao P Dubas Co-committed-by: Joao P Dubas --- Dockerfile | 2 +- patch/kickstart.nvim/updates.patch | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0071db8..6484d53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -185,7 +185,7 @@ COPY ./patch/kickstart.nvim/updates.patch /tmp COPY ./config/nvim/lua/custom/plugins/init.lua /tmp RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \ && cd ${XDG_CONFIG_HOME}/nvim \ - && git reset --hard 8d1ef972bc32faa86fee21a57f9033b41f612ebb \ + && git reset --hard 5bdde24dfb353d365d908c5dd700f412ed2ffb17 \ && git apply /tmp/updates.patch \ && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \ && nvim --headless "+Lazy! sync" +qa diff --git a/patch/kickstart.nvim/updates.patch b/patch/kickstart.nvim/updates.patch index 2fe1aaa..8151cd0 100644 --- a/patch/kickstart.nvim/updates.patch +++ b/patch/kickstart.nvim/updates.patch @@ -1,5 +1,5 @@ diff --git a/init.lua b/init.lua -index 08717d5..96c1e03 100644 +index 4eae8e7..ab4f5f6 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -24,7 +24,7 @@ index 08717d5..96c1e03 100644 -- Don't show the mode, since it's already in the status line vim.opt.showmode = false -@@ -157,6 +157,14 @@ vim.opt.cursorline = true +@@ -156,6 +156,14 @@ vim.opt.cursorline = true -- Minimal number of screen lines to keep above and below the cursor. vim.opt.scrolloff = 10 @@ -39,7 +39,7 @@ index 08717d5..96c1e03 100644 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -@@ -628,6 +636,27 @@ require('lazy').setup({ +@@ -629,6 +637,27 @@ require('lazy').setup({ -- ts_ls = {}, -- @@ -65,9 +65,9 @@ index 08717d5..96c1e03 100644 + }, + }, lua_ls = { - -- cmd = {...}, - -- filetypes = { ...}, -@@ -642,6 +671,32 @@ require('lazy').setup({ + -- cmd = { ... }, + -- filetypes = { ... }, +@@ -643,6 +672,32 @@ require('lazy').setup({ }, }, }, @@ -100,7 +100,7 @@ index 08717d5..96c1e03 100644 } -- Ensure the servers and tools above are installed -@@ -668,6 +723,33 @@ require('lazy').setup({ +@@ -672,6 +727,33 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for ts_ls) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) @@ -134,7 +134,7 @@ index 08717d5..96c1e03 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -898,7 +980,39 @@ require('lazy').setup({ +@@ -902,7 +984,39 @@ require('lazy').setup({ main = 'nvim-treesitter.configs', -- Sets main module to use for opts -- [[ Configure Treesitter ]] See `:help nvim-treesitter` opts = { @@ -175,7 +175,7 @@ index 08717d5..96c1e03 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -928,17 +1042,17 @@ require('lazy').setup({ +@@ -932,17 +1046,17 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug', From 3a0e07aed5d253ddd44ca4631b4f608200ce8451 Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 23 Jan 2025 11:29:47 +0000 Subject: [PATCH 02/13] chore(deps): update dependency awscli to v2.23.4 (#158) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [awscli](https://github.com/aws/aws-cli) | patch | `2.23.1` -> `2.23.4` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/158 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index 54847cf..d8e4171 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -1,6 +1,6 @@ [tools] age = "1.2.1" -awscli = "2.23.1" +awscli = "2.23.4" bat = "0.25.0" bitwarden = "2025.1.0" circleci-cli = "0.1.31151" From 4c41f58fd567a22909e02b181b4c15d4d458d2ed Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 23 Jan 2025 11:30:18 +0000 Subject: [PATCH 03/13] chore(deps): update dependency node to v22.13.1 (#160) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [node](https://nodejs.org) ([source](https://github.com/nodejs/node)) | patch | `22.13.0` -> `22.13.1` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/160 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index d8e4171..60c06b8 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -23,7 +23,7 @@ kubie = "0.24.1" lefthook = "1.10.7" lua = "5.4.7" luajit = "2.0.5" -node = "22.13.0" +node = "22.13.1" poetry = "2.0.1" python = "3.13.1" r = "4.4.2" From d35553d4a16399111360d8283095a9cc1f22594f Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 23 Jan 2025 11:31:06 +0000 Subject: [PATCH 04/13] chore(deps): update dependency elixir to v1.18.2 (#161) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [elixir](https://elixir-lang.org/) ([source](https://github.com/elixir-lang/elixir)) | patch | `1.18.1` -> `1.18.2` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/161 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index 60c06b8..6e98915 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -7,7 +7,7 @@ circleci-cli = "0.1.31151" ctlptl = "0.8.37" dagger = "0.15.2" eksctl = "0.201.0" -elixir = "1.18.1" +elixir = "1.18.2" erlang = "27.2" eza = "0.20.16" fzf = "0.57.0" From 3104f74ee65399a279d5f03699e7ac7a330a8ef7 Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 23 Jan 2025 11:31:38 +0000 Subject: [PATCH 05/13] chore(deps): update dependency terraform to v1.10.5 (#162) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [terraform](https://github.com/hashicorp/terraform) | patch | `1.10.4` -> `1.10.5` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/162 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index 6e98915..b3c13f4 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -31,7 +31,7 @@ ripgrep = "14.1.1" rust = "1.84.0" starship = "1.22.1" task = "3.40.1" -terraform = "1.10.4" +terraform = "1.10.5" tilt = "0.33.22" usage = "2.0.3" usql = "0.19.12" From 167b6291f3c547ccb119cb3f776cab3099f47e4f Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 23 Jan 2025 18:14:36 +0000 Subject: [PATCH 06/13] chore(deps): update dependency erlang to v27.2.1 (#163) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [erlang](https://github.com/erlang/otp) | patch | `27.2` -> `27.2.1` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/163 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index b3c13f4..0ab0327 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -8,7 +8,7 @@ ctlptl = "0.8.37" dagger = "0.15.2" eksctl = "0.201.0" elixir = "1.18.2" -erlang = "27.2" +erlang = "27.2.1" eza = "0.20.16" fzf = "0.57.0" github-cli = "2.65.0" From e1735c2fe29762619c584edd6fd340d27f43fcb3 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 26 Jan 2025 16:55:50 +0000 Subject: [PATCH 07/13] feat(mise): use aqua as main registry/backend (#165) Also: * Remove unused plugins * Update plugins to their latest versions Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/165 Co-authored-by: Joao P Dubas Co-committed-by: Joao P Dubas --- Dockerfile | 28 +-------------------- config/mise/config.toml | 54 +++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 53 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6484d53..55c9b2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -192,38 +192,12 @@ RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME} # install mise plugins RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \ - age \ - awscli \ - bat \ - bitwarden \ - circleci-cli \ - ctlptl \ - dagger \ - eksctl \ - eza \ - fzf \ - github-cli \ - helm \ - k3d \ - k3sup \ - k9s \ - kind \ - kubectl \ - kubie \ - lefthook \ lua \ luajit \ poetry \ r \ - ripgrep \ - starship \ - task \ - terraform \ - tilt \ usage \ - usql \ - yarn \ - zoxide + yarn # configure git ARG GIT_USER_EMAIL diff --git a/config/mise/config.toml b/config/mise/config.toml index 0ab0327..14506f0 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -1,43 +1,45 @@ [tools] -age = "1.2.1" -awscli = "2.23.4" -bat = "0.25.0" -bitwarden = "2025.1.0" -circleci-cli = "0.1.31151" -ctlptl = "0.8.37" -dagger = "0.15.2" -eksctl = "0.201.0" +"aqua:BurntSushi/ripgrep" = "14.1.1" +"aqua:CircleCI-Public/circleci-cli" = "0.1.31425" +"aqua:FiloSottile/age" = "1.2.1" +"aqua:ajeetdsouza/zoxide" = "0.9.6" +"aqua:alexellis/k3sup" = "0.13.8" +"aqua:aws/aws-cli" = "2.23.6" +"aqua:bitwarden/clients" = "cli-v2025.1.2" +"aqua:dagger/dagger" = "0.15.2" +"aqua:derailed/k9s" = "0.32.7" +"aqua:eksctl-io/eksctl" = "0.202.0" +"aqua:evilmartians/lefthook" = "1.10.10" +"aqua:eza-community/eza" = "0.20.18" +"aqua:github-cli" = "2.65.0" +"aqua:go-task/task" = "3.41.0" +"aqua:hashicorp/terraform" = "1.10.5" +"aqua:helm/helm" = "3.17.0" +"aqua:junegunn/fzf" = "0.58.0" +"aqua:k3d-io/k3d" = "5.8.1" +"aqua:kubernetes-sigs/kind" = "0.26.0" +"aqua:kubernetes/kubectl" = "1.32.1" +"aqua:sbstp/kubie" = "0.24.1" +"aqua:sharkdp/bat" = "0.25.0" +"aqua:starship/starship" = "1.22.1" +"aqua:tilt-dev/ctlptl" = "0.8.38" +"aqua:tilt-dev/tilt" = "0.33.22" +"aqua:xo/usql" = "0.19.16" elixir = "1.18.2" erlang = "27.2.1" -eza = "0.20.16" -fzf = "0.57.0" -github-cli = "2.65.0" go = "1.23.5" -helm = "3.17.0" -k3d = "5.7.5" -k3sup = "0.13.7" -k9s = "0.32.7" -kind = "0.26.0" -kubectl = "1.32.1" -kubie = "0.24.1" -lefthook = "1.10.7" lua = "5.4.7" luajit = "2.0.5" node = "22.13.1" poetry = "2.0.1" python = "3.13.1" r = "4.4.2" -ripgrep = "14.1.1" rust = "1.84.0" -starship = "1.22.1" -task = "3.40.1" -terraform = "1.10.5" -tilt = "0.33.22" usage = "2.0.3" -usql = "0.19.12" yarn = "1.22.22" -zoxide = "0.9.6" [settings] experimental = true python_compile = true + +[env] From a494747ebd731f63d9e1e291c6f03e30d2cb6251 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Tue, 28 Jan 2025 00:50:33 +0000 Subject: [PATCH 08/13] feat(mise): add aider AI pair programmer (#166) Add [`aider`](https://aider.chat/), an AI pair programmer available in the terminal. To simplify the installation, `uv` has been added so it can be used instead of `pipx`. In addition, the `usage` utility is now installed using the `ubi` registry. Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/166 Co-authored-by: Joao P Dubas Co-committed-by: Joao P Dubas --- Dockerfile | 1 - config/mise/config.toml | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55c9b2b..6ed2f69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -196,7 +196,6 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \ luajit \ poetry \ r \ - usage \ yarn # configure git diff --git a/config/mise/config.toml b/config/mise/config.toml index 14506f0..3df7467 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -4,6 +4,7 @@ "aqua:FiloSottile/age" = "1.2.1" "aqua:ajeetdsouza/zoxide" = "0.9.6" "aqua:alexellis/k3sup" = "0.13.8" +"aqua:astral-sh/uv" = "0.5.24" "aqua:aws/aws-cli" = "2.23.6" "aqua:bitwarden/clients" = "cli-v2025.1.2" "aqua:dagger/dagger" = "0.15.2" @@ -25,6 +26,8 @@ "aqua:tilt-dev/ctlptl" = "0.8.38" "aqua:tilt-dev/tilt" = "0.33.22" "aqua:xo/usql" = "0.19.16" +"pipx:aider-chat" = { version = "0.72.3", uvx_args = "--python 3.12.7" } +"ubi:jdx/usage" = "2.0.3" elixir = "1.18.2" erlang = "27.2.1" go = "1.23.5" @@ -35,7 +38,6 @@ poetry = "2.0.1" python = "3.13.1" r = "4.4.2" rust = "1.84.0" -usage = "2.0.3" yarn = "1.22.22" [settings] From 60db6ab1acb47b94b078783a9746cbe74bf29211 Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 30 Jan 2025 20:16:46 +0000 Subject: [PATCH 09/13] chore(deps): update dependency rust to v1.84.1 (#167) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [rust](https://github.com/rust-lang/rust) | patch | `1.84.0` -> `1.84.1` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/167 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index 3df7467..138fda9 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -37,7 +37,7 @@ node = "22.13.1" poetry = "2.0.1" python = "3.13.1" r = "4.4.2" -rust = "1.84.0" +rust = "1.84.1" yarn = "1.22.22" [settings] From 3064826655a3db0452abe2a4b40d78d31f1359fc Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Fri, 31 Jan 2025 10:47:07 +0000 Subject: [PATCH 10/13] feat(mise): upgrade utilities (#168) * `aqua:astral-sh/uv` from 0.5.24 to 0.5.25 * `aqua:aws/aws-cli` from 2.23.6 to 2.23.9 * `aqua:dagger/dagger` from 0.15.2 to 0.15.3 * `aqua:eza-community/eza` from 0.20.18 to 0.20.19 * `aqua:github-cli` from 2.65.0 to 2.66.0 Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/168 Co-authored-by: Joao P Dubas Co-committed-by: Joao P Dubas --- config/mise/config.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index 138fda9..e3ec333 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -4,15 +4,15 @@ "aqua:FiloSottile/age" = "1.2.1" "aqua:ajeetdsouza/zoxide" = "0.9.6" "aqua:alexellis/k3sup" = "0.13.8" -"aqua:astral-sh/uv" = "0.5.24" -"aqua:aws/aws-cli" = "2.23.6" +"aqua:astral-sh/uv" = "0.5.25" +"aqua:aws/aws-cli" = "2.23.9" "aqua:bitwarden/clients" = "cli-v2025.1.2" -"aqua:dagger/dagger" = "0.15.2" +"aqua:dagger/dagger" = "0.15.3" "aqua:derailed/k9s" = "0.32.7" "aqua:eksctl-io/eksctl" = "0.202.0" "aqua:evilmartians/lefthook" = "1.10.10" -"aqua:eza-community/eza" = "0.20.18" -"aqua:github-cli" = "2.65.0" +"aqua:eza-community/eza" = "0.20.19" +"aqua:github-cli" = "2.66.0" "aqua:go-task/task" = "3.41.0" "aqua:hashicorp/terraform" = "1.10.5" "aqua:helm/helm" = "3.17.0" From 0f606dbbf21889869ab9a3f485aa98718c9f7c35 Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 6 Feb 2025 17:53:04 +0000 Subject: [PATCH 11/13] chore(deps): update dependency go to v1.23.6 (#169) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [go](https://github.com/golang/go) | patch | `1.23.5` -> `1.23.6` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/169 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index e3ec333..8752412 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -30,7 +30,7 @@ "ubi:jdx/usage" = "2.0.3" elixir = "1.18.2" erlang = "27.2.1" -go = "1.23.5" +go = "1.23.6" lua = "5.4.7" luajit = "2.0.5" node = "22.13.1" From 1524ee9d480144db983b6dcffbc44ff8e5e6db43 Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 6 Feb 2025 17:54:53 +0000 Subject: [PATCH 12/13] chore(deps): update dependency python to v3.13.2 (#170) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [python](https://github.com/python/cpython) | patch | `3.13.1` -> `3.13.2` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/170 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index 8752412..503e22a 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -35,7 +35,7 @@ lua = "5.4.7" luajit = "2.0.5" node = "22.13.1" poetry = "2.0.1" -python = "3.13.1" +python = "3.13.2" r = "4.4.2" rust = "1.84.1" yarn = "1.22.22" From 7e8156b566b1c6ad3a42075ed9f85f73b8981e5b Mon Sep 17 00:00:00 2001 From: renovate-bot Date: Thu, 6 Feb 2025 18:42:05 +0000 Subject: [PATCH 13/13] chore(deps): update dependency erlang to v27.2.2 (#171) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [erlang](https://github.com/erlang/otp) | patch | `27.2.1` -> `27.2.2` | --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). Reviewed-on: https://gitea.dubas.dev/joao.dubas/ide/pulls/171 Co-authored-by: renovate-bot Co-committed-by: renovate-bot --- config/mise/config.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index 503e22a..230f090 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -29,7 +29,7 @@ "pipx:aider-chat" = { version = "0.72.3", uvx_args = "--python 3.12.7" } "ubi:jdx/usage" = "2.0.3" elixir = "1.18.2" -erlang = "27.2.1" +erlang = "27.2.2" go = "1.23.6" lua = "5.4.7" luajit = "2.0.5"