merge: maintenance

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/JohnnyMorganz/StyLua
-    rev: v2.3.0
+    rev: v2.5.2
     hooks:
       - id: stylua-system
         args: [--check, --respect-ignores]

after/lsp/docker_language_server.lua

@@ -1,7 +1,5 @@
 return {
-    settings = {
-        initializationOptions = {
+    init_options = {
         telemetry = "off",
     },
-    },
 }

lua/config/options.lua

@@ -6,7 +6,6 @@ vim.g.loaded_netrw = 1
 vim.g.loaded_netrwPlugin = 1
 
 -- general
-vim.o.backup = false
 vim.o.mouse = ""
 -- TODO:(janezicmatej) i think mouse scroll is binded to up/down and this
 -- deosn't always work
@@ -14,7 +13,6 @@ vim.o.mousescroll = "ver:0,hor:0"
 vim.o.writebackup = false
 vim.o.undofile = true
 vim.o.updatetime = 250
-vim.o.timeout = true
 vim.o.timeoutlen = 300
 
 -- ui
@@ -30,7 +28,6 @@ vim.o.wrap = false
 vim.o.winborder = "double"
 
 -- editing
-vim.o.autoindent = true
 vim.o.expandtab = true
 vim.o.ignorecase = true
 vim.o.smartcase = true
@@ -66,7 +63,7 @@ vim.o.completeopt = "menuone,noselect,fuzzy,nosort"
 vim.api.nvim_create_autocmd("TextYankPost", {
     desc = "highlight when yanking text",
     group = vim.api.nvim_create_augroup("CustomHighlightYank", { clear = true }),
-    callback = function() vim.highlight.on_yank() end,
+    callback = function() vim.hl.on_yank() end,
 })
 
 -- filetype overrides

lua/config/plugins.lua

@@ -1,6 +1,6 @@
 -- bootstrap 'mini.nvim' manually in a way that it gets managed by 'mini.deps'
 local mini_path = vim.fn.stdpath("data") .. "/site/pack/deps/start/mini.nvim"
-if not vim.loop.fs_stat(mini_path) then
+if not vim.uv.fs_stat(mini_path) then
     vim.cmd('echo "Installing `mini.nvim`" | redraw')
     local clone_cmd = {
         "git",

lua/plugins/mini_icons.lua

@@ -1,5 +1,4 @@
 MiniDeps.now(function()
     require("mini.icons").setup()
-    MiniIcons.mock_nvim_web_devicons()
     MiniIcons.tweak_lsp_kind()
 end)

lua/plugins/mini_snippets.lua

@@ -1,13 +1 @@
-MiniDeps.later(function()
-    local gen_loader = require("mini.snippets").gen_loader
-    require("mini.snippets").setup({
-        snippets = {
-            -- Load custom file with global snippets first (adjust for Windows)
-            gen_loader.from_file("~/.config/nvim/snippets/global.json"),
-
-            -- Load snippets based on current language by reading files from
-            -- "snippets/" subdirectories from 'runtimepath' directories.
-            gen_loader.from_lang(),
-        },
-    })
-end)
+MiniDeps.later(function() require("mini.snippets").setup() end)

lua/plugins/mini_starter.lua

@@ -2,7 +2,7 @@ local function default_header()
     local hour = tonumber(vim.fn.strftime("%H"))
     local part_id = math.floor((hour + 4) / 8) + 1
     local day_part = ({ "evening", "morning", "afternoon", "evening" })[part_id]
-    local username = vim.loop.os_get_passwd()["username"] or "USERNAME"
+    local username = vim.uv.os_get_passwd()["username"] or "USERNAME"
 
     return ("good %s, %s"):format(day_part, username)
 end

lua/plugins/rainbow_delimiters.lua

@@ -1,14 +1,4 @@
 MiniDeps.later(function()
     MiniDeps.add("HiPhish/rainbow-delimiters.nvim")
-
-    -- HACK:(@janezicmatej) neovim 0.12 get_parser returns nil instead of erroring
-    local lib = require("rainbow-delimiters.lib")
-    local original_attach = lib.attach
-    lib.attach = function(bufnr, lang)
-        local parser = vim.treesitter.get_parser(bufnr, lang, { error = false })
-        if not parser then return end
-        return original_attach(bufnr, lang)
-    end
-
     require("rainbow-delimiters.setup").setup()
 end)

lua/plugins/treesitter.lua

@@ -3,7 +3,6 @@ local now_if_args = vim.fn.argc(-1) > 0 and MiniDeps.now or MiniDeps.later
 now_if_args(function()
     MiniDeps.add({
         source = "nvim-treesitter/nvim-treesitter",
-        checkout = "main",
         hooks = { post_checkout = function() vim.cmd("TSUpdate") end },
     })
 

mini-deps-snap

@@ -1,17 +1,17 @@
 return {
   ["copilot.vim"] = "a12fd5672110c8aa7e3c8419e28c96943ca179be",
-  ["fidget.nvim"] = "7fa433a83118a70fe24c1ce88d5f0bd3453c0970",
-  ["fzf-lua"] = "6e41ba7505f35a6f054ca682b043aa0cea36c2ef",
+  ["fidget.nvim"] = "9e0201673e08e997e7cf52afca5565c70bd117f3",
+  ["fzf-lua"] = "13bb178a299f7493dd64427a58e61904c4b58ecb",
   ["gitlinker.nvim"] = "cc59f732f3d043b626c8702cb725c82e54d35c25",
-  ["gitsigns.nvim"] = "7c4faa3540d0781a28588cafbd4dd187a28ac6e3",
-  ["gruvbox-material"] = "790afe9dd085aa04eccd1da3626c5fa05c620e53",
+  ["gitsigns.nvim"] = "8d79f2410c76e62b92e51c28c82e28c1c5a3daeb",
+  ["gruvbox-material"] = "11d779b26a9ab2b3db8c22c6ac9fb6e8ed4fea79",
   ["guess-indent.nvim"] = "84a4987ff36798c2fc1169cbaff67960aed9776f",
-  ["mini.nvim"] = "28d993854bdcde7d06f0990cfe6a2c6577f3f8ab",
-  ["nvim-autopairs"] = "59bce2eef357189c3305e25bc6dd2d138c1683f5",
-  ["nvim-lspconfig"] = "dc2f86d2b66a6e01a98c37cdadd3be3e90f8ab9a",
-  ["nvim-treesitter"] = "2b50ab5ccbcd9e5708deb351308edd738adbf84c",
-  ["oil.nvim"] = "0fcc83805ad11cf714a949c98c605ed717e0b83e",
-  ["plenary.nvim"] = "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
-  ["rainbow-delimiters.nvim"] = "01993eb20c6cdc1d33e7e98252368840309f99b9",
+  ["mini.nvim"] = "4389a4f31f854ce066949ea89c72dc71564f5c20",
+  ["nvim-autopairs"] = "430522f95fe4fb7c511ec64f8c1a90cc6a66c05c",
+  ["nvim-lspconfig"] = "ffd261c09c3dabd0bf1a438f47a8ae3b22f3c3ff",
+  ["nvim-treesitter"] = "f603a2f4da48728f80257fb5fbb90145fd1dc173",
+  ["oil.nvim"] = "b73018b75affd13fa38e2fc94ef753b465f770d7",
+  ["plenary.nvim"] = "74b06c6c75e4eeb3108ec01852001636d85a932b",
+  ["rainbow-delimiters.nvim"] = "3a0fc08dd39e8bf034a4cfef3f2845bd5f565a2e",
   ["todo-comments.nvim"] = "31e3c38ce9b29781e4422fc0322eb0a21f4e8668"
 }