chore: upgrade system runtimes and clis(#17)

The following runtimes and cli's were upgraded:

* `awscli` from 2.13.30 to 2.13.38
* `go` from 1.21.3 to 1.21.4
* `helm` from 3.13.1 to 3.13.2
* `kubectl` from 1.27.7 to 1.28.4
* `lefthook` from 1.5.2 to 1.5.3
* `node` from 21.1.0 to 21.2.0
* `poetry` from 1.6.1 to 1.7.1
* `terraform` from 1.6.2 to 1.6.4
* `kickstart.nvim` to the latest version

Also, some additions were made:

* [`tilt`][0] to make it easier to handle multiple services.
* Map key to open terminal vertically in `neovim`
* Aliases to commands in `fish`

[0]: https://tilt.dev

Co-authored-by: Joao P Dubas <joao.dubas@gmail.com>
Reviewed-on: #17
This commit is contained in:
João Paulo Dubas 2023-11-24 14:41:39 +00:00
parent 6c1a8e92bc
commit 0800fe0c4c
4 changed files with 28 additions and 20 deletions

View File

@ -144,7 +144,7 @@ COPY ./patch/kickstart.nvim/updates.patch /tmp
COPY ./config/nvim/lua/custom/plugins/init.lua /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 \ RUN git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME}"/nvim \
&& cd ${XDG_CONFIG_HOME}/nvim \ && cd ${XDG_CONFIG_HOME}/nvim \
&& git reset --hard a005f15cec8072c97201f86e15df62c7e4a4490e \ && git reset --hard 1915cea32e13fcb4191904de8f5e0252ad050a6e \
&& git apply /tmp/updates.patch \ && git apply /tmp/updates.patch \
&& cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \ && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
&& nvim --headless "+Lazy! sync" +qa && nvim --headless "+Lazy! sync" +qa
@ -154,9 +154,10 @@ RUN fish -c true \
&& echo 'starship init fish | source' >> ${XDG_CONFIG_HOME}/fish/config.fish \ && echo 'starship init fish | source' >> ${XDG_CONFIG_HOME}/fish/config.fish \
&& echo '{$XDG_DATA_HOME}/rtx/bin/rtx activate fish | source' >> ${XDG_CONFIG_HOME}/fish/config.fish \ && echo '{$XDG_DATA_HOME}/rtx/bin/rtx activate fish | source' >> ${XDG_CONFIG_HOME}/fish/config.fish \
&& echo 'zoxide init fish | source' >> ${XDG_CONFIG_HOME}/fish/config.fish \ && echo 'zoxide init fish | source' >> ${XDG_CONFIG_HOME}/fish/config.fish \
&& echo 'eval "$(starship init bash)"' >> ${HOME}/.bashrc \ && echo 'alias cat="bat"' >> ${XDG_CONFIG_HOME}/fish/config.fish ${XDG_CONFIG_HOME}/fish/config.fish \
&& echo 'eval "$(${XDG_DATA_HOME}/rtx/bin/rtx activate bash)"' >> ${HOME}/.bashrc \ && echo 'alias l="exa --time-style long-iso --color=auto -F"' >> ${XDG_CONFIG_HOME}/fish/config.fish \
&& echo 'eval "$(zoxide init bash)"' >> ${HOME}/.bashrc && echo 'alias ll="l -Fahl"' >> ${XDG_CONFIG_HOME}/fish/config.fish \
&& echo 'alias la="l -a"' >> ${XDG_CONFIG_HOME}/fish/config.fish \
# configure git # configure git
ARG GIT_USER_EMAIL ARG GIT_USER_EMAIL
@ -174,7 +175,8 @@ RUN ${XDG_DATA_HOME}/rtx/bin/rtx plugins install \
kubectl \ kubectl \
lefthook \ lefthook \
poetry \ poetry \
terraform terraform \
tilt
# NOTE (jpd): the section below exists mainly to handle a project running elixir 1.11. # NOTE (jpd): the section below exists mainly to handle a project running elixir 1.11.
# It allows the usage of openssl 1.1 and a compatible elixir-ls. # It allows the usage of openssl 1.1 and a compatible elixir-ls.

View File

@ -73,7 +73,7 @@ return {
{ {
'akinsho/toggleterm.nvim', 'akinsho/toggleterm.nvim',
opts = { opts = {
size = vim.o.lines * 0.3, size = vim.o.lines * 0.75,
open_mapping = [[<c-\>]], open_mapping = [[<c-\>]],
hide_numbers = true, hide_numbers = true,
shade_filetypes = { }, shade_filetypes = { },
@ -104,7 +104,8 @@ return {
end end
}) })
return { return {
{ '<leader>mh', '<cmd>ToggleTerm direction=horizontal size=' .. tostring(vim.o.lines * 0.4) .. '<cr>', desc = 'Open ter[m]inal [h]orizontally', noremap = true }, { '<leader>mh', '<cmd>ToggleTerm direction=horizontal size=' .. tostring(vim.o.lines * 0.75) .. '<cr>', desc = 'Open ter[m]inal [h]orizontally', noremap = true },
{ '<leader>mv', '<cmd>ToggleTerm direction=vertical size=' .. tostring(vim.o.columns * 0.5) .. '<cr>', desc = 'Open ter[m]inal [v]ertically', noremap = true },
{ '<leader>mc', '<cmd>ToggleTermSendCurrentLine<cr>', desc = 'Send [c]urrent line under the cursor', noremap = true } { '<leader>mc', '<cmd>ToggleTermSendCurrentLine<cr>', desc = 'Send [c]urrent line under the cursor', noremap = true }
} }
end end

View File

@ -1,15 +1,16 @@
[tools] [tools]
awscli = "2.13.30" awscli = "2.13.38"
elixir = "1.15.7-otp-26" elixir = "1.15.7-otp-26"
erlang = "26.1.2" erlang = "26.1.2"
go = "1.21.3" go = "1.21.4"
helm = "3.13.1" helm = "3.13.2"
kubectl = "1.27.7" kubectl = "1.28.4"
lefthook = "1.5.2" lefthook = "1.5.3"
node = "21.1.0" node = "21.2.0"
poetry = "1.6.1" poetry = "1.7.1"
python = "3.12.0" python = "3.12.0"
terraform = "1.6.2" terraform = "1.6.4"
tilt = "0.33.6"
[settings] [settings]
experimental = true experimental = true

View File

@ -1,5 +1,5 @@
diff --git a/init.lua b/init.lua diff --git a/init.lua b/init.lua
index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa24ebc240 100644 index 3a98da0..e8e41b4 100644
--- a/init.lua --- a/init.lua
+++ b/init.lua +++ b/init.lua
@@ -229,7 +229,7 @@ require('lazy').setup({ @@ -229,7 +229,7 @@ require('lazy').setup({
@ -42,7 +42,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa
-- [[ Basic Keymaps ]] -- [[ Basic Keymaps ]]
-- Keymaps for better default experience -- Keymaps for better default experience
@@ -378,11 +387,29 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = @@ -378,11 +387,33 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
vim.defer_fn(function() vim.defer_fn(function()
require('nvim-treesitter.configs').setup { require('nvim-treesitter.configs').setup {
-- Add languages to be installed here that you want installed for treesitter -- Add languages to be installed here that you want installed for treesitter
@ -54,6 +54,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa
+ 'eex', + 'eex',
+ 'elixir', + 'elixir',
+ 'erlang', + 'erlang',
+ 'gitcommit',
+ 'go', + 'go',
+ 'heex', + 'heex',
+ 'html', + 'html',
@ -62,12 +63,15 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa
+ 'json', + 'json',
+ 'lua', + 'lua',
+ 'markdown', + 'markdown',
+ 'markdown_inline',
+ 'python', + 'python',
+ 'sql', + 'sql',
+ 'toml',
+ 'tsx', + 'tsx',
+ 'typescript', + 'typescript',
+ 'vim', + 'vim',
+ 'vimdoc' + 'vimdoc',
+ 'yaml'
+ }, + },
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
auto_install = false, auto_install = false,
@ -75,7 +79,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa
highlight = { enable = true }, highlight = { enable = true },
indent = { enable = true }, indent = { enable = true },
incremental_selection = { incremental_selection = {
@@ -511,19 +538,24 @@ require('mason-lspconfig').setup() @@ -511,19 +542,24 @@ require('mason-lspconfig').setup()
-- If you want to override the default filetypes that your language server will attach to you can -- If you want to override the default filetypes that your language server will attach to you can
-- define the property 'filetypes' to the map in question. -- define the property 'filetypes' to the map in question.
local servers = { local servers = {
@ -107,7 +111,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa
} }
-- Setup neovim lua configuration -- Setup neovim lua configuration
@@ -542,12 +574,20 @@ mason_lspconfig.setup { @@ -542,12 +578,20 @@ mason_lspconfig.setup {
mason_lspconfig.setup_handlers { mason_lspconfig.setup_handlers {
function(server_name) function(server_name)