From 8197dd257d0c5642d7270de05874787fd0e106a3 Mon Sep 17 00:00:00 2001 From: David Senoner Date: Fri, 1 Nov 2024 23:15:13 +0100 Subject: [PATCH] nvim: move vim opts to separate file --- init.lua | 83 +++------------------------------------------ lua/vim-options.lua | 12 +++++++ 2 files changed, 16 insertions(+), 79 deletions(-) create mode 100644 lua/vim-options.lua diff --git a/init.lua b/init.lua index 9caf011..9e65493 100644 --- a/init.lua +++ b/init.lua @@ -1,11 +1,4 @@ -vim.opt.number = true -vim.opt.expandtab = true -vim.opt.number = true -vim.opt.tabstop = 2 -vim.opt.softtabstop = 2 -vim.opt.shiftwidth = 2 -vim.opt.title = true -vim.opt.whichwrap = "<,>,[,]" +require("vim-options") local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then @@ -18,77 +11,9 @@ if not vim.loop.fs_stat(lazypath) then lazypath, }) end + vim.opt.rtp:prepend(lazypath) - -local plugins = { - { "rebelot/kanagawa.nvim", name = "kanagawa", priority = 1000 }, - { - "nvim-telescope/telescope.nvim", tag = "0.1.8", - dependencies = { "nvim-lua/plenary.nvim" } - }, - { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, - { "williamboman/mason.nvim" }, - { "williamboman/mason-lspconfig.nvim" }, - { "neovim/nvim-lspconfig" }, - { "hrsh7th/nvim-cmp" }, - { "hrsh7th/cmp-nvim-lsp" }, -} - -require("lazy").setup(plugins, {}) - -vim.cmd.colorscheme "kanagawa-dragon" -local builtin = require("telescope.builtin") - -local configs = require("nvim-treesitter.configs") - -configs.setup({ - ensure_installed = { "asm", "c", "javascript", "latex", "lua", "matlab", "meson", "sql", "toml", "typescript", "verilog", "vue" }, - highlight = { enable = true }, - indent = { enable = true } +require("lazy").setup({ + spec = "plugins" }) -require("mason").setup() -require("mason-lspconfig").setup({ - ensure_installed = { "clangd", "texlab", "lua_ls", "matlab_ls", "mesonlsp", "sqlls", "svlangserver", "ts_ls", "volar" } -}) - -local lspconfig = require("lspconfig") - -lspconfig.clangd.setup({ - cmd = { "clangd", "-header-insertion=never" }, -}) -lspconfig.lua_ls.setup({}) -lspconfig.matlab_ls.setup({}) -lspconfig.mesonlsp.setup({}) -lspconfig.sqlls.setup({}) -lspconfig.svlangserver.setup({}) -lspconfig.texlab.setup({}) -lspconfig.ts_ls.setup({}) -lspconfig.volar.setup({}) - -local cmp = require("cmp") - -cmp.setup({ - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping.scroll_docs(-4), - [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), - [""] = cmp.mapping.abort(), - [""] = cmp.mapping.confirm({ select = true }), - }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - }), -}) - -vim.keymap.set("n", "T", function() vim.lsp.buf.definition() end, {}) -vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, {}) -vim.keymap.set("n", "J", function() vim.lsp.buf.type_definition() end, {}) -vim.keymap.set("n", "C", function() vim.lsp.buf.code_action() end, {}) - -vim.keymap.set("n", "", builtin.find_files, {}) -vim.keymap.set("n", "", builtin.live_grep, {}) diff --git a/lua/vim-options.lua b/lua/vim-options.lua new file mode 100644 index 0000000..a012d41 --- /dev/null +++ b/lua/vim-options.lua @@ -0,0 +1,12 @@ +vim.cmd("set number") +vim.cmd("set expandtab") +vim.cmd("set tabstop=2") +vim.cmd("set softtabstop=2") +vim.cmd("set shiftwidth=2") +vim.cmd("set title") + +vim.keymap.set("n", "T", function() vim.lsp.buf.definition() end, {}) +vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, {}) +vim.keymap.set("n", "J", function() vim.lsp.buf.type_definition() end, {}) +vim.keymap.set("n", "C", function() vim.lsp.buf.code_action() end, {}) +