From ebcb199805cdd63a36d2840f7e4989fc9830d650 Mon Sep 17 00:00:00 2001 From: Erica Marigold Date: Wed, 5 Feb 2025 00:39:41 +0530 Subject: [PATCH] Initial config divergence from luka Minor customizations for keybinds and adds luau-lsp support. --- after/ftplugin/lua.lua | 2 + after/ftplugin/rust.lua | 11 +++ init.lua | 1 + lazy-lock.json | 27 +++++++ lua/config/lazy.lua | 27 +++++++ lua/config/options.lua | 25 ++++++ lua/config/plugins/colorscheme.lua | 44 ++++++++++ lua/config/plugins/editor.lua | 26 ++++++ lua/config/plugins/files.lua | 14 ++++ lua/config/plugins/fuzzy_finder.lua | 31 +++++++ lua/config/plugins/lsp.lua | 120 ++++++++++++++++++++++++++++ lua/config/plugins/treesitter.lua | 16 ++++ lua/config/plugins/ui.lua | 62 ++++++++++++++ lua/config/plugins/which_key.lua | 16 ++++ stylua.toml | 1 + 15 files changed, 423 insertions(+) create mode 100644 after/ftplugin/lua.lua create mode 100644 after/ftplugin/rust.lua create mode 100644 init.lua create mode 100644 lazy-lock.json create mode 100644 lua/config/lazy.lua create mode 100644 lua/config/options.lua create mode 100644 lua/config/plugins/colorscheme.lua create mode 100644 lua/config/plugins/editor.lua create mode 100644 lua/config/plugins/files.lua create mode 100644 lua/config/plugins/fuzzy_finder.lua create mode 100644 lua/config/plugins/lsp.lua create mode 100644 lua/config/plugins/treesitter.lua create mode 100644 lua/config/plugins/ui.lua create mode 100644 lua/config/plugins/which_key.lua create mode 100644 stylua.toml diff --git a/after/ftplugin/lua.lua b/after/ftplugin/lua.lua new file mode 100644 index 0000000..3aec42b --- /dev/null +++ b/after/ftplugin/lua.lua @@ -0,0 +1,2 @@ +vim.opt_local.tabstop = 4 +vim.opt_local.shiftwidth = 4 diff --git a/after/ftplugin/rust.lua b/after/ftplugin/rust.lua new file mode 100644 index 0000000..4ad98d7 --- /dev/null +++ b/after/ftplugin/rust.lua @@ -0,0 +1,11 @@ +-- disable autopairs for ' in rust since they're used in lifetimes +vim.keymap.set("i", "'", "'", { buffer = true }) + +-- Rustaceanvim +local bufnr = vim.api.nvim_get_current_buf() +vim.keymap.set("n", "a", function() + vim.cmd.RustLsp("codeAction") +end, { silent = true, buffer = bufnr }) +vim.keymap.set("n", "K", function() + vim.cmd.RustLsp({ "hover", "actions" }) +end, { silent = true, buffer = bufnr }) diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..55b8979 --- /dev/null +++ b/init.lua @@ -0,0 +1 @@ +require("config.lazy") diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 0000000..3dfa6ca --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,27 @@ +{ + "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" }, + "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" }, + "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, + "luau-lsp.nvim": { "branch": "main", "commit": "f81c6c713e4598abc484cbeabca918475d176c54" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.ai": { "branch": "main", "commit": "25f598f5bcfa247de0be783882d0e02ae5432eb1" }, + "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" }, + "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, + "mini.statusline": { "branch": "main", "commit": "d6dbc163cc5ab2892a249c4c6060f1f088cc988f" }, + "mini.surround": { "branch": "main", "commit": "ceddea5fe862f13b279d9bbe81c3327a0e66d56b" }, + "noice.nvim": { "branch": "main", "commit": "e3c68a4d2275a01268a52e2931bfccfbfb693d15" }, + "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nvim-lspconfig": { "branch": "master", "commit": "66bc018936c6ff76beb75f89d986af6442db4001" }, + "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, + "nvim-treesitter": { "branch": "master", "commit": "53a6b3993f5803378d4d031bf114c0b125a52ba8" }, + "oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, + "rustaceanvim": { "branch": "master", "commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39" }, + "snacks.nvim": { "branch": "main", "commit": "e3c5944421dfc4639d42456fe6d5a0b6be8b646f" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, + "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, + "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" } +} diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua new file mode 100644 index 0000000..b2e967d --- /dev/null +++ b/lua/config/lazy.lua @@ -0,0 +1,27 @@ +-- Bootstrap lazy.nvim +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" +if not (vim.uv or vim.loop).fs_stat(lazypath) then + local lazyrepo = "https://github.com/folke/lazy.nvim.git" + local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath }) + if vim.v.shell_error ~= 0 then + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("config.options") + +-- Setup lazy.nvim +require("lazy").setup({ + spec = { + { import = "config.plugins" }, + }, + install = { colorscheme = { "catppuccin", "default" } }, + checker = { enabled = true }, +}) diff --git a/lua/config/options.lua b/lua/config/options.lua new file mode 100644 index 0000000..c079fda --- /dev/null +++ b/lua/config/options.lua @@ -0,0 +1,25 @@ +vim.g.mapleader = " " +vim.g.maplocalleader = "\\" + +vim.opt.expandtab = true +vim.opt.tabstop = 2 +vim.opt.shiftwidth = 2 + +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.cursorline = true +vim.opt.signcolumn = "yes" + +vim.opt.scrolloff = 8 +-- vim.opt.clipboard = "unnamedplus" +vim.opt.pumblend = 5 +vim.opt.winblend = 5 + +vim.keymap.set("n", "", "nohlsearch") +vim.keymap.set("n", "ft", "lua vim.lsp.buf.format()", { noremap = true, silent = true }) + +vim.api.nvim_create_autocmd("TextYankPost", { + callback = function() + vim.highlight.on_yank() + end, +}) diff --git a/lua/config/plugins/colorscheme.lua b/lua/config/plugins/colorscheme.lua new file mode 100644 index 0000000..d765ed3 --- /dev/null +++ b/lua/config/plugins/colorscheme.lua @@ -0,0 +1,44 @@ +return { + { + "catppuccin/nvim", + name = "catppuccin", + priority = 1000, + config = function() + require("catppuccin").setup({ + flavour = "mocha", + transparent_background = true, + no_italic = true, + custom_highlights = function(colors) + return { + MiniStatuslineDevinfo = { fg = colors.subtext1, bg = colors.surface0 }, + MiniStatuslineFileinfo = { fg = colors.subtext1, bg = colors.surface0 }, + SnacksIndent = { fg = colors.surface0 }, + SnacksIndentScope = { fg = colors.surface2 }, + BlinkCmpDocSeparator = { fg = colors.surface1 }, + } + end, + integrations = { + blink_cmp = true, + fidget = true, + mason = true, + noice = true, + notify = true, + snacks = true, + which_key = true, + }, + }) + + vim.cmd([[colorscheme catppuccin]]) + + -- Highlights horizontal rulers in rendered markdown in LSP hover docs. + vim.api.nvim_create_autocmd("BufWinEnter", { + pattern = "*", + callback = function() + if vim.bo.filetype == "markdown" then + vim.fn.matchadd("WinSeparator", "^─\\+$") + end + end, + }) + end, + }, +} diff --git a/lua/config/plugins/editor.lua b/lua/config/plugins/editor.lua new file mode 100644 index 0000000..e1cafb9 --- /dev/null +++ b/lua/config/plugins/editor.lua @@ -0,0 +1,26 @@ +return { + { + "echasnovski/mini.ai", + opts = {}, + }, + { + "echasnovski/mini.surround", + opts = {}, + }, + { + "echasnovski/mini.pairs", + opts = {}, + }, + { + "folke/snacks.nvim", + opts = { + indent = { + enabled = true, + }, + }, + }, + { + "lewis6991/gitsigns.nvim", + opts = {}, + }, +} diff --git a/lua/config/plugins/files.lua b/lua/config/plugins/files.lua new file mode 100644 index 0000000..9fae35a --- /dev/null +++ b/lua/config/plugins/files.lua @@ -0,0 +1,14 @@ +return { + { + "stevearc/oil.nvim", + lazy = false, + keys = { + { "-", "Oil", desc = "Oil" }, + }, + opts = { + win_options = { + signcolumn = "yes", + }, + }, + }, +} diff --git a/lua/config/plugins/fuzzy_finder.lua b/lua/config/plugins/fuzzy_finder.lua new file mode 100644 index 0000000..b4f3ca8 --- /dev/null +++ b/lua/config/plugins/fuzzy_finder.lua @@ -0,0 +1,31 @@ +local function telescope_builtin(name) + return function() + require("telescope.builtin")[name]() + end +end + +return { + { + "nvim-telescope/telescope.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + { "nvim-telescope/telescope-fzf-native.nvim", build = "make" }, + }, + keys = { + { "", telescope_builtin("find_files"), desc = "Telescope find files" }, + { "fh", telescope_builtin("help_tags"), desc = "Telescope find help" }, + }, + cmd = "Telescope", + config = function() + require("telescope").setup({ + defaults = { + winblend = 0, + }, + extensions = { + fzf = {}, + }, + }) + require("telescope").load_extension("fzf") + end, + }, +} diff --git a/lua/config/plugins/lsp.lua b/lua/config/plugins/lsp.lua new file mode 100644 index 0000000..f5fd818 --- /dev/null +++ b/lua/config/plugins/lsp.lua @@ -0,0 +1,120 @@ +return { + { + "williamboman/mason.nvim", + opts = {}, + }, + { + "williamboman/mason-lspconfig.nvim", + dependencies = { + "williamboman/mason.nvim", + "neovim/nvim-lspconfig", + "saghen/blink.cmp", + }, + opts = { + servers = { + lua_ls = {}, + }, + }, + config = function(_, opts) + require("mason").setup() + require("mason-lspconfig").setup() + + local lspconfig = require("lspconfig") + + local function on_attach(_, buf) + local function map(keys, fn, desc) + vim.keymap.set("n", keys, fn, { buffer = buf, desc = "LSP: " .. desc }) + end + + map("cr", vim.lsp.buf.rename, "Rename") + map("ca", vim.lsp.buf.code_action, "Code Action") + map("gd", require("telescope.builtin").lsp_definitions, "Goto Definition") + map("gr", require("telescope.builtin").lsp_references, "Goto References") + end + + for server, config in pairs(opts.servers) do + config.capabilities = require("blink.cmp").get_lsp_capabilities(config.capabilities) + config.on_attach = on_attach + + lspconfig[server].setup(config) + end + end, + }, + { + "saghen/blink.cmp", + version = "*", + opts = { + sources = { + default = { "lazydev", "lsp", "path", "snippets", "buffer" }, + providers = { + lazydev = { + name = "LazyDev", + module = "lazydev.integrations.blink", + score_offset = 100, + }, + }, + }, + signature = { + enabled = true, + }, + keymap = { + -- [""] = { "select_and_accept" }, + [""] = { + function(cmp) + if cmp.snippet_active() then + return cmp.accept() + else + return cmp.select_and_accept() + end + end, + 'snippet_forward', + 'fallback' + }, + [""] = { "show", "show_documentation", "hide_documentation" }, + } + }, + }, + { + "folke/lazydev.nvim", + ft = "lua", + opts = { + library = { + { path = "${3rd}/luv/library", words = { "vim%.uv" } }, + }, + }, + }, + { + "mrcjkb/rustaceanvim", + lazy = false, + }, + { + "lopi-py/luau-lsp.nvim", + opts = { + server = { + settings = { + ["luau-lsp"] = { + require = { + mode = "relativeToFile", + directoryAliases = { + ["@lune"] = "~/.lune/.typedefs/0.8.6/", + ["@lib"] = "./lib", + ["@src"] = "./src", + }, + }, + completion = { + imports = { + enabled = true, + }, + }, + }, + }, + }, + platform = { + type = "standard", + } + }, + dependencies = { + "nvim-lua/plenary.nvim", + }, + } +} diff --git a/lua/config/plugins/treesitter.lua b/lua/config/plugins/treesitter.lua new file mode 100644 index 0000000..8e8232a --- /dev/null +++ b/lua/config/plugins/treesitter.lua @@ -0,0 +1,16 @@ +return { + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local configs = require("nvim-treesitter.configs") + + configs.setup({ + ensure_installed = { "lua", "rust", "typescript", "javascript", "html", "css" }, + sync_install = false, + highlight = { enable = true }, + indent = { enable = true }, + }) + end, + }, +} diff --git a/lua/config/plugins/ui.lua b/lua/config/plugins/ui.lua new file mode 100644 index 0000000..e605585 --- /dev/null +++ b/lua/config/plugins/ui.lua @@ -0,0 +1,62 @@ +return { + { + "echasnovski/mini.statusline", + opts = {}, + }, + { + "echasnovski/mini.icons", + opts = { + default = { + directory = { + hl = "MiniIconsBlue", + }, + }, + }, + }, + { + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { + "MunifTanjim/nui.nvim", + { + "rcarriga/nvim-notify", + opts = { + on_open = function(win) + vim.api.nvim_set_option_value("winblend", 0, { win = win }) + end, + }, + } + }, + opts = { + views = { + mini = { + win_options = { + winblend = 0, + }, + }, + cmdline_popup = { + win_options = { + winblend = 0, + }, + }, + notify = { + win_options = { + winblend = 0, + }, + }, + }, + lsp = { + signature = { + enabled = false, + }, + }, + format = { + lsp_progress_done = { + { "󰄬 ", hl_group = "NoiceLspProgressSpinner" }, + { "{data.progress.title} ", hl_group = "NoiceLspProgressTitle" }, + { "{data.progress.client} ", hl_group = "NoiceLspProgressClient" }, + }, + } + }, + } +} diff --git a/lua/config/plugins/which_key.lua b/lua/config/plugins/which_key.lua new file mode 100644 index 0000000..ee4e5fc --- /dev/null +++ b/lua/config/plugins/which_key.lua @@ -0,0 +1,16 @@ +return { + { + "folke/which-key.nvim", + event = "VeryLazy", + keys = { + { + "?", + function() + require("which-key").show({ global = false }) + end, + desc = "Buffer Local Keymaps (which-key)", + }, + }, + opts = {}, + }, +} diff --git a/stylua.toml b/stylua.toml new file mode 100644 index 0000000..394e884 --- /dev/null +++ b/stylua.toml @@ -0,0 +1 @@ +indent_type = "Spaces"