diff --git a/lazy-lock.json b/lazy-lock.json index 39bfb4f..145562d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,14 +1,17 @@ { - "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, + "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" }, "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "discord.nvim": { "branch": "main", "commit": "32d112aa0401d797790ac41334e93c0860319adf" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, + "lazy.nvim": { "branch": "main", "commit": "7527af40ddd4a93a02911be570b32609b9d4ea53" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" }, - "nvim-lspconfig": { "branch": "master", "commit": "339ccc81e08793c3af9b83882a6ebd90c9cc0d3b" }, - "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" }, + "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, + "nvim-lspconfig": { "branch": "master", "commit": "00b236b795acfb79339bd6771488c155073a2889" }, + "nvim-treesitter": { "branch": "master", "commit": "4e701776f8824fc188a6254f57d080971ce28c92" }, + "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" } + "rustaceanvim": { "branch": "master", "commit": "66d688fc6934dde2f1c4b0139682fe7b3935f154" }, + "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, + "vim-eunuch": { "branch": "master", "commit": "e86bb794a1c10a2edac130feb0ea590a00d03f1e" } } diff --git a/lua/moonleay/init.lua b/lua/moonleay/init.lua index c8933b3..82cb365 100644 --- a/lua/moonleay/init.lua +++ b/lua/moonleay/init.lua @@ -6,3 +6,4 @@ require("moonleay.remap") require("moonleay.discord") require("moonleay.lualine") require("moonleay.scope") +require("moonleay.tree") diff --git a/lua/moonleay/lazy.lua b/lua/moonleay/lazy.lua index 86fcbaf..a1048c0 100644 --- a/lua/moonleay/lazy.lua +++ b/lua/moonleay/lazy.lua @@ -36,5 +36,17 @@ require('lazy').setup({ { 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } + }, + { + 'tpope/vim-eunuch' }, + { + 'mrcjkb/rustaceanvim', + version = '^5', -- Recommended + lazy = false, -- This plugin is already lazy + }, + { + 'nvim-treesitter/nvim-treesitter', + execute = "TSUpdate" + } }) diff --git a/lua/moonleay/lsp.lua b/lua/moonleay/lsp.lua index 3133277..7b2c5de 100644 --- a/lua/moonleay/lsp.lua +++ b/lua/moonleay/lsp.lua @@ -28,7 +28,9 @@ vim.api.nvim_create_autocmd('LspAttach', { end, }) -require('lspconfig').rust_analyzer.setup({}) +require("mason-lspconfig").setup_handlers { + ["rust_analyzer"] = function() end, +} require("lspconfig").clangd.setup({ settings = { clangd = { @@ -45,6 +47,7 @@ require("lspconfig").clangd.setup({ require('lspconfig').bashls.setup({}) require('lspconfig').neocmake.setup({}) +require('lspconfig').sqls.setup({}) require('mason').setup({}) diff --git a/lua/moonleay/remap.lua b/lua/moonleay/remap.lua index 8992cdf..b297990 100644 --- a/lua/moonleay/remap.lua +++ b/lua/moonleay/remap.lua @@ -20,3 +20,23 @@ end vim.keymap.set('n', 'C-h', quickfix, opts) vim.g.mapleader = " " + + +local bufnr = vim.api.nvim_get_current_buf() +vim.keymap.set( + "n", + "a", + function() + vim.cmd.RustLsp('codeAction') -- supports rust-analyzer's grouping + -- or vim.lsp.buf.codeAction() if you don't want grouping. + end, + { silent = true, buffer = bufnr } +) +vim.keymap.set( + "n", + "K", -- Override Neovim's built-in hover keymap with rustaceanvim's hover actions + function() + vim.cmd.RustLsp({'hover', 'actions'}) + end, + { silent = true, buffer = bufnr } +) diff --git a/lua/moonleay/tree.lua b/lua/moonleay/tree.lua new file mode 100644 index 0000000..8d5f45a --- /dev/null +++ b/lua/moonleay/tree.lua @@ -0,0 +1 @@ +require("nvim-treesitter.install").prefer_git = true