diff --git a/lazy-lock.json b/lazy-lock.json index 6aa5fa5..3254c84 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,18 +1,17 @@ { - "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" }, + "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" }, - "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "bb3a17efc797c34c054463174e5522442576ebd8" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" }, "night-owl.nvim": { "branch": "main", "commit": "86ed124c2f7e118670649701288e024444bf91e5" }, - "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, - "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" }, - "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, - "nvim-treesitter-context": { "branch": "master", "commit": "5c48b8ba1b0b7b25feb6e34e7eb293ea893aedc4" }, - "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-lspconfig": { "branch": "master", "commit": "4d3b3bb8815fbe37bcaf3dbdb12a22382bc11ebe" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-context": { "branch": "master", "commit": "59f318a65d42a5c4037796886a8874fd57f774fc" }, + "nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" } + "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" } } diff --git a/lua/echavemann/init.lua b/lua/echavemann/init.lua index 7944495..ca16b54 100644 --- a/lua/echavemann/init.lua +++ b/lua/echavemann/init.lua @@ -6,7 +6,7 @@ vim.api.nvim_create_autocmd("LspAttach", { group = vim.api.nvim_create_augroup("UserLspConfig", {}), callback = function(ev) local opts = { buffer = ev.buf } - vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) + vim.keymap.set("n", "gd", require("telescope.builtin").lsp_definitions, opts) vim.keymap.set("n", "gD", function() vim.lsp.buf.declaration() end, opts) vim.keymap.set("n", "gt", function() vim.lsp.buf.type_definition() end, opts) vim.keymap.set("n", "gr", require("telescope.builtin").lsp_references, opts) diff --git a/lua/echavemann/lazy/alpha.lua b/lua/echavemann/lazy/alpha.lua index 888d0a8..97a967a 100644 --- a/lua/echavemann/lazy/alpha.lua +++ b/lua/echavemann/lazy/alpha.lua @@ -23,7 +23,7 @@ function M.config() } local function footer() - return "Be Insane or Die Trying." + return ">" end dashboard.section.footer.val = footer() diff --git a/lua/echavemann/lazy/blink.lua b/lua/echavemann/lazy/blink.lua index d372a43..88f7f44 100644 --- a/lua/echavemann/lazy/blink.lua +++ b/lua/echavemann/lazy/blink.lua @@ -1,14 +1,7 @@ return { 'saghen/blink.cmp', - -- optional: provides snippets for the snippet source - dependencies = { 'rafamadriz/friendly-snippets' }, - -- use a release tag to download pre-built binaries version = '1.*', - -- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust - -- build = 'cargo build --release', - -- If you use nix, you can build from source using latest nightly rust with: - -- build = 'nix run .#build-plugin', ---@module 'blink.cmp' ---@type blink.cmp.Config @@ -35,8 +28,8 @@ return { nerd_font_variant = 'mono' }, - -- (Default) Only show the documentation popup when manually triggered - completion = { documentation = { auto_show = true } }, + completion = { documentation = { auto_show = true, auto_show_delay_ms = 200}, + trigger = { show_on_trigger_character = true}}, -- Default list of enabled providers defined so that you can extend it -- elsewhere in your config, without redefining it, due to `opts_extend` diff --git a/lua/echavemann/lazy/lsp.lua b/lua/echavemann/lazy/lsp.lua index 7cb3555..88c4fa1 100644 --- a/lua/echavemann/lazy/lsp.lua +++ b/lua/echavemann/lazy/lsp.lua @@ -23,23 +23,15 @@ return { }, }, }) - vim.lsp.config("pylsp", { + + vim.lsp.config("pyrefly", { settings = { - pylsp = { - plugins = { - rope_autoimport = { - enabled = true, - memory = true, - }, - rope_completion = { - enabled = true, - }, - pycodestyle = { enabled = false }, - pyflakes = { enabled = true }, - mccabe = { enabled = false }, - }, - }, - }, + } + }) + + vim.lsp.config("clangd", { + settings = { + } }) require("mason").setup() @@ -47,7 +39,7 @@ return { ensure_installed = { "lua_ls", "clangd", - "pylsp", + "pyrefly", }, automatic_installation = true, }) diff --git a/lua/echavemann/lazy/telescope.lua b/lua/echavemann/lazy/telescope.lua index 5b6bb1a..79e274b 100644 --- a/lua/echavemann/lazy/telescope.lua +++ b/lua/echavemann/lazy/telescope.lua @@ -7,7 +7,6 @@ return { 'nvim-tree/nvim-web-devicons' }, config = function() - local actions = require("telescope.actions") local options = { defaults = { vimgrep_arguments = { @@ -46,6 +45,8 @@ return { vim.keymap.set("n", "f", builtin.find_files, {}) vim.keymap.set("n", "r", builtin.live_grep, {}) vim.keymap.set("n", "h", builtin.oldfiles, {}) + vim.keymap.set("n", "y", builtin.lsp_workspace_symbols, {}) + vim.keymap.set("n", "g", require("telescope.builtin").grep_string, {}) end } }