chore(deps): update node to v22.11.0 (#41)

# Conflicts:
#	base/tool-versions

.github/workflows/pre-commit-autoupdate.yml

@@ -12,7 +12,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5.2.0
+      - uses: actions/setup-python@v5.3.0
       - run: pip install pre-commit && pre-commit autoupdate
       - uses: peter-evans/create-pull-request@v7
         with:

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         args: [--markdown-linebreak-ext=md]
@@ -40,7 +40,7 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.9.0-1
+    rev: v3.10.0-1
     hooks:
       - id: shfmt
 

.tool-versions

@@ -1,2 +1,2 @@
-python 3.12.7
+python 3.13.0
-nodejs 22.9.0
+nodejs 22.11.0

base/tool-versions

@@ -1,21 +1,21 @@
 asdf-plugin-manager 1.4.0
-nodejs 22.9.0
+nodejs 23.0.0
 golang 1.23.2
 python 3.12.7
 ruby 3.3.4
-rust 1.81.0
+rust 1.82.0
-direnv 2.34.0
+direnv 2.35.0
 fd 10.2.0
 1password-cli 2.30.0
 age 1.2.0
 bottom 0.10.2
 dotenv-linter 3.3.0
 editorconfig-checker 2.8.0
-github-cli 2.58.0
+github-cli 2.59.0
 hadolint 2.12.0
 kubectl 1.31.1
 pipx 1.7.1
-pre-commit 3.8.0
+pre-commit 4.0.1
 ripgrep 14.1.1
 shellcheck 0.10.0
 shfmt 3.9.0
@@ -26,5 +26,3 @@ yq 4.44.3
 bats 1.11.0
 gitleaks 8.18.4
 delta 0.18.1
-sops 3.9.0
-eza system

config/asdf/cargo-packages

@@ -21,3 +21,5 @@ bob-nvim
 bottom
 // A modern alternative to ls
 eza
+// Tmux Sessionizer: A tool for opening git repositories as tmux sessions
+tmux-sessionizer

config/asdf/plugin-versions

@@ -1,6 +1,6 @@
 1password-cli         https://github.com/NeoHsu/asdf-1password-cli.git            f5d5aab
 age                   https://github.com/threkk/asdf-age.git                      396bdf6
-asdf-plugin-manager   https://github.com/asdf-community/asdf-plugin-manager.git   0ef4f9e
+asdf-plugin-manager   https://github.com/asdf-community/asdf-plugin-manager.git   c721275
 bats                  https://github.com/timgluz/asdf-bats.git                    299551f
 bottom                https://github.com/carbonteq/asdf-btm.git                   fd8a55a
 delta                 https://github.com/andweeb/asdf-delta.git                   501318b
@@ -10,19 +10,20 @@ editorconfig-checker  https://github.com/gabitchov/asdf-editorconfig-checker.git
 fd                    https://gitlab.com/wt0f/asdf-fd.git                         17d56e0
 github-cli            https://github.com/bartlomiejdanek/asdf-github-cli.git      e0605b7
 gitleaks              https://github.com/jmcvetta/asdf-gitleaks.git               0cc0d7e
-golang                https://github.com/asdf-community/asdf-golang.git           d4f1d65
+golang                https://github.com/asdf-community/asdf-golang.git           e2527a3
 hadolint              https://github.com/devlincashman/asdf-hadolint.git          335e230
 kubectl               https://github.com/asdf-community/asdf-kubectl.git          2fb3b57
 nodejs                https://github.com/asdf-vm/asdf-nodejs.git                  c36e6f0
+php                   https://github.com/asdf-community/asdf-php.git              52c669a
 pipx                  https://github.com/yozachar/asdf-pipx.git                   31db618
 pre-commit            https://github.com/jonathanmorley/asdf-pre-commit.git       26bfc42
 python                https://github.com/asdf-community/asdf-python               a3a0185
 ripgrep               https://gitlab.com/wt0f/asdf-ripgrep.git                    e836665
-ruby                  https://github.com/asdf-vm/asdf-ruby.git                    96334db
+ruby                  https://github.com/asdf-vm/asdf-ruby.git                    e955978
 rust                  https://github.com/code-lever/asdf-rust.git                 95acf4f
 shellcheck            https://github.com/luizm/asdf-shellcheck.git                66200ff
 shfmt                 https://github.com/luizm/asdf-shfmt.git                     a42c5ff
 terragrunt            https://github.com/ohmer/asdf-terragrunt.git                4a6651a
 tf-summarize          https://github.com/adamcrews/asdf-tf-summarize.git          880ad26
-yamllint              https://github.com/ericcornelissen/asdf-yamllint.git        38e3870
+yamllint              https://github.com/ericcornelissen/asdf-yamllint.git        2f825d9
 yq                    https://github.com/sudermanjr/asdf-yq.git                   772992f

config/direnv/direnv.toml

@@ -1,11 +1,11 @@
 [global]
-disable_stdin = true
+disable_stdin = false
 load_dotenv = true
-hide_env_diff = true
+hide_env_diff = false
 
 [whitelist]
 prefix = [
-  "~/Code/ivuorinen/"
+  "~/Code/"
 ]
 exact = [
   "~/.dotfiles/.envrc"

config/exports

@@ -25,12 +25,11 @@ fi
 # Load asdf
 export ASDF_DIR="$XDG_BIN_HOME/asdf"
 if [[ -d $ASDF_DIR ]]; then
-  [[ -d $ASDF_DIR/bin ]] && x-path-prepend "$ASDF_DIR/bin"
-  [[ -d $ASDF_DIR/shims ]] && x-path-prepend "$ASDF_DIR/shims"
   [[ -d $ASDF_DIR/completions ]] && fpath=("$ASDF_DIR/completions" $fpath)
   [[ -d $ASDF_DIR/plugins ]] && fpath=("$ASDF_DIR/plugins" $fpath)
   source "$ASDF_DIR/asdf.sh"
 fi
+export PATH="$ASDF_DIR/bin:$ASDF_DIR/shims:$PATH"
 
 if ! command -v msg &> /dev/null; then
   # Function to print messages if VERBOSE is enabled
@@ -400,6 +399,9 @@ x-dc "$DOCKER_CONFIG"
 # Docker: Disable snyk ad
 export DOCKER_SCAN_SUGGEST=false
 
+# fzf
+export FZF_DEFAULT_OPTS='--height 40% --tmux bottom,40% --layout reverse --border top'
+
 # GnuPG
 # https://gnupg.org/documentation/manuals/gnupg/Invoking-GPG.html
 msg "Setting up GnuPG configuration"

config/nvim/lua/plugins/cmp.lua

@@ -14,15 +14,17 @@ return {
       -- https://github.com/L3MON4D3/LuaSnip
       {
         'L3MON4D3/LuaSnip',
+        version = '*',
+        event = 'BufReadPre',
         build = 'make install_jsregexp',
         dependencies = {
           -- luasnip completion source for nvim-cmp
           -- https://github.com/saadparwaiz1/cmp_luasnip
           'saadparwaiz1/cmp_luasnip',
           'rafamadriz/friendly-snippets',
+          'molleweide/LuaSnip-snippets.nvim',
         },
       },
-      { 'saadparwaiz1/cmp_luasnip' },
 
       -- ── Adds other completion capabilities. ─────────────────────────────
       -- ── nvim-cmp does not ship with all sources by default.
@@ -86,7 +88,9 @@ return {
       local luasnip = require 'luasnip'
       local lspkind = require 'lspkind'
       luasnip.config.setup {}
+      luasnip.snippets = require('luasnip_snippets').load_snippets()
       require('luasnip.loaders.from_vscode').lazy_load()
+
       require('copilot_cmp').setup()
 
       require('cmp_dictionary').setup {

config/nvim/lua/plugins/lsp.lua

@@ -19,6 +19,11 @@ capabilities.textDocument.foldingRange = {
 }
 
 return {
+  {
+    'folke/neoconf.nvim',
+    cmd = 'Neoconf',
+    opts = {},
+  },
   -- Portable package manager for Neovim that runs everywhere Neovim runs.
   -- Easily install and manage LSP servers, DAP servers, linters, and formatters.
   -- https://github.com/williamboman/mason.nvim
@@ -31,15 +36,12 @@ return {
       -- Mason servers to install
       -- See: https://mason-registry.dev/registry/list
       ensure_installed = {
-        'bash-language-server',
         'clang-format',
         'codespell',
         'commitlint',
-        'diagnostic-languageserver',
         'editorconfig-checker',
         'fixjson',
         'jsonlint',
-        'lua-language-server',
         'luacheck',
         'phpcbf',
         'phpcs',
@@ -48,8 +50,6 @@ return {
         'shellcheck',
         'shfmt',
         'stylua',
-        'vim-language-server',
-        'vue-language-server',
         'yamllint',
       },
     },
@@ -64,13 +64,16 @@ return {
       ensure_installed = {
         'bashls',
         -- 'csharp_ls',
+        'diagnosticls',
         'gopls',
         'html',
         'intelephense',
+        'jsonls',
+        'lua_ls',
         'tailwindcss',
         'ts_ls',
-        'lua_ls',
+        'vimls',
-        'jsonls',
+        'volar',
       },
       automatic_installation = true,
       handlers = {
@@ -184,14 +187,34 @@ return {
             },
           }
         end,
+        ['ts_ls'] = function()
+          local mason_registry = require 'mason-registry'
+          local ts_plugin_location = mason_registry
+            .get_package('vue-language-server')
+            :get_install_path() .. '/node_modules/@vue/typescript-plugin'
+          require('lspconfig')['volar'].setup {
+            init_options = {
+              plugins = {
+                {
+                  name = '@vue/typescript-plugin',
+                  location = ts_plugin_location,
+                  languages = { 'javascript', 'typescript', 'vue' },
+                },
+              },
+            },
+            filetypes = {
+              'typescript',
+              'javascript',
+              'javascriptreact',
+              'typescriptreact',
+              'vue',
+            },
+          }
+        end,
       },
     },
   },
 
-  -- Automatically install formatters registered with conform.nvim via mason.nvim
-  -- https://github.com/zapling/mason-conform.nvim
-  -- { 'zapling/mason-conform.nvim', opts = {} },
-
   -- ── Misc ───────────────────────────────────────────────────
   -- vscode-like pictograms for neovim lsp completion items
   -- https://github.com/onsails/lspkind-nvim
@@ -203,7 +226,7 @@ return {
   -- ── LSP ────────────────────────────────────────────────────
   -- Quick start configs for Nvim LSP
   -- https://github.com/neovim/nvim-lspconfig
-  { 'neovim/nvim-lspconfig' },
+  { 'neovim/nvim-lspconfig', dependencies = { 'folke/neoconf.nvim' } },
 
   -- Garbage collector that stops inactive LSP clients to free RAM
   -- https://github.com/Zeioth/garbage-day.nvim

config/nvim/lua/plugins/telescope.lua

@@ -14,6 +14,10 @@ return {
     -- https://github.com/polirritmico/telescope-lazy-plugins.nvim
     { 'polirritmico/telescope-lazy-plugins.nvim' },
 
+    -- Neovim plugin. Telescope.nvim extension that adds LuaSnip integration.
+    -- https://github.com/benfowler/telescope-luasnip.nvim
+    { 'benfowler/telescope-luasnip.nvim' },
+
     -- Fuzzy Finder Algorithm which requires local dependencies to be built.
     -- Only load if `make` is available
     {
@@ -21,6 +25,10 @@ return {
       build = 'make',
       cond = vim.fn.executable 'make' == 1,
     },
+
+    -- Import modules with ease
+    -- https://github.com/piersolenski/telescope-import.nvim
+    { 'piersolenski/telescope-import.nvim' },
   },
   config = function()
     local t = require 'telescope'
@@ -51,6 +59,23 @@ return {
           -- Must be a valid path to the file containing the lazy spec and setup() call.
           lazy_config = vim.fn.stdpath 'config' .. '/init.lua',
         },
+        import = {
+          -- Imports can be added at a specified line whilst keeping the cursor in place
+          insert_at_top = true,
+          -- Optionally support additional languages or modify existing languages...
+          custom_languages = {
+            {
+              -- The filetypes that ripgrep supports (find these via `rg --type-list`)
+              extensions = { 'js', 'ts' },
+              -- The Vim filetypes
+              filetypes = { 'vue' },
+              -- Optionally set a line other than 1
+              insert_at_line = 2, ---@type function|number
+              -- The regex pattern for the import statement
+              regex = [[^(?:import(?:[\"'\s]*([\w*{}\n, ]+)from\s*)?[\"'\s](.*?)[\"'\s].*)]],
+            },
+          },
+        },
       },
     }
 
@@ -58,6 +83,8 @@ return {
     pcall(t.load_extension, 'harpoon')
     pcall(t.load_extension, 'git_worktree')
     pcall(t.load_extension, 'lazy_plugins')
+    pcall(t.load_extension, 'luasnip')
+    pcall(t.load_extension, 'import')
 
     -- Enable telescope fzf native, if installed
     pcall(t.load_extension, 'fzf')
@@ -67,10 +94,12 @@ return {
     -- See `:help telescope.keymap`
     vim.keymap.set('n', '<leader>/', function()
       -- You can pass additional configuration to telescope to change theme, layout, etc.
-      require('telescope.builtin').current_buffer_fuzzy_find(themes.get_dropdown {
+      require('telescope.builtin').current_buffer_fuzzy_find(
-        winblend = 10,
+        themes.get_dropdown {
-        previewer = true,
+          winblend = 20,
-      })
+          previewer = true,
+        }
+      )
     end, { desc = '[/] Fuzzily search in current buffer]' })
   end,
 }

config/nvim/lua/plugins/treesitter.lua

@@ -8,6 +8,9 @@ return {
   end,
   dependencies = {
     'nvim-treesitter/nvim-treesitter-textobjects',
+    'nvim-treesitter/nvim-treesitter-refactor',
+    'nvim-treesitter/nvim-treesitter-context',
+    'JoosepAlviste/nvim-ts-context-commentstring',
   },
   config = function()
     require('nvim-treesitter.configs').setup {
@@ -47,6 +50,32 @@ return {
         'yaml',
       },
 
+      refactor = {
+        navigation = {
+          enable = true,
+          -- Assign keymaps to false to disable them, e.g. `goto_definition = false`.
+          keymaps = {
+            goto_definition = '<leader>gnd',
+            list_definitions = '<leader>gnD',
+            list_definitions_toc = '<leader>gO',
+            goto_next_usage = '<a-*>',
+            goto_previous_usage = '<a-#>',
+          },
+        },
+        smart_rename = {
+          enable = true,
+          -- Assign keymaps to false to disable them, e.g. `smart_rename = false`.
+          keymaps = {
+            smart_rename = 'grr',
+          },
+        },
+        highlight_definitions = {
+          enable = true,
+          -- Set to false if you have an `updatetime` of ~100.
+          clear_on_cursor_move = true,
+        },
+        highlight_current_scope = { enable = false },
+      },
       highlight = { enable = true },
       indent = { enable = true },
       incremental_selection = {

config/nvim/lua/plugins/ui.lua

@@ -82,6 +82,13 @@ return {
               action = 'Lazy update',
               key = 'u',
             },
+            {
+              icon = '☉ ',
+              desc = 'Quit',
+              group = 'DiagnosticError',
+              action = 'q',
+              key = 'q',
+            },
           },
         },
       }

config/nvim/lua/plugins/which-key.lua

@@ -36,8 +36,16 @@ return {
 
       -- ── Code ────────────────────────────────────────────────────────────
       { '<leader>c', group = '[c] Code' },
-      { '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', desc = 'LSP: Code Action' },
+      {
-      { '<leader>cg', '<cmd>lua require("neogen").generate()<CR>', desc = 'Generate annotations' },
+        '<leader>ca',
+        '<cmd>lua vim.lsp.buf.code_action()<CR>',
+        desc = 'LSP: Code Action',
+      },
+      {
+        '<leader>cg',
+        '<cmd>lua require("neogen").generate()<CR>',
+        desc = 'Generate annotations',
+      },
 
       -- Code: treesj
       { '<leader>cc', group = 'Code Split/Join' },
@@ -182,6 +190,11 @@ return {
         '<cmd>Lspsaga diagnostic_jump_next<cr>',
         desc = 'LSPSaga: Diagnostic Jump Next',
       },
+      {
+        '<leader>cx',
+        '<cmd>Telescope import<cr>',
+        desc = 'Telescope import',
+      },
 
       -- ── DAP ─────────────────────────────────────────────────────────────
       { '<leader>d', group = '[d] DAP' },
@@ -258,24 +271,34 @@ return {
       -- See: lua/plugins/telescope.lua
       {
         '<leader><space>',
-        "<cmd>lua require('telescope.builtin').buffers()<cr>",
+        '<cmd>Telescope buffers<cr>',
         desc = 'Find existing buffers',
       },
       {
-        '<leader><tab>',
+        '<leader>sc',
-        "<cmd>lua require('telescope.builtin').commands()<CR>",
+        '<cmd>Telescope commands<CR>',
         desc = 'Telescope: Commands',
       },
       {
         '<leader>sd',
-        "<cmd>lua require('telescope.builtin').diagnostics()<cr>",
+        '<cmd>Telescope diagnostics<cr>',
         desc = 'Search Diagnostics',
       },
       {
         '<leader>sg',
-        "<cmd>lua require('telescope.builtin').live_grep()<cr>",
+        '<cmd>Telescope live_grep<cr>',
         desc = 'Search by Grep',
       },
+      {
+        '<leader>sh',
+        '<cmd>Telescope highlights<cr>',
+        desc = 'List highlights',
+      },
+      {
+        '<leader>sl',
+        '<cmd>Telescope luasnip<CR>',
+        desc = 'Search LuaSnip',
+      },
       {
         '<leader>sm',
         '<cmd>Telescope harpoon marks<CR>',
@@ -288,7 +311,7 @@ return {
       },
       {
         '<leader>so',
-        "<cmd>lua require('telescope.builtin').oldfiles()<cr>",
+        '<cmd>Telescope oldfiles<cr>',
         desc = 'Find recently Opened files',
       },
       {
@@ -296,10 +319,54 @@ return {
         "<cmd>lua require('telescope').extensions.lazy_plugins.lazy_plugins()<cr>",
         desc = 'Find neovim/lazy configs',
       },
+      {
+        '<leader>sq',
+        '<cmd>Telescope quickfix<cr>',
+        desc = 'Quickfix list',
+      },
+      {
+        '<leader>sr',
+        group = 'References',
+        {
+          '<leader>srd',
+          '<cmd>Telescope lsp_definitions<CR>',
+          desc = 'Definitions',
+        },
+        {
+          '<leader>sri',
+          '<cmd>Telescope lsp_implementations<CR>',
+          desc = 'Implementations',
+        },
+        {
+          '<leader>srp',
+          '<cmd>Telescope lsp_document_symbols<CR>',
+          desc = 'Document Symbols',
+        },
+        {
+          '<leader>srr',
+          '<cmd>Telescope lsp_references<CR>',
+          desc = 'LSP References',
+        },
+        {
+          '<leader>srt',
+          '<cmd>Telescope lsp_type_definitions<CR>',
+          desc = 'Type Definitions',
+        },
+        {
+          '<leader>srw',
+          '<cmd>Telescope lsp_workspace_symbols<CR>',
+          desc = 'Workspace Symbols',
+        },
+      },
+      {
+        '<leader>ss',
+        '<cmd>Telescope treesitter',
+        desc = 'Treesitter symbols',
+      },
       { '<leader>st', '<cmd>TodoTelescope<CR>', desc = 'Telescope: Show Todo' },
       {
         '<leader>sw',
-        "<cmd>lua require('telescope.builtin').grep_string()<cr>",
+        '<cmd>Telescope grep_string<cr>',
         desc = 'Search current Word',
       },
 
@@ -367,15 +434,29 @@ return {
       -- ── Help ────────────────────────────────────────────────────────────
       { '<leader>?', group = '[?] Help & Cheat sheets' },
       {
+        {
+          '<leader>?h',
+          '<cmd>Telescope help_tags<cr>',
+          desc = 'Help tags',
+        },
+        {
+          '<leader>?m',
+          '<cmd>Telescope man_pages<cr>',
+          desc = 'Man pages',
+        },
         {
           '<leader>?w',
-          '<cmd>lua require("which-key").show({global = false})<cr>',
+          '<cmd>lua require("which-key").show({global = true})<cr>',
           desc = 'Buffer Local Keymaps (which-key)',
         },
       },
 
       -- ── Misc ────────────────────────────────────────────────────────────
-      { '<leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', desc = 'LSP: Type Definition' },
+      {
+        '<leader>D',
+        '<cmd>lua vim.lsp.buf.type_definition()<CR>',
+        desc = 'LSP: Type Definition',
+      },
       { '<leader>e', '<cmd>Neotree reveal<CR>', desc = 'NeoTree reveal' },
 
       -- ╭─────────────────────────────────────────────────────────╮

config/omp/own.toml

@@ -36,7 +36,6 @@ type = "prompt"
   type = "git"
   style = "plain"
   foreground = "lightGreen"
-  # template = "{{ .UpstreamIcon }}{{ .HEAD }} {{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}){{ end }}"
   template = "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }}"
 
     [blocks.segments.properties]

config/tmux/tmux.conf

@@ -28,6 +28,15 @@ bind -n M-Down  select-pane -D
 # Reload tmux config with <prefix> + r
 bind r source-file ~/.dotfiles/config/tmux/tmux.conf \; display "tmux cfg reloaded!"
 
+# Switch to next client with <prefix>( and previous with <prefix>)
+bind -r '(' switch-client -p\; refresh-client -S
+bind -r ')' switch-client -n\; refresh-client -S
+
+# tms, https://github.com/jrmoulton/tmux-sessionizer
+bind C-h display-popup -E "tms"
+bind C-j display-popup -E "tms switch"
+bind C-k display-popup -E "tms windows"
+
 # Open a new window with <prefix> + N
 bind N new-window
 
@@ -112,7 +121,7 @@ set-option -g status-left ''
 set-option -g window-status-format ' #I:#W '
 set-option -g window-status-current-format ' #I:#W#{?window_zoomed_flag, ◈ ,} '
 
-set-option -g status-right "#{hostname_short}/#S #{tmux_mode_indicator}"
+set-option -g status-right "#{hostname_short}/#(tms sessions) #{tmux_mode_indicator}"
 
 set -g pane-border-style "fg=#3b4261"
 set -g pane-active-border-style "fg=#7aa2f7"
@@ -138,15 +147,15 @@ set -g @tmux_window_name_max_name_len "20"
 set -g @tmux_window_name_use_tilde "True"
 set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh', 'oh-my-posh']"
 set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh', 'antidot']" # Default is []
+set -g @tmux_window_name_ignored_programs "['sqlite3', 'x-set-php-aliases', 'oh-my-posh', 'antidot', 'direnv']" # Default is []
-set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local')]"
+set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local'), ('.+asdf', 'asdf')]"
 
 ## https://github.com/tmux-plugins/tmux-continuum
-set -g @continuum-restore 'on'
+# set -g @continuum-restore 'on'
 
 ## https://github.com/tmux-plugins/tmux-resurrect
-set -g @resurrect-strategy-nvim 'session'
+# set -g @resurrect-strategy-nvim 'session'
-set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect'
+# set -g @resurrect-dir '~/.local/state/tmux/tmux-resurrect'
 
 ## https://github.com/MunifTanjim/tmux-mode-indicator
 set -g @mode_indicator_prefix_mode_style 'bg=default,fg=#7aa2f7'
@@ -160,9 +169,9 @@ set -g @mode_indicator_sync_mode_style 'bg=default,fg=red'
 
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-sensible/sensible.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-window-name/tmux_window_name.tmux
-run-shell ~/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux
+# run-shell ~/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux
-run-shell ~/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux
+# run-shell ~/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux
-run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux
+# run-shell ~/.dotfiles/config/tmux/plugins/tmux-sessionist/sessionist.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-mode-indicator/mode_indicator.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-suspend/suspend.tmux
 run-shell ~/.dotfiles/config/tmux/plugins/tmux-yank/yank.tmux

docs/nvim-keybindings.md

@@ -2,98 +2,12 @@
 
 ```txt
 
-n  <Space>/    * <Lua 380: ~/.config/nvim/lua/plugins/telescope.lua:82>
+n  <Space>/    * <Lua 196: ~/.config/nvim/lua/plugins/telescope.lua:68>
                  [/] Fuzzily search in current buffer]
-n  <Space>hw   * <Lua 42: ~/.config/nvim/lua/plugins/harpoon.lua:40>
+n  <Space>ht   * <Lua 192: ~/.config/nvim/lua/plugins/harpoon.lua:43>
-                 Open harpoon window with telescope
-n  <Space>1    * <Lua 40: ~/.config/nvim/lua/plugins/harpoon.lua:68>
-                 harpoon to file 1
-n  <Space>hn   * <Lua 39: ~/.config/nvim/lua/plugins/harpoon.lua:61>
-                 harpoon to next file
-n  <Space>hp   * <Lua 38: ~/.config/nvim/lua/plugins/harpoon.lua:54>
-                 harpoon to previous file
-n  <Space>ha   * <Lua 37: ~/.config/nvim/lua/plugins/harpoon.lua:47>
-                 harpoon file
-n  <Space>5    * <Lua 36: ~/.config/nvim/lua/plugins/harpoon.lua:96>
-                 harpoon to file 5
-n  <Space>4    * <Lua 35: ~/.config/nvim/lua/plugins/harpoon.lua:89>
-                 harpoon to file 4
-n  <Space>3    * <Lua 34: ~/.config/nvim/lua/plugins/harpoon.lua:82>
-                 harpoon to file 3
-n  <Space>2    * <Lua 33: ~/.config/nvim/lua/plugins/harpoon.lua:75>
-                 harpoon to file 2
-n  <Space>tc   * <Cmd>CloakToggle<CR>
-                 [tc] Toggle Cloak
-n  <Space>xx   * <Cmd>Trouble<CR>
-                 Toggle Trouble
-n  <Space>xq   * <Cmd>Trouble quickfix<CR>
-                 Toggle Quickfix
-n  <Space>xl   * <Cmd>Trouble loclist<CR>
-                 Toggle Loclist
-n  <Space>xd   * <Cmd>Trouble document_diagnostics<CR>
-                 Toggle Document Diagnostics
-n  <Space>xw   * <Cmd>Trouble workspace_diagnostics<CR>
-                 Toggle Workspace Diagnostics
-n  <Space>?s   * <Cmd>Neoconf show<CR>
-                 Neoconf: Show merged config
-n  <Space>?m   * <Cmd>Neoconf lsp<CR>
-                 Neoconf: Show merged LSP config
-n  <Space>?l   * <Cmd>Neoconf local<CR>
-                 Neoconf: Local
-n  <Space>?g   * <Cmd>Neoconf global<CR>
-                 Neoconf: Global
-n  <Space>?c   * <Cmd>Neoconf<CR>
-                 Neoconf: Open
-n  <Space>wl   * <Cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>
-                 LSP: Workspace List Folders
-n  <Space>wr   * <Cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>
-                 LSP: Workspace Remove Folder
-n  <Space>wa   * <Cmd>lua vim.lsp.buf.add_workspace_folder()<CR>
-                 LSP: Workspace Add Folder
-n  <Space>ws   * <Cmd>lua require("telescope.builtin").lsp_dynamic_workspace_symbols()<CR>
-                 LSP: Workspace Symbols
-n  <Space>ds   * <Cmd>lua require("telescope.builtin").lsp_document_symbols()<CR>
-                 LSP: Document Symbols
-n  <Space>D    * <Cmd>lua vim.lsp.buf.type_definition()<CR>
-                 LSP: Type Definition
-n  <Space>ca   * <Cmd>lua vim.lsp.buf.code_action()<CR>
-                 LSP: Code Action
-n  <Space>cr   * <Cmd>lua vim.lsp.buf.rename()<CR>
-                 LSP: Rename
-n  <Space>dq   * <Cmd>lua vim.diagnostic.setloclist()<CR>
-                 Diagnostic: Set loc list
-n  <Space>do   * <Cmd>lua vim.diagnostic.open_float()<CR>
-                 Diagnostic: Open float
-   <Space>cf   * <Lua 107: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 [f] Format buffer
-n  <Space>e    * <Lua 81: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 NeoTree reveal
-n  <Space>cg   * <Lua 50: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Generate annotations
-n  <Space>zm   * <Lua 49: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search mappings.
-n  <Space>zh   * <Lua 48: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search history of opened files
-n  <Space>zb   * <Lua 47: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search open buffers.
-n  <Space>zt   * <Lua 46: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search open tabs.
-n  <Space>zc   * <Lua 32: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search commands.
-n  <Space>zf   * <Lua 31: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search for files in given path.
-n  <Space>zg   * <Lua 25: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search with rg (aka live grep).
-n  <Space>dc   * <Lua 45: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 DAP: Continue
-n  <Space>db   * <Lua 44: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 DAP: Toggle Breakpoint
-n  <Space>dt   * <Lua 43: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 DAP: Toggle UI
-n  <Space>ht   * <Lua 369: ~/.config/nvim/lua/plugins/harpoon.lua:16>
                  Open Harpoon Quick menu
-n  <Space>dr   * <Lua 41: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+n  <Space>hw   * <Lua 189: ~/.config/nvim/lua/plugins/harpoon.lua:37>
-                 DAP: Reset
+                 Open harpoon window with telescope
 x  #           * <Lua 7: vim/_defaults.lua:0>
                  :help v_#-default
 o  %             <Plug>(MatchitOperationForward)
@@ -105,13 +19,20 @@ x  *           * <Lua 3: vim/_defaults.lua:0>
                  :help v_star-default
 x  @           * mode() == 'V' ? ':normal! @'.getcharstr().'<CR>' : '@'
                  :help v_@-default
-n  K           * <Cmd>lua vim.lsp.buf.hover()<CR>
-                 LSP: Hover Documentation
 x  Q           * mode() == 'V' ? ':normal! @<C-R>=reg_recorded()<CR><CR>' : 'Q'
                  :help v_Q-default
-x  S             <Plug>VSurround
+x  R           * <Lua 70: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Treesitter Search
+o  R           * <Lua 69: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Treesitter Search
 n  Y           * y$
                  :help Y-default
+o  Zk          * <Lua 67: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash Treesitter
+x  Zk          * <Lua 66: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash Treesitter
+n  Zk          * <Lua 59: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash Treesitter
 o  [%            <Plug>(MatchitOperationMultiBackward)
 x  [%            <Plug>(MatchitVisualMultiBackward)
 n  [%            <Plug>(MatchitNormalMultiBackward)
@@ -123,27 +44,23 @@ n  ]%            <Plug>(MatchitNormalMultiForward)
 n  ]d          * <Lua 14: vim/_defaults.lua:0>
                  Jump to the next diagnostic
 x  a%            <Plug>(MatchitVisualTextObject)
-n  cS            <Plug>CSurround
+n  gR          * :RegexplainerToggle<CR>
-n  cs            <Plug>Csurround
+                 Toggle Regexplainer
-n  ds            <Plug>Dsurround
-n  dp          * <Cmd>lua vim.diagnostic.goto_prev()<CR>
-                 Diagnostic: Goto Prev
-n  dn          * <Cmd>lua vim.diagnostic.goto_next()<CR>
-                 Diagnostic: Goto Next
 o  g%            <Plug>(MatchitOperationBackward)
 x  g%            <Plug>(MatchitVisualBackward)
 n  g%            <Plug>(MatchitNormalBackward)
-x  gS            <Plug>VgSurround
+n  gP          * <Lua 52: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:132>
-n  gR          * :RegexplainerToggle<CR>
+                 Close preview windows
-                 Toggle Regexplainer
+n  gpr         * <Lua 25: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:114>
-n  gD          * <Cmd>lua vim.lsp.buf.declaration()<CR>
+                 Preview references
-                 LSP: Goto Declaration
+n  gpD         * <Lua 244: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:105>
-n  gd          * <Cmd>lua vim.lsp.buf.definition()<CR>
+                 Preview declaration
-                 LSP: Goto Definition
+n  gpi         * <Lua 242: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:91>
-n  gr          * <Cmd>lua require("telescope.builtin").lsp_references()<CR>
+                 Preview implementation
-                 LSP: Goto References
+n  gpt         * <Lua 241: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:77>
-n  gI          * <Cmd>lua vim.lsp.buf.implementation()<CR>
+                 Preview type definition
-                 LSP: Goto Implementation
+n  gpd         * <Lua 237: ~/.local/share/nvim/lazy/goto-preview/lua/goto-preview.lua:63>
+                 Preview definition
 o  gc          * <Lua 13: vim/_defaults.lua:0>
                  Comment textobject
 n  gcc         * <Lua 12: vim/_defaults.lua:0>
@@ -160,13 +77,14 @@ n  j           * v:count == 0 ? 'gj' : 'j'
                  Move down
 n  k           * v:count == 0 ? 'gk' : 'k'
                  Move up
-n  n           * <Lua 51: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+o  r           * <Lua 68: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 Twilight
+                 Remote Flash
-n  ySS           <Plug>YSsurround
+o  zk          * <Lua 65: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-n  ySs           <Plug>YSsurround
+                 Flash
-n  yss           <Plug>Yssurround
+x  zk          * <Lua 64: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-n  yS            <Plug>YSurround
+                 Flash
-n  ys            <Plug>Ysurround
+n  zk          * <Lua 63: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
+                 Flash
 x  <Plug>(MatchitVisualTextObject)   <Plug>(MatchitVisualMultiBackward)o<Plug>(MatchitVisualMultiForward)
 o  <Plug>(MatchitOperationMultiForward) * :<C-U>call matchit#MultiMatch("W",  "o")<CR>
 o  <Plug>(MatchitOperationMultiBackward) * :<C-U>call matchit#MultiMatch("bW", "o")<CR>
@@ -180,44 +98,29 @@ x  <Plug>(MatchitVisualBackward) * :<C-U>call matchit#Match_wrapper('',0,'v')<CR
 x  <Plug>(MatchitVisualForward) * :<C-U>call matchit#Match_wrapper('',1,'v')<CR>:if col("''") != col("$") | exe ":normal! m'" | endif<CR>gv``
 n  <Plug>(MatchitNormalBackward) * :<C-U>call matchit#Match_wrapper('',0,'n')<CR>
 n  <Plug>(MatchitNormalForward) * :<C-U>call matchit#Match_wrapper('',1,'n')<CR>
-v  <Plug>VgSurround * :<C-U>call <SNR>27_opfunc(visualmode(),visualmode() ==# 'V' ? 0 : 1)<CR>
+s  <Plug>luasnip-jump-prev * <Lua 315: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:57>
-v  <Plug>VSurround * :<C-U>call <SNR>27_opfunc(visualmode(),visualmode() ==# 'V' ? 1 : 0)<CR>
-n  <Plug>YSurround * <SNR>27_opfunc2('setup')
-n  <Plug>Ysurround * <SNR>27_opfunc('setup')
-n  <Plug>YSsurround * <SNR>27_opfunc2('setup').'_'
-n  <Plug>Yssurround * '^'.v:count1.<SNR>27_opfunc('setup').'g_'
-n  <Plug>CSurround * :<C-U>call <SNR>27_changesurround(1)<CR>
-n  <Plug>Csurround * :<C-U>call <SNR>27_changesurround()<CR>
-n  <Plug>Dsurround * :<C-U>call <SNR>27_dosurround(<SNR>27_inputtarget())<CR>
-n  <Plug>SurroundRepeat * .
-n  <C-L>       * :<C-U>TmuxNavigateRight<CR>
-n  <C-Bslash>  * :<C-U>TmuxNavigatePrevious<CR>
-n  <C-J>       * :<C-U>TmuxNavigateDown<CR>
-n  <C-H>       * :<C-U>TmuxNavigateLeft<CR>
-n  <C-K>       * :<C-U>TmuxNavigateUp<CR>
-s  <Plug>luasnip-jump-prev * <Lua 283: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:57>
                  LuaSnip: Jump to the previous node
-s  <Plug>luasnip-jump-next * <Lua 282: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:54>
+s  <Plug>luasnip-jump-next * <Lua 314: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:54>
                  LuaSnip: Jump to the next node
-s  <Plug>luasnip-prev-choice * <Lua 281: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:51>
+s  <Plug>luasnip-prev-choice * <Lua 313: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:51>
                  LuaSnip: Change to the previous choice from the choiceNode
-s  <Plug>luasnip-next-choice * <Lua 280: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:48>
+s  <Plug>luasnip-next-choice * <Lua 312: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:48>
                  LuaSnip: Change to the next choice from the choiceNode
-s  <Plug>luasnip-expand-snippet * <Lua 279: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:45>
+s  <Plug>luasnip-expand-snippet * <Lua 311: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:45>
                  LuaSnip: Expand the current snippet
-s  <Plug>luasnip-expand-or-jump * <Lua 278: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:42>
+s  <Plug>luasnip-expand-or-jump * <Lua 310: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:42>
                  LuaSnip: Expand or jump in the current snippet
-   <Plug>luasnip-expand-repeat * <Lua 276: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:35>
+   <Plug>luasnip-expand-repeat * <Lua 308: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:35>
                  LuaSnip: Repeat last node expansion
-n  <Plug>luasnip-delete-check * <Lua 274: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:28>
+n  <Plug>luasnip-delete-check * <Lua 306: ~/.local/share/nvim/lazy/LuaSnip/plugin/luasnip.lua:28>
                  LuaSnip: Removes current snippet from jumplist
 n  <Plug>PlenaryTestFile * :lua require('plenary.test_harness').test_file(vim.fn.expand("%:p"))<CR>
-n  <C-P>       * <Lua 26: ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua:121>
-                 FZF: search for files starting at current directory.
 n  <C-W><C-D>    <C-W>d
                  Show diagnostics under the cursor
 n  <C-W>d      * <Lua 16: vim/_defaults.lua:0>
                  Show diagnostics under the cursor
+n  <C-L>       * <Cmd>nohlsearch|diffupdate|normal! <C-L><CR>
+                 :help CTRL-L-default
 ```
 
-- Generated on Wed 25 Sep 2024 14:52:25 EEST
+- Generated on Fri  4 Oct 2024 14:49:00 EEST

scripts/install-asdf.sh

@@ -4,7 +4,7 @@
 #
 # It also updates asdf and the plugins, and then reshim asdf.
 #
-# Usage: ./install-asdf.sh [both|install|add_plugins]
+# Usage: ./install-asdf.sh [both|install|update|add_plugins]
 # Author: Ismo Vuorinen <https://github.com/ivuorinen>
 # License: MIT
 #
@@ -13,9 +13,40 @@ source "${DOTFILES}/config/shared.sh"
 export ASDF_DIR="${XDG_BIN_HOME}/asdf"
 export PATH="${ASDF_DIR}/bin:$PATH"
 
+# If ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME is not set, set it
+if [ -z "${ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME}" ]; then
+  export ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME="${XDG_CONFIG_HOME}/asdf/plugin-versions"
+fi
+
 msg "Sourcing asdf in your shell"
 . "$ASDF_DIR/asdf.sh"
 
+ASDF_INSTALLABLES=(
+  "1password-cli:github.com/NeoHsu/asdf-1password-cli.git"
+  "age:github.com/threkk/asdf-age.git"
+  "bottom:github.com/carbonteq/asdf-btm.git"
+  "direnv:github.com/asdf-community/asdf-direnv.git"
+  "dotenv-linter:github.com/wesleimp/asdf-dotenv-linter.git"
+  "editorconfig-checker:github.com/gabitchov/asdf-editorconfig-checker.git"
+  "fd:gitlab.com/wt0f/asdf-fd.git"
+  "github-cli:github.com/bartlomiejdanek/asdf-github-cli.git"
+  "golang:github.com/asdf-community/asdf-golang.git"
+  "hadolint:github.com/devlincashman/asdf-hadolint.git"
+  "kubectl:github.com/asdf-community/asdf-kubectl.git"
+  "nodejs:github.com/asdf-vm/asdf-nodejs.git"
+  "pipx:github.com/yozachar/asdf-pipx.git"
+  "pre-commit:github.com/jonathanmorley/asdf-pre-commit.git"
+  "python:github.com/asdf-community/asdf-python.git"
+  "ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
+  "rust:github.com/code-lever/asdf-rust.git"
+  "shellcheck:github.com/luizm/asdf-shellcheck.git"
+  "shfmt:github.com/luizm/asdf-shfmt.git"
+  "terragrunt:github.com/ohmer/asdf-terragrunt.git"
+  "tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
+  "yamllint:github.com/ericcornelissen/asdf-yamllint.git"
+  "yq:github.com/sudermanjr/asdf-yq.git"
+)
+
 # Function to update asdf and plugins
 update_asdf()
 {
@@ -24,41 +55,24 @@ update_asdf()
   asdf global asdf-plugin-manager "$(asdf latest asdf-plugin-manager)"
   asdf-plugin-manager version
   asdf-plugin-manager add-all
+  asdf-plugin-manager update-all
+  asdf-plugin-manager export > "${ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME}"
 
   asdf install
 
   return 0
 }
 
+update_asdf_commands()
+{
+  msg "Updating asdf commands using asdf-plugin-manager"
+  asdf-plugin-manager update-all
+  return 0
+}
+
 # Function to install asdf plugins
 install_asdf_plugins()
 {
-  ASDF_INSTALLABLES=(
-    "1password-cli:github.com/NeoHsu/asdf-1password-cli.git"
-    "age:github.com/threkk/asdf-age.git"
-    "bottom:github.com/carbonteq/asdf-btm.git"
-    "direnv:github.com/asdf-community/asdf-direnv.git"
-    "dotenv-linter:github.com/wesleimp/asdf-dotenv-linter.git"
-    "editorconfig-checker:github.com/gabitchov/asdf-editorconfig-checker.git"
-    "fd:gitlab.com/wt0f/asdf-fd.git"
-    "github-cli:github.com/bartlomiejdanek/asdf-github-cli.git"
-    "golang:github.com/asdf-community/asdf-golang.git"
-    "hadolint:github.com/devlincashman/asdf-hadolint.git"
-    "kubectl:github.com/asdf-community/asdf-kubectl.git"
-    "nodejs:github.com/asdf-vm/asdf-nodejs.git"
-    "pipx:github.com/yozachar/asdf-pipx.git"
-    "pre-commit:github.com/jonathanmorley/asdf-pre-commit.git"
-    "python:github.com/asdf-community/asdf-python.git"
-    "ripgrep:gitlab.com/wt0f/asdf-ripgrep.git"
-    "rust:github.com/code-lever/asdf-rust.git"
-    "shellcheck:github.com/luizm/asdf-shellcheck.git"
-    "shfmt:github.com/luizm/asdf-shfmt.git"
-    "terragrunt:github.com/ohmer/asdf-terragrunt.git"
-    "tf-summarize:github.com/adamcrews/asdf-tf-summarize.git"
-    "yamllint:github.com/ericcornelissen/asdf-yamllint.git"
-    "yq:github.com/sudermanjr/asdf-yq.git"
-  )
-
   msg "Installing asdf plugins"
   for item in "${ASDF_INSTALLABLES[@]}"; do
     CMD=$(echo "${item}" | awk -F ":" '{print $1}')
@@ -70,7 +84,7 @@ install_asdf_plugins()
   done
 
   msg "Exporting asdf plugin versions"
-  asdf-plugin-manager export > "${XDG_CONFIG_HOME}/asdf/plugin-versions"
+  asdf-plugin-manager export > "${ASDF_PLUGIN_MANAGER_PLUGIN_VERSIONS_FILENAME}"
 
   return 0
 }
@@ -85,7 +99,7 @@ reshim()
 # create usage function
 usage()
 {
-  echo "Usage: $0 [both|install|add_plugins]"
+  echo "Usage: $0 [both|install|add_plugins|update]"
   exit 1
 }
 
@@ -97,6 +111,10 @@ main()
       update_asdf
       reshim
       ;;
+    "update")
+      update_asdf_commands
+      reshim
+      ;;
     "install")
       update_asdf
       reshim