diff --git a/Dockerfile b/Dockerfile index d2acd84..be429d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -144,7 +144,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 a005f15cec8072c97201f86e15df62c7e4a4490e \ + && git reset --hard 1915cea32e13fcb4191904de8f5e0252ad050a6e \ && git apply /tmp/updates.patch \ && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \ && 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 '{$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 'eval "$(starship init bash)"' >> ${HOME}/.bashrc \ - && echo 'eval "$(${XDG_DATA_HOME}/rtx/bin/rtx activate bash)"' >> ${HOME}/.bashrc \ - && echo 'eval "$(zoxide init bash)"' >> ${HOME}/.bashrc + && echo 'alias cat="bat"' >> ${XDG_CONFIG_HOME}/fish/config.fish ${XDG_CONFIG_HOME}/fish/config.fish \ + && echo 'alias l="exa --time-style long-iso --color=auto -F"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ + && echo 'alias ll="l -Fahl"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ + && echo 'alias la="l -a"' >> ${XDG_CONFIG_HOME}/fish/config.fish \ # configure git ARG GIT_USER_EMAIL @@ -174,7 +175,8 @@ RUN ${XDG_DATA_HOME}/rtx/bin/rtx plugins install \ kubectl \ lefthook \ poetry \ - terraform + terraform \ + tilt # 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. diff --git a/config/nvim/lua/custom/plugins/init.lua b/config/nvim/lua/custom/plugins/init.lua index 1c4f7d2..43498d9 100644 --- a/config/nvim/lua/custom/plugins/init.lua +++ b/config/nvim/lua/custom/plugins/init.lua @@ -73,7 +73,7 @@ return { { 'akinsho/toggleterm.nvim', opts = { - size = vim.o.lines * 0.3, + size = vim.o.lines * 0.75, open_mapping = [[]], hide_numbers = true, shade_filetypes = { }, @@ -104,7 +104,8 @@ return { end }) return { - { 'mh', 'ToggleTerm direction=horizontal size=' .. tostring(vim.o.lines * 0.4) .. '', desc = 'Open ter[m]inal [h]orizontally', noremap = true }, + { 'mh', 'ToggleTerm direction=horizontal size=' .. tostring(vim.o.lines * 0.75) .. '', desc = 'Open ter[m]inal [h]orizontally', noremap = true }, + { 'mv', 'ToggleTerm direction=vertical size=' .. tostring(vim.o.columns * 0.5) .. '', desc = 'Open ter[m]inal [v]ertically', noremap = true }, { 'mc', 'ToggleTermSendCurrentLine', desc = 'Send [c]urrent line under the cursor', noremap = true } } end diff --git a/config/rtx/config.toml b/config/rtx/config.toml index 02a7b26..ff0d12e 100644 --- a/config/rtx/config.toml +++ b/config/rtx/config.toml @@ -1,15 +1,16 @@ [tools] -awscli = "2.13.30" +awscli = "2.13.38" elixir = "1.15.7-otp-26" erlang = "26.1.2" -go = "1.21.3" -helm = "3.13.1" -kubectl = "1.27.7" -lefthook = "1.5.2" -node = "21.1.0" -poetry = "1.6.1" +go = "1.21.4" +helm = "3.13.2" +kubectl = "1.28.4" +lefthook = "1.5.3" +node = "21.2.0" +poetry = "1.7.1" python = "3.12.0" -terraform = "1.6.2" +terraform = "1.6.4" +tilt = "0.33.6" [settings] experimental = true diff --git a/patch/kickstart.nvim/updates.patch b/patch/kickstart.nvim/updates.patch index 06ee2a9..2831eda 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 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa24ebc240 100644 +index 3a98da0..e8e41b4 100644 --- a/init.lua +++ b/init.lua @@ -229,7 +229,7 @@ require('lazy').setup({ @@ -42,7 +42,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa -- [[ Basic Keymaps ]] -- Keymaps for better default experience -@@ -378,11 +387,29 @@ vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = +@@ -378,11 +387,33 @@ vim.keymap.set('n', 'sr', require('telescope.builtin').resume, { desc = vim.defer_fn(function() require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter @@ -54,6 +54,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa + 'eex', + 'elixir', + 'erlang', ++ 'gitcommit', + 'go', + 'heex', + 'html', @@ -62,12 +63,15 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa + 'json', + 'lua', + 'markdown', ++ 'markdown_inline', + 'python', + 'sql', ++ 'toml', + 'tsx', + 'typescript', + 'vim', -+ 'vimdoc' ++ 'vimdoc', ++ 'yaml' + }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, @@ -75,7 +79,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa highlight = { enable = true }, indent = { enable = true }, 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 -- define the property 'filetypes' to the map in question. local servers = { @@ -107,7 +111,7 @@ index 748e7f8145427b7f17639d4c9f978b9bbe47d2c9..7d05ed25928e7526b02da1671068cdaa } -- Setup neovim lua configuration -@@ -542,12 +574,20 @@ mason_lspconfig.setup { +@@ -542,12 +578,20 @@ mason_lspconfig.setup { mason_lspconfig.setup_handlers { function(server_name)