chore(deps): update dependency lua to v5.4.7

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [python](https://github.com/python/cpython) | minor | `3.12.7` -> `3.13.0` |

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->

Reviewed-on: #85
Co-authored-by: renovate-bot <renovate-bot@dubas.dev>
Co-committed-by: renovate-bot <renovate-bot@dubas.dev>

Dockerfile

@@ -105,11 +105,11 @@ RUN apt-get update \
   && echo 'permit persist :wheel as root' > /etc/doas.conf
 
 # command line utilities
-ENV DO_VERSION 27.1.1
+ENV DO_VERSION 27.3.1
 ENV DO_URL https://download.docker.com/linux/static/stable/x86_64/docker-${DO_VERSION}.tgz
-ENV DC_VERSION v2.29.1
+ENV DC_VERSION v2.29.7
 ENV DC_URL https://github.com/docker/compose/releases/download/${DC_VERSION}/docker-compose-linux-x86_64
-ENV BX_VERSION v0.16.2
+ENV BX_VERSION v0.17.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 \
   && mkdir /tmp/download \
@@ -162,7 +162,8 @@ 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 \
-  && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm
+  && git clone https://github.com/tmux-plugins/tpm.git ${XDG_CONFIG_HOME}/tmux/plugins/tpm \
+  && curl --proto '=https' --tlsv1.2 -LsSf https://github.com/jrmoulton/tmux-sessionizer/releases/download/v0.4.2/tmux-sessionizer-installer.sh | sh
 
 # configure fish and bash
 RUN fish -c true \
@@ -183,7 +184,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 186018483039b20dc39d7991e4fb28090dd4750e \
+  && git reset --hard 7201dc480134f41dd1be1f8f9b8f8470aac82a3b \
   && git apply /tmp/updates.patch \
   && cp /tmp/init.lua ${XDG_CONFIG_HOME}/nvim/lua/custom/plugins \
   && nvim --headless "+Lazy! sync" +qa

config/mise/config.toml

@@ -1,36 +1,36 @@
 [tools]
 age = "1.2.0"
-awscli = "2.17.31"
+awscli = "2.18.1"
 bat = "0.24.0"
 bitwarden = "2024.7.2"
 circleci-cli = "0.1.30549"
 ctlptl = "0.8.31"
 dagger = "0.12.5"
 eksctl = "0.188.0"
-elixir = "1.17.2-otp-27"
-erlang = "27.0.1"
+elixir = "1.17.3"
+erlang = "27.1.1"
 eza = "0.19.0"
 fzf = "0.53.0"
-go = "1.23.0"
-helm = "3.15.4"
+go = "1.23.2"
+helm = "3.16.1"
 k3d = "5.7.3"
 k3sup = "0.13.7"
 k9s = "0.32.5"
 kind = "0.24.0"
-kubectl = "1.31.0"
+kubectl = "1.31.1"
 kubie = "0.23.1"
 lefthook = "1.7.13"
 lua = "5.4.7"
 luajit = "2.0.5--2.4.4"
-node = "22.6.0"
+node = "22.9.0"
 poetry = "1.8.3"
-python = "3.12.5"
+python = "3.13.0"
 r = "4.4.1"
 ripgrep = "14.1.0"
-rust = "1.80.1"
+rust = "1.81.0"
 starship = "1.20.1"
 task = "3.38.0"
-terraform = "1.9.4"
+terraform = "1.9.7"
 tilt = "0.33.19"
 tmux = "3.4"
 usage = "0.3.0"

config/nvim/lua/custom/plugins/init.lua

@@ -104,82 +104,19 @@ return {
     priority = 1000,
     config = true,
   },
-  -- {
-  --   'rest-nvim/rest.nvim',
-  --   dependencies = { 'luarocks.nvim' },
-  --   ft = {
-  --     'http',
-  --     'rest',
-  --   },
-  --   config = function()
-  --     require('rest-nvim').setup {
-  --       client = 'curl',
-  --       custom_dynamic_variables = {},
-  --       encode_url = true,
-  --       env_file = '.env',
-  --       skip_ssl_verification = false,
-  --       highlight = {
-  --         enable = true,
-  --         timeout = 15,
-  --       },
-  --       result = {
-  --         behavior = {
-  --           decode_url = true,
-  --           formatters = {
-  --             json = 'jq',
-  --             html = false,
-  --           },
-  --           show_info = {
-  --             curl_command = true,
-  --             headers = true,
-  --             http_info = true,
-  --             url = true,
-  --           },
-  --           statistics = {
-  --             enable = true,
-  --             stats = {
-  --               { 'total_time', title = 'Time taken:' },
-  --               { 'size_download_t', title = 'Download size:' },
-  --             },
-  --           },
-  --         },
-  --         split = {
-  --           horizontal = false,
-  --           in_place = false,
-  --         },
-  --       },
-  --     }
-  --   end,
-  --   keys = function()
-  --     local status_ok, which_key = pcall(require, 'which-key')
-  --     if status_ok then
-  --       which_key.register {
-  --         ['<leader>t'] = { name = 'Res[t]', _ = 'which_key_ignore' },
-  --       }
-  --     end
-  --     return {
-  --       { '<leader>tr', '<cmd>Rest run<cr>', desc = 'Run the request under cursor' },
-  --       {
-  --         '<leader>tp',
-  --         '<Plug>RestNvimPreview',
-  --         desc = 'Preview the curl command for the request under cursor',
-  --       },
-  --       { '<leader>tl', '<cmd>Rest run last<cr>', desc = 'Re-run the last request' },
-  --     }
-  --   end,
-  -- },
   {
-    'akinsho/toggleterm.nvim',
-    opts = {
-      size = vim.o.lines * 0.75,
-      open_mapping = [[<c-\>]],
-      hide_numbers = true,
-      shade_filetypes = {},
-      shade_terminals = true,
-      shading_factor = 2,
-      direction = 'horizontal',
-      shell = vim.o.shell,
-    },
+    'EvWilson/slimux.nvim',
+    lazy = true,
+    opts = function()
+      local status_ok, slimux = pcall(require, 'slimux')
+      if not status_ok then
+        return {}
+      end
+      return {
+        target_socket = slimux.get_tmux_socket(),
+        target_pane = string.format('%s.1', slimux.get_tmux_window()),
+      }
+    end,
     keys = function()
       local status_ok, which_key = pcall(require, 'which-key')
       if status_ok then
@@ -187,38 +124,22 @@ return {
           { '<leader>m', group = 'Toggle ter[m]inal' },
         }
       end
-      vim.api.nvim_create_autocmd('TermOpen', {
-        group = vim.api.nvim_create_augroup('kickstart-custom-term-open-mapping', { clear = true }),
-        callback = function(args)
-          local bufnr = args.buf
-          local opts = { buffer = bufnr }
-          vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)
-          vim.keymap.set('t', 'jk', [[<C-\><C-n>]], opts)
-          vim.keymap.set('t', '<C-h>', [[<cmd>wincmd h<cr>]], opts)
-          vim.keymap.set('t', '<C-j>', [[<cmd>wincmd j<cr>]], opts)
-          vim.keymap.set('t', '<C-k>', [[<cmd>wincmd k<cr>]], opts)
-          vim.keymap.set('t', '<C-l>', [[<cmd>wincmd l<cr>]], opts)
-          vim.keymap.set('t', '<C-w>', [[<C-\><C-n><C-w>]], opts)
-        end,
-      })
+      local slimux_status_ok, slimux = pcall(require, 'slimux')
+      if not slimux_status_ok then
+        return {}
+      end
       return {
         {
-          '<leader>mh',
-          '<cmd>ToggleTerm direction=horizontal size=' .. tostring(vim.o.lines * 0.75) .. '<cr>',
-          desc = 'Open ter[m]inal [h]orizontally',
-          noremap = true,
+          '<leader>xr',
+          slimux.send_highlighted_text,
+          mode = 'v',
+          desc = 'Send currently highlighted text to configured tmux pane',
         },
         {
-          '<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>r',
+          slimux.send_paragraph_text,
+          mode = 'n',
+          desc = 'Send paragraph under cursor to configured tmux pane',
         },
       }
     end,

config/starship/config.toml

@@ -1,3 +1,5 @@
+"$schema" = 'https://starship.rs/config-schema.json'
+
 format = """
 $username\
 $hostname\
@@ -8,7 +10,12 @@ $git_status\
 $line_break\
 $kubernetes\
 $line_break\
-$character"""
+$character
+"""
+
+[directory]
+truncation_length = 2
+truncate_to_repo = false
 
 [git_branch]
 format = "[$branch]($style)"

config/tmux/tmux.conf

@@ -42,10 +42,6 @@ set -g status-bg black
 set -g status-fg white
 # set -g status-left "#$"
 
-# Highlight the active window in the status bar
-# set-window-option -g window-status-current-bg yellow
-# set-window-option -g window-status-current-fg black
-
 # Don't prompt to kill panes/windows
 bind-key x kill-pane
 bind-key & kill-window
@@ -59,37 +55,10 @@ bind r source-file ~/.config/tmux/tmux.conf\; display "Reloaded conf."
 set -g default-terminal "tmux-256color"
 set -sg terminal-overrides ",*:RGB"
 
-#### COLOUR (Solarized 256)
-
-# default statusbar colors
-# set-option -g status-bg colour235 #base02
-# set-option -g status-fg colour136 #yellow
-# set-option -g status-attr default
-
-# default window title colors
-# set-window-option -g window-status-fg colour244 #base0
-# set-window-option -g window-status-bg default
-# set-window-option -g window-status-attr dim
-
-# active window title colors
-# set-window-option -g window-status-current-fg colour166 #orange
-# set-window-option -g window-status-current-bg default
-# set-window-option -g window-status-current-attr bright
-
-# pane border
-# set-option -g pane-border-fg colour235 #base02
-# set-option -g pane-active-border-fg colour240 #base01
-
-# message text
-# set-option -g message-bg colour235 #base02
-# set-option -g message-fg colour166 #orange
-
-# pane number display
-# set-option -g display-panes-active-colour colour33 #blue
-# set-option -g display-panes-colour colour166 #orange
-
-# clock
-# set-window-option -g clock-mode-colour colour64 #green
+# tms shortcuts
+bind C-o display-popup -E "tms"
+bind C-j display-popup -E "tms switch"
+bind C-w display-popup -E "tms windows"
 
 # buffer size
 set -g history-limit 50000
@@ -99,12 +68,6 @@ set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'fabioluciano/tmux-tokyo-night'
 set -g @plugin 'Morantron/tmux-fingers'
 set -g @plugin 'tmux-plugins/tmux-yank'
-# set -g @plugin 'tmux-plugins/tmux-resurrect'
-# set -g @plugin 'tmux-plugins/tmux-continuum'
-
-# configure resurrect/continuum
-# set -g @continuum-save-interval '15'
-# set -g @continuum-restore 'on'
 
 # load/install plugins
 run '~/.config/tmux/plugins/tpm/tpm'

patch/kickstart.nvim/updates.patch

@@ -1,5 +1,5 @@
 diff --git a/init.lua b/init.lua
-index 220d304..62a9702 100644
+index ea86b79..93250ab 100644
 --- a/init.lua
 +++ b/init.lua
 @@ -91,7 +91,7 @@ vim.g.mapleader = ' '
@@ -39,8 +39,8 @@ index 220d304..62a9702 100644
  -- [[ Basic Keymaps ]]
  --  See `:help vim.keymap.set()`
  
-@@ -582,6 +590,28 @@ require('lazy').setup({
-         -- tsserver = {},
+@@ -618,6 +626,28 @@ require('lazy').setup({
+         -- ts_ls = {},
          --
  
 +        cuelsp = {},
@@ -68,7 +68,7 @@ index 220d304..62a9702 100644
          lua_ls = {
            -- cmd = {...},
            -- filetypes = { ...},
-@@ -596,6 +626,33 @@ require('lazy').setup({
+@@ -632,6 +662,33 @@ require('lazy').setup({
              },
            },
          },
@@ -76,7 +76,7 @@ index 220d304..62a9702 100644
 +        r_language_server = {},
 +        templ = {},
 +        terraformls = {},
-+        tsserver = {},
++        ts_ls = {},
 +        yamlls = {
 +          settings = {
 +            yaml = {
@@ -102,9 +102,9 @@ index 220d304..62a9702 100644
        }
  
        -- Ensure the servers and tools above are installed
-@@ -622,6 +679,33 @@ require('lazy').setup({
+@@ -658,6 +715,33 @@ require('lazy').setup({
              -- by the server configuration above. Useful when disabling
-             -- certain features of an LSP (for example, turning off formatting for tsserver)
+             -- certain features of an LSP (for example, turning off formatting for ts_ls)
              server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
 +            -- overwrite elixirls for older versions of elixir
 +            --   * elixir 1.11 use version 0.12.0
@@ -136,9 +136,9 @@ index 220d304..62a9702 100644
              require('lspconfig')[server_name].setup(server)
            end,
          },
-@@ -844,7 +928,39 @@ require('lazy').setup({
-     'nvim-treesitter/nvim-treesitter',
-     build = ':TSUpdate',
+@@ -888,7 +972,39 @@ require('lazy').setup({
+     main = 'nvim-treesitter.configs', -- Sets main module to use for opts
+     -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
      opts = {
 -      ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' },
 +      ensure_installed = {
@@ -177,7 +177,7 @@ index 220d304..62a9702 100644
        -- Autoinstall languages that are not installed
        auto_install = true,
        highlight = {
-@@ -881,18 +997,18 @@ require('lazy').setup({
+@@ -918,18 +1034,18 @@ require('lazy').setup({
    --  Uncomment any of the lines below to enable them (you will need to restart nvim).
    --
    -- require 'kickstart.plugins.debug',