From a109dc1f559fada98e499f7e9bb047f8427d6280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Kore=C5=84?= Date: Fri, 25 Apr 2025 12:16:55 +0200 Subject: [PATCH] Update init.lua --- .config/nvim/init.lua | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index e42846a..f1913df 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -4,7 +4,7 @@ vim.opt.number = true vim.opt.relativenumber = true vim.opt.hlsearch = false vim.opt.incsearch = true -vim.opt.colorcolumn = "80" +vim.opt.colorcolumn = "80,120" vim.opt.tabstop = 4 vim.opt.softtabstop = 4 @@ -14,6 +14,18 @@ vim.opt.expandtab = true vim.opt.smartindent = true vim.opt.scrolloff = 8 +-- :map [[ ?{w99[{ +-- :map ][ /}b99]} +-- :map ]] j0[[%/{ +-- :map [] k$][%?} +-- rewrite in lua +-- vim.keymap.set({ "n" }, "[[", function() vim.cmd("normal ?{\w99[{") end, { silent = true }) +-- vim.keymap.set({ "n" }, "][", function() vim.cmd("normal /}\b99]}") end, { silent = true }) +-- vim.keymap.set({ "n" }, "]]", function() vim.cmd("normal j0[[%/{\") end, { silent = true }) +-- vim.keymap.set({ "n" }, "[]", function() vim.cmd("normal k$][%?}\") end, { silent = true }) + + + local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then vim.fn.system({ @@ -43,9 +55,11 @@ require("lazy").setup({ branch = 'v3.x' }, { 'neovim/nvim-lspconfig' }, + { 'github/copilot.vim' }, { 'hrsh7th/cmp-nvim-lsp' }, { 'hrsh7th/cmp-buffer' }, { 'hrsh7th/cmp-path' }, + { 'hrsh7th/cmp-cmdline' }, { 'hrsh7th/nvim-cmp' }, { 'saadparwaiz1/cmp_luasnip' }, { @@ -85,7 +99,8 @@ lsp_zero.setup() require('mason').setup({}) require('mason-lspconfig').setup({ - ensure_installed = { 'lua_ls', 'rust_analyzer' }, + ensure_installed = { 'lua_ls', 'rust_analyzer', 'clangd', 'biome', 'cmake', + 'dockerls', 'html', 'grammarly', 'zls' }, handlers = { lsp_zero.default_setup, }, @@ -152,6 +167,25 @@ cmp.setup({ --- (Optional) Show source name in completion menu formatting = cmp_format, }) +cmp.setup.cmdline('/', { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = 'buffer' } + } +}) +cmp.setup.cmdline(':', { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = 'path' } + }, { + { + name = 'cmdline', + option = { + ignore_cmds = { 'Man', '!' } + } + } + }) +}) require("luasnip.loaders.from_vscode").lazy_load() -- markdown