From 25f24f96dbca886b46c545ae0fd0d153d599332a Mon Sep 17 00:00:00 2001 From: vx_clutch <98831688+vx-clutch@users.noreply.github.com> Date: Mon, 6 Oct 2025 13:24:57 -0400 Subject: [PATCH] Update init.lua --- nvim/.config/nvim/init.lua | 60 +++++++++----------------------------- 1 file changed, 14 insertions(+), 46 deletions(-) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index d1af75b..c866467 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -2,72 +2,40 @@ vim.opt.number = true vim.opt.relativenumber = true vim.opt.swapfile = false vim.opt.wrap = false -vim.opt.winborder = "rounded" vim.opt.splitright = true vim.opt.splitbelow = true -vim.opt.wildoptions = {} vim.g.mapleader = " " -vim.keymap.set("n", "", ":nohlsearch") -vim.keymap.set("n", "f", vim.lsp.buf.format) -vim.keymap.set("n", "r>", ":make") -vim.keymap.set("n", "o", ":Pick files") vim.keymap.set("v", "J", ":m '>+1gv=gv") vim.keymap.set("v", "K", ":m '<-2gv=gv") for _, k in ipairs({ "h", "j", "k", "l" }) do vim.keymap.set({ "n", "i", "v" }, "", "") end -vim.keymap.set("n", "en", ":edit $XDG_CONFIG_HOME/nvim/init.lua") -vim.keymap.set("n", "ez", ":edit $ZSHRC") -vim.keymap.set("n", "ed", ":edit $DO") - -vim.keymap.set("n", "", function() - local ext = vim.fn.expand("%:e") - local base = vim.fn.expand("%:r") - local alt - if ext == "c" then - alt = base .. ".h" - elseif ext == "h" then - alt = base .. ".c" - else - return - end - vim.cmd("edit " .. alt) -end) - -vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = "*", - callback = function() - local ext = vim.fn.expand("%:e") - local firstline = vim.fn.getline(1) - if ext == "" and not firstline:match("^#!") then - vim.bo.filetype = "noext" - end - end, -}) - -vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, { - pattern = "*.h", - callback = function() - vim.bo.filetype = "c" - end, -}) +vim.keymap.set("n", "en", ":edit " .. vim.fn.expand("$MYVIMRC") .. "") +vim.keymap.set("n", "ez", ":edit ~/.zshrc") vim.pack.add { - { src = "https://github.com/echasnovski/mini.pick" }, + { src = "https://github.com/nvim-telescope/telescope.nvim" }, { src = "https://github.com/mason-org/mason.nvim" }, - { src = "https://github.com/neovim/nvim-lspconfig" }, { src = "https://github.com/vague2k/vague.nvim" }, } require("mini.pick").setup() require("mason").setup() +require("telescope").setup() + +local builtin = require('telescope.builtin') +vim.keymap.set('n', 'sf', builtin.find_files) +vim.keymap.set('n', 'sg', builtin.live_grep) +vim.keymap.set('n', 'sb', builtin.buffers) +vim.keymap.set('n', 'sh', builtin.help_tags) +vim.keymap.set('n', 'sm', builtin.man_pages) vim.lsp.config.clangd = { - filetypes = { "c", "cpp" }, + filetypes = { "c", "cpp", "h", "hpp" }, init_options = { - compilationDatabasePath = "build", + compilationDatabasePath = ".", }, on_attach = function(client, bufnr) if vim.bo.filetype == "c" and vim.fn.expand("%:e") == "h" then @@ -78,7 +46,7 @@ vim.lsp.config.clangd = { } -vim.lsp.enable { "lua_ls", "clangd", "beautysh" } +vim.lsp.enable { "clangd" } vim.diagnostic.config { virtual_text = true, underline = true, signs = false } vim.cmd.colorscheme("vague")