diff --git a/lazy-lock.json b/lazy-lock.json index 9f68174..e0893a7 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,6 +27,7 @@ "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, "peek.nvim": { "branch": "master", "commit": "5820d937d5414baea5f586dc2a3d912a74636e5b" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "replacer.nvim": { "branch": "master", "commit": "32e1713230844fa52f7f0598c59295de3c90dc95" }, "smear-cursor.nvim": { "branch": "main", "commit": "4b86df8a0c5f46e708616b21a02493bb0e47ecbd" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, diff --git a/lsp/pyright.lua b/lsp/pyright.lua index 5c82a59..5fb2efb 100644 --- a/lsp/pyright.lua +++ b/lsp/pyright.lua @@ -1,5 +1,5 @@ return { - cmd = { 'pyright-langserver', '--stdio' }, + cmd = { 'pylsp' }, filetypes = { 'python' }, - root_markers = { 'setup.py', 'setup.cfg', 'requirements.txt', '.git' }, + root_markers = { 'pyproject.toml', 'setup.py', 'setup.cfg', 'requirements.txt', '.git' }, } diff --git a/lua/plugins/search.lua b/lua/plugins/search.lua index 89c9bc2..20b9c37 100644 --- a/lua/plugins/search.lua +++ b/lua/plugins/search.lua @@ -2,35 +2,47 @@ -- │ Telescope │ -- ╰───────────╯ return { - { - "nvim-telescope/telescope.nvim", - dependencies = { - "nvim-treesitter/nvim-treesitter", - { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, - { - "isak102/telescope-git-file-history.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "tpope/vim-fugitive", - }, - }, - }, - cmd = "Telescope", - opts = function() - return require("plugins.opts.telescope") - end, - config = function(_, opts) - local telescope = require("telescope") - telescope.setup(opts) + { + "nvim-telescope/telescope.nvim", + dependencies = { + "nvim-treesitter/nvim-treesitter", + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + { + "isak102/telescope-git-file-history.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "tpope/vim-fugitive", + }, + }, + }, + cmd = "Telescope", + opts = function() + return require("plugins.opts.telescope") + end, + config = function(_, opts) + local telescope = require("telescope") + telescope.setup(opts) - -- load extensions - for _, ext in ipairs(opts.extensions_list) do - telescope.load_extension(ext) - end - end, - }, - -- Multi buffer search - { - "nvim-pack/nvim-spectre", - }, + -- load extensions + for _, ext in ipairs(opts.extensions_list) do + telescope.load_extension(ext) + end + end, + }, + -- Multi buffer search + { + "nvim-pack/nvim-spectre", + }, + -- Multi buffer search + replace + { + 'gabrielpoca/replacer.nvim', + opts = { rename_files = false }, + keys = { + { + 'h', + function() require('replacer').run() end, + desc = "run replacer.nvim" + } + } + } } diff --git a/lua/plugins/style.lua b/lua/plugins/style.lua index 2f548e5..ce9be11 100644 --- a/lua/plugins/style.lua +++ b/lua/plugins/style.lua @@ -2,53 +2,53 @@ -- │ Styling │ -- ╰─────────╯ return { - { - -- dir = "~/Documents/Code/plain-colors.nvim", - "rose-pine/neovim", - name = "rose-pine", - opts = { - variant = "dawn", -- dark, light, darker | dawn - }, - }, + { + dir = "~/Documents/Code/plain-colors.nvim", + -- "rose-pine/neovim", + name = "rose-pine", + opts = { + variant = "darker", -- dark, light, darker | dawn + }, + }, - { "echasnovski/mini.icons" }, + { "echasnovski/mini.icons" }, - { - "folke/noice.nvim", - event = "VeryLazy", - opts = function() - return require("plugins.opts.noice") - end, - dependencies = { - "MunifTanjim/nui.nvim", - -- OPTIONAL: - -- `nvim-notify` is only needed, if you want to use the notification view. - -- If not available, we use `mini` as the fallback - -- "rcarriga/nvim-notify", - }, - }, + { + "folke/noice.nvim", + event = "VeryLazy", + opts = function() + return require("plugins.opts.noice") + end, + dependencies = { + "MunifTanjim/nui.nvim", + -- OPTIONAL: + -- `nvim-notify` is only needed, if you want to use the notification view. + -- If not available, we use `mini` as the fallback + -- "rcarriga/nvim-notify", + }, + }, - { - "shortcuts/no-neck-pain.nvim", - version = "*", - }, + { + "shortcuts/no-neck-pain.nvim", + version = "*", + }, - { - "sphamba/smear-cursor.nvim", - opts = { - smear_between_buffers = false, - smear_between_neighbor_lines = true, - scroll_buffer_space = true, - -- Set to `true` if your font supports legacy computing symbols (block unicode symbols). - legacy_computing_symbols_support = false, - smear_insert_mode = true, + { + "sphamba/smear-cursor.nvim", + opts = { + smear_between_buffers = false, + smear_between_neighbor_lines = true, + scroll_buffer_space = true, + -- Set to `true` if your font supports legacy computing symbols (block unicode symbols). + legacy_computing_symbols_support = false, + smear_insert_mode = true, - -- fast smear - stiffness = 0.8, -- 0.6 [0, 1] - trailing_stiffness = 0.5, -- 0.4 [0, 1] - stiffness_insert_mode = 0.6, -- 0.4 [0, 1] - trailing_stiffness_insert_mode = 0.6, -- 0.4 [0, 1] - distance_stop_animating = 0.5, -- 0.1 > 0 - }, - }, + -- fast smear + stiffness = 0.8, -- 0.6 [0, 1] + trailing_stiffness = 0.5, -- 0.4 [0, 1] + stiffness_insert_mode = 0.6, -- 0.4 [0, 1] + trailing_stiffness_insert_mode = 0.6, -- 0.4 [0, 1] + distance_stop_animating = 0.5, -- 0.1 > 0 + }, + }, }