From db9784f96de650052987b2395a5d624a72563bac Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Mon, 20 May 2024 18:31:54 +0000 Subject: [PATCH 01/19] feat(nvim): moar lsp server Add cuelsp, jsonls, and yamlls. --- patch/kickstart.nvim/updates.patch | 44 ++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/patch/kickstart.nvim/updates.patch b/patch/kickstart.nvim/updates.patch index d5f4279..7e0b155 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 88658ef..d9e96ee 100644 +index 88658ef..5887aaa 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -39,10 +39,11 @@ index 88658ef..d9e96ee 100644 -- [[ Basic Keymaps ]] -- See `:help vim.keymap.set()` -@@ -578,6 +586,18 @@ require('lazy').setup({ +@@ -578,6 +586,28 @@ require('lazy').setup({ -- tsserver = {}, -- ++ cuelsp = {}, + elixirls = { + elixirLS = { + dialyzerEnabled = true, @@ -55,10 +56,19 @@ index 88658ef..d9e96ee 100644 + helm_ls = {}, + html = { filetypes = { 'html', 'twig', 'hbs' } }, + htmx = {}, ++ jsonls = { ++ settings = { ++ json = { ++ -- schemas = { ++ -- ["https://raw.githubusercontent.com/woodpecker-ci/woodpecker/main/pipeline/frontend/yaml/linter/schema/schema.json"] = "renovate.json", ++ -- }, ++ }, ++ }, ++ }, lua_ls = { -- cmd = {...}, -- filetypes = { ...}, -@@ -592,6 +612,10 @@ require('lazy').setup({ +@@ -592,6 +622,32 @@ require('lazy').setup({ }, }, }, @@ -66,10 +76,32 @@ index 88658ef..d9e96ee 100644 + templ = {}, + terraformls = {}, + tsserver = {}, ++ yamlls = { ++ settings = { ++ yaml = { ++ schemas = { ++ ["https://json.schemastore.org/chart.json"] = "Chart.{yml,yaml}", ++ ["https://json.schemastore.org/drone.json"] = ".drone.{yml,yaml}", ++ ["https://json.schemastore.org/github-action.json"] = ".github/action.{yml,yaml}", ++ ["https://json.schemastore.org/github-workflow.json"] = ".github/workflows/*", ++ ["https://json.schemastore.org/kustomization.json"] = "kustomization.{yml,yaml}", ++ ["https://json.schemastore.org/prettierrc.json"] = ".prettierrc.{yml,yaml}", ++ ["https://json.schemastore.org/circleciconfig.json"] = ".circleci/config.{yml,yaml}", ++ ["https://json.schemastore.org/dependabot-v2"] = ".github/dependabot.{yml,yaml}", ++ ["https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json"] = "*api*.{yml,yaml}", ++ ["https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible.json#/$defs/playbook"] = "*play*.{yml,yaml}", ++ ["https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible.json#/$defs/tasks"] = "roles/tasks/*.{yml,yaml}", ++ ["https://raw.githubusercontent.com/argoproj/argo-workflows/master/api/jsonschema/schema.json"] = "*flow*.{yml,yaml}", ++ ["https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json"] = "*docker-compose*.{yml,yaml}", ++ -- kubernetes = "*.{yml,yaml}", ++ } ++ } ++ } ++ } } -- Ensure the servers and tools above are installed -@@ -618,6 +642,33 @@ require('lazy').setup({ +@@ -618,6 +674,33 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for tsserver) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) @@ -103,7 +135,7 @@ index 88658ef..d9e96ee 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -835,7 +886,38 @@ require('lazy').setup({ +@@ -835,7 +918,38 @@ require('lazy').setup({ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', opts = { @@ -143,7 +175,7 @@ index 88658ef..d9e96ee 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -874,18 +956,18 @@ require('lazy').setup({ +@@ -874,18 +988,18 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug', -- 2.47.2 From fed7f6ab5f35130361a7288c7b585f332bf56a17 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Tue, 28 May 2024 23:34:05 +0000 Subject: [PATCH 02/19] feat(nvim): update kickstart to latest commit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7da4054..3205bcd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -180,7 +180,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 b9bd02d55b77293291a38fac9abe46acad9ab91d \ + && git reset --hard 5aeddfdd5d0308506ec63b0e4f8de33e2a39355f \ && git apply /tmp/updates.patch \ && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \ && nvim --headless "+Lazy! sync" +qa -- 2.47.2 From c76b05e40006c3bdf4616ffe71cc7e9a8a02bdce Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Tue, 28 May 2024 23:35:43 +0000 Subject: [PATCH 03/19] feat: setup auto-completion for some commands --- scripts/docker-entrypoint.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index e296ee2..184a5c0 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -# NOTE (jpd): setup elixir-ls for older versions of elixir +# NOTE: (jpd) setup elixir-ls for older versions of elixir if [ ! -d ${LOCAL_SRC_HOME}/elixir-ls/release ]; then echo "setup elixir ls version 0.12.0" /usr/local/bin/elixir-ls-setup v0.12.0 @@ -9,4 +9,22 @@ if [ ! -d ${LOCAL_SRC_HOME}/elixir-ls/release ]; then /usr/local/bin/elixir-ls-setup v0.14.6 fi +# NOTE: (jpd) create auto-completion +if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/kubectl.fish ]; then + echo "setup kubectl completion" + kubectl completion fish > ${XDG_CONFIG_HOME}/fish/completions/kubectl.fish +fi +if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/kind.fish ]; then + echo "setup kind completion" + kind completion fish > ${XDG_CONFIG_HOME}/fish/completions/kind.fish +fi +if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/k3d.fish ]; then + echo "setup k3d completion" + k3d completion fish > ${XDG_CONFIG_HOME}/fish/completions/k3d.fish +fi +if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/helm.fish ]; then + echo "setup helm completion" + helm completion fish > ${XDG_CONFIG_HOME}/fish/completions/helm.fish +fi + exec "$@" -- 2.47.2 From 3889f308cd8eb39527d86b0329bfa7c8391ccfba Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sat, 1 Jun 2024 17:33:43 +0000 Subject: [PATCH 04/19] feat(mise): bump elixir and erlang * elixir from 1.16.2 to 1.17.0-rc.0 * erlang from 26.2.5 to 27.0 --- config/mise/config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/mise/config.toml b/config/mise/config.toml index 7d77322..70d56f2 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -4,8 +4,8 @@ bat = "0.24.0" bitwarden = "2024.4.1" circleci-cli = "0.1.30549" dagger = "0.11.4" -elixir = "1.16.2-otp-26" -erlang = "26.2.5" +elixir = "1.17.0-rc.0-otp-27" +erlang = "27.0" eza = "0.18.15" fzf = "0.52.1" go = "1.22.3" -- 2.47.2 From 3b2c6c6c6ac2a417419448a0504c5bb102e990b5 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sat, 1 Jun 2024 17:56:42 +0000 Subject: [PATCH 05/19] feat(mise): add ctlptl [`ctlptl`][0] is [`tilt`][1]'s tool to create and manage local k8s clusters. [0]: https://github.com/tilt-dev/ctlptl [1]: https://tilt.dev/ --- config/mise/config.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/mise/config.toml b/config/mise/config.toml index 70d56f2..4024aab 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -3,6 +3,7 @@ awscli = "2.15.49" bat = "0.24.0" bitwarden = "2024.4.1" circleci-cli = "0.1.30549" +ctlptl = "0.8.29" dagger = "0.11.4" elixir = "1.17.0-rc.0-otp-27" erlang = "27.0" -- 2.47.2 From eeadcd21546faf27e880d674b347aa37888e9019 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sat, 1 Jun 2024 18:07:10 +0000 Subject: [PATCH 06/19] chore(fish): add ctlptl completion --- scripts/docker-entrypoint.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 184a5c0..4eb73ab 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -26,5 +26,9 @@ if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/helm.fish ]; then echo "setup helm completion" helm completion fish > ${XDG_CONFIG_HOME}/fish/completions/helm.fish fi +if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/ctlptl.fish ]; then + echo "setup ctlptl completion" + ctlptl completion fish > ~/.config/fish/completions/ctlptl.fish +fi exec "$@" -- 2.47.2 From 39c4c9bf2d51a1942c545a4dda943fe0853581a0 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sat, 1 Jun 2024 18:58:11 +0000 Subject: [PATCH 07/19] chore: add ctlptl in docker image --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3205bcd..2fd1829 100644 --- a/Dockerfile +++ b/Dockerfile @@ -191,6 +191,7 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \ bat \ bitwarden \ circleci-cli \ + ctlptl \ dagger \ elixir \ erlang \ -- 2.47.2 From f2d96625d0c82eb1fa4103a919f347748f62d8d2 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Mon, 3 Jun 2024 11:02:31 +0000 Subject: [PATCH 08/19] feat(mise): add r statistical program Also, add proper language server in neovim. --- Dockerfile | 1 + config/mise/config.toml | 1 + patch/kickstart.nvim/updates.patch | 11 ++++++----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2fd1829..398ec74 100644 --- a/Dockerfile +++ b/Dockerfile @@ -208,6 +208,7 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \ lua \ luajit \ poetry \ + r \ ripgrep \ rust \ starship \ diff --git a/config/mise/config.toml b/config/mise/config.toml index 4024aab..e4481d4 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -23,6 +23,7 @@ luajit = "2.0.5--2.4.4" node = "22.1.0" poetry = "1.8.3" python = "3.12.3" +r = "4.4.0" ripgrep = "14.1.0" rust = "1.78.0" starship = "1.18.2" diff --git a/patch/kickstart.nvim/updates.patch b/patch/kickstart.nvim/updates.patch index 7e0b155..2caf53d 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 88658ef..5887aaa 100644 +index 88658ef..b2e4e40 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' @@ -68,11 +68,12 @@ index 88658ef..5887aaa 100644 lua_ls = { -- cmd = {...}, -- filetypes = { ...}, -@@ -592,6 +622,32 @@ require('lazy').setup({ +@@ -592,6 +622,33 @@ require('lazy').setup({ }, }, }, + pyright = {}, ++ r_language_server = {}, + templ = {}, + terraformls = {}, + tsserver = {}, @@ -101,7 +102,7 @@ index 88658ef..5887aaa 100644 } -- Ensure the servers and tools above are installed -@@ -618,6 +674,33 @@ require('lazy').setup({ +@@ -618,6 +675,33 @@ require('lazy').setup({ -- by the server configuration above. Useful when disabling -- certain features of an LSP (for example, turning off formatting for tsserver) server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) @@ -135,7 +136,7 @@ index 88658ef..5887aaa 100644 require('lspconfig')[server_name].setup(server) end, }, -@@ -835,7 +918,38 @@ require('lazy').setup({ +@@ -835,7 +919,38 @@ require('lazy').setup({ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate', opts = { @@ -175,7 +176,7 @@ index 88658ef..5887aaa 100644 -- Autoinstall languages that are not installed auto_install = true, highlight = { -@@ -874,18 +988,18 @@ require('lazy').setup({ +@@ -874,18 +989,18 @@ require('lazy').setup({ -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- -- require 'kickstart.plugins.debug', -- 2.47.2 From ff011f2d66e14296c3e177ad048b97c165dbc0ae Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Wed, 5 Jun 2024 12:47:07 +0000 Subject: [PATCH 09/19] feat(mise): add eksctl to control eks cluster --- Dockerfile | 1 + config/mise/config.toml | 1 + scripts/docker-entrypoint.sh | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 398ec74..e8ecebd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -193,6 +193,7 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \ circleci-cli \ ctlptl \ dagger \ + eksctl \ elixir \ erlang \ eza \ diff --git a/config/mise/config.toml b/config/mise/config.toml index e4481d4..c5628cc 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -5,6 +5,7 @@ bitwarden = "2024.4.1" circleci-cli = "0.1.30549" ctlptl = "0.8.29" dagger = "0.11.4" +eksctl = "0.180.0" elixir = "1.17.0-rc.0-otp-27" erlang = "27.0" eza = "0.18.15" diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 4eb73ab..7273cb2 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -10,6 +10,7 @@ if [ ! -d ${LOCAL_SRC_HOME}/elixir-ls/release ]; then fi # NOTE: (jpd) create auto-completion +# TODO: (jpd) check a way to create a list and loop to create these completions if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/kubectl.fish ]; then echo "setup kubectl completion" kubectl completion fish > ${XDG_CONFIG_HOME}/fish/completions/kubectl.fish @@ -30,5 +31,9 @@ if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/ctlptl.fish ]; then echo "setup ctlptl completion" ctlptl completion fish > ~/.config/fish/completions/ctlptl.fish fi +if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/eksctl.fish ]; then + echo "setup eksctl completion" + eksctl completion fish > ~/.config/fish/completions/eksctl.fish +fi exec "$@" -- 2.47.2 From b3389e1034cbadbb620400acef5d48f97c09546d Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Wed, 5 Jun 2024 13:55:34 +0000 Subject: [PATCH 10/19] chore(fish): alias for kubectl and docker compose --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e8ecebd..abdd481 100644 --- a/Dockerfile +++ b/Dockerfile @@ -173,7 +173,9 @@ RUN fish -c true \ && echo 'alias cat="bat"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ && echo 'alias l="eza --time-style=long-iso --color=auto --classify=always"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ && echo 'alias ll="l -ahl"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ - && echo 'alias la="l -a"' >> ${XDG_CONFIG_HOME}/fish/config.fish + && echo 'alias la="l -a"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ + && echo 'alias k="kubectl"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ + && echo 'alias dc="docker compose"' >> ${XDG_CONFIG_HOME}/fish/config.fish # git configuration COPY ./patch/kickstart.nvim/updates.patch /tmp -- 2.47.2 From 730775a94793e3c8c023ab60a96465e6c6574e1a Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sat, 15 Jun 2024 14:37:09 +0000 Subject: [PATCH 11/19] feat: upgrade atuin instalation --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index abdd481..f1c2984 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,7 +112,6 @@ ENV DC_URL https://github.com/docker/compose/releases/download/${DC_VERSION}/doc ENV BX_VERSION v0.13.1 ENV BX_URL https://github.com/docker/buildx/releases/download/${BX_VERSION}/buildx-${BX_VERSION}.linux-amd64 RUN curl -sS https://starship.rs/install.sh | sh -s -- --yes \ - && curl -sS https://setup.atuin.sh | bash \ && mkdir /tmp/download \ && curl -L ${DO_URL} | tar -zx -C /tmp/download \ && chgrp --recursive docker /tmp/download \ @@ -162,6 +161,8 @@ RUN git clone https://github.com/elixir-lsp/elixir-ls.git ${LOCAL_SRC_HOME}/elix ENV MISE_ENV_FILE .env RUN curl https://mise.jdx.dev/install.sh | sh \ && curl -sS https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | bash \ + && curl -sS https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh | bash \ + && curl -sS https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh | bash \ && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm # configure fish and bash -- 2.47.2 From a2f0163c51f1bd3724152711a1569a522ae20e48 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sat, 15 Jun 2024 14:42:47 +0000 Subject: [PATCH 12/19] feat: completion for k9s and lefthook --- scripts/docker-entrypoint.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 7273cb2..7f8ea70 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -35,5 +35,13 @@ if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/eksctl.fish ]; then echo "setup eksctl completion" eksctl completion fish > ~/.config/fish/completions/eksctl.fish fi +if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/k9s.fish ]; then + echo "setup k9s completion" + k9s completion fish > ~/.config/fish/completions/k9s.fish +fi +if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/lefthook.fish ]; then + echo "setup lefthook completion" + lefthook completion fish > ~/.config/fish/completions/lefthook.fish +fi exec "$@" -- 2.47.2 From f9f0934339981609c0bbf9e99cc00c547b33b7e2 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sat, 15 Jun 2024 14:56:09 +0000 Subject: [PATCH 13/19] fix: remove duplicated atuin install --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f1c2984..62c1350 100644 --- a/Dockerfile +++ b/Dockerfile @@ -162,7 +162,6 @@ ENV MISE_ENV_FILE .env RUN curl https://mise.jdx.dev/install.sh | sh \ && curl -sS https://raw.githubusercontent.com/ajeetdsouza/zoxide/main/install.sh | bash \ && curl -sS https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh | bash \ - && curl -sS https://raw.githubusercontent.com/atuinsh/atuin/main/install.sh | bash \ && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm # configure fish and bash -- 2.47.2 From aacef103a3287b93c4c898480100de8362e0fc21 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 16 Jun 2024 12:24:54 +0000 Subject: [PATCH 14/19] chore: improve completion setup --- scripts/docker-entrypoint.sh | 51 +++++++++++++----------------------- 1 file changed, 18 insertions(+), 33 deletions(-) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 7f8ea70..1a082bd 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -10,38 +10,23 @@ if [ ! -d ${LOCAL_SRC_HOME}/elixir-ls/release ]; then fi # NOTE: (jpd) create auto-completion -# TODO: (jpd) check a way to create a list and loop to create these completions -if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/kubectl.fish ]; then - echo "setup kubectl completion" - kubectl completion fish > ${XDG_CONFIG_HOME}/fish/completions/kubectl.fish -fi -if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/kind.fish ]; then - echo "setup kind completion" - kind completion fish > ${XDG_CONFIG_HOME}/fish/completions/kind.fish -fi -if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/k3d.fish ]; then - echo "setup k3d completion" - k3d completion fish > ${XDG_CONFIG_HOME}/fish/completions/k3d.fish -fi -if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/helm.fish ]; then - echo "setup helm completion" - helm completion fish > ${XDG_CONFIG_HOME}/fish/completions/helm.fish -fi -if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/ctlptl.fish ]; then - echo "setup ctlptl completion" - ctlptl completion fish > ~/.config/fish/completions/ctlptl.fish -fi -if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/eksctl.fish ]; then - echo "setup eksctl completion" - eksctl completion fish > ~/.config/fish/completions/eksctl.fish -fi -if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/k9s.fish ]; then - echo "setup k9s completion" - k9s completion fish > ~/.config/fish/completions/k9s.fish -fi -if [ ! -d ${XDG_CONFIG_HOME}/fish/completions/lefthook.fish ]; then - echo "setup lefthook completion" - lefthook completion fish > ~/.config/fish/completions/lefthook.fish -fi +commands=( + "ctlptl" + "eksctl" + "helm" + "k3d" + "k9s" + "kind" + "kubectl" + "lefthook" +) +echo "create completion for ${commands[@]}" +for cmd in ${commands[@]}; do + completion_dir=${XDG_CONFIG_HOME}/fish/completions/${cmd}.fish + if [ ! -f ${completion_dir} ]; then + echo "setup ${cmd} completion" + echo $(${cmd} completion fish) > ${completion_dir} + fi +done exec "$@" -- 2.47.2 From 597bb2a6f18230c1c2e7c34d62c840124f1b423d Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 16 Jun 2024 12:52:41 +0000 Subject: [PATCH 15/19] feat(mise): upgrade elixir --- 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 c5628cc..f7ec974 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -6,7 +6,7 @@ circleci-cli = "0.1.30549" ctlptl = "0.8.29" dagger = "0.11.4" eksctl = "0.180.0" -elixir = "1.17.0-rc.0-otp-27" +elixir = "1.17.0-otp-27" erlang = "27.0" eza = "0.18.15" fzf = "0.52.1" -- 2.47.2 From 7194feb07edf547208992b9c6525299032eeaa37 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 16 Jun 2024 12:55:58 +0000 Subject: [PATCH 16/19] feat(mise): add usage This is needed to make `mise` completion. --- Dockerfile | 1 + config/mise/config.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 62c1350..2740992 100644 --- a/Dockerfile +++ b/Dockerfile @@ -219,6 +219,7 @@ RUN ${LOCAL_BIN_HOME}/mise plugins install --force --yes \ terraform \ tilt \ tmux \ + usage \ usql \ yarn \ zoxide diff --git a/config/mise/config.toml b/config/mise/config.toml index f7ec974..e819654 100644 --- a/config/mise/config.toml +++ b/config/mise/config.toml @@ -32,6 +32,7 @@ task = "3.37.2" terraform = "1.8.3" tilt = "0.33.13" tmux = "3.4" +usage = "0.3.0" usql = "0.19.1" yarn = "1.22.19" zoxide = "0.9.4" -- 2.47.2 From 0394198843dbaeb1af77e47b6acb6cb3d2ff5749 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 16 Jun 2024 12:59:52 +0000 Subject: [PATCH 17/19] feat: add completion for mise --- scripts/docker-entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index 1a082bd..f7e734c 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -19,6 +19,7 @@ commands=( "kind" "kubectl" "lefthook" + "mise" ) echo "create completion for ${commands[@]}" for cmd in ${commands[@]}; do -- 2.47.2 From 983b666ba27442504c9ddc99f8edce5f27278530 Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 16 Jun 2024 18:14:20 +0000 Subject: [PATCH 18/19] fix: ensure completions respect line breaks --- scripts/docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index f7e734c..7b209c6 100755 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -26,7 +26,7 @@ for cmd in ${commands[@]}; do completion_dir=${XDG_CONFIG_HOME}/fish/completions/${cmd}.fish if [ ! -f ${completion_dir} ]; then echo "setup ${cmd} completion" - echo $(${cmd} completion fish) > ${completion_dir} + $(echo ${cmd} completion fish) > ${completion_dir} fi done -- 2.47.2 From ea5e211cf40db61a3617b125a3d5b9e0283027fb Mon Sep 17 00:00:00 2001 From: Joao P Dubas Date: Sun, 16 Jun 2024 18:14:46 +0000 Subject: [PATCH 19/19] feat: add nvim server listening alias --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2740992..5fc756a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -175,7 +175,8 @@ RUN fish -c true \ && echo 'alias ll="l -ahl"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ && echo 'alias la="l -a"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ && echo 'alias k="kubectl"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ - && echo 'alias dc="docker compose"' >> ${XDG_CONFIG_HOME}/fish/config.fish + && echo 'alias dc="docker compose"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ + && echo 'alias nh="nvim --listen 0.0.0.0:6666 --headless &> /dev/null' >> ${XDG_CONFIG_HOME}/fish/config.fish # git configuration COPY ./patch/kickstart.nvim/updates.patch /tmp -- 2.47.2