diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-08-10 17:24:55 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-08-10 17:24:55 -0400 |
| commit | 5067f7ee7acad01409bfb631a28b55ba35dc39d3 (patch) | |
| tree | a2eb7aff3c3ec987835e1579c86539e8cdf28f80 | |
| parent | Update dotfiles for gpg and env changes (diff) | |
| download | dotfiles-5067f7ee7acad01409bfb631a28b55ba35dc39d3.zip | |
update vim config
| -rw-r--r-- | .config/nvim/init.lua | 320 | ||||
| -rw-r--r-- | homebrew/Brewfile | 1 |
2 files changed, 243 insertions, 78 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index dc70561..1260ba5 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,38 +1,38 @@ -- Flash screen instead of beep sound vim.opt.visualbell = true -vim.opt.encoding = 'utf-8' -vim.opt.fileencoding = 'utf-8' +vim.opt.encoding = "utf-8" +vim.opt.fileencoding = "utf-8" vim.opt.number = true vim.opt.linebreak = true vim.opt.splitbelow = true vim.opt.splitright = true vim.opt.shiftwidth = 4 -vim.opt.backspace = { 'indent', 'eol', 'start' } -vim.cmd('filetype plugin indent on') +vim.opt.backspace = { "indent", "eol", "start" } +vim.cmd("filetype plugin indent on") -- Whitespace settings per filetype -vim.api.nvim_create_autocmd('FileType', { - pattern = 'python', - command = 'setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4' +vim.api.nvim_create_autocmd("FileType", { + pattern = "python", + command = "setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4", }) -vim.api.nvim_create_autocmd({'BufNewFile', 'BufRead'}, { - pattern = '*.go', - command = 'setlocal noet tabstop=4 shiftwidth=4 softtabstop=4' +vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, { + pattern = "*.go", + command = "setlocal noet tabstop=4 shiftwidth=4 softtabstop=4", }) -vim.api.nvim_create_autocmd('FileType', { - pattern = {'javascript', 'typescript', 'java', 'rust', 'c', 'cpp'}, - command = 'setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2' +vim.api.nvim_create_autocmd("FileType", { + pattern = { "javascript", "typescript", "java", "rust", "c", "cpp", "lua" }, + command = "setlocal expandtab tabstop=2 shiftwidth=2 softtabstop=2", }) -- Automatically install packer.nvim if not installed local ensure_packer = function() local fn = vim.fn - local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim' + local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" if fn.empty(fn.glob(install_path)) > 0 then - fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path}) - vim.cmd [[packadd packer.nvim]] + fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path }) + vim.cmd([[packadd packer.nvim]]) return true end return false @@ -49,96 +49,123 @@ vim.cmd([[ ]]) -- Plugin manager setup using packer.nvim -require('packer').startup(function(use) +require("packer").startup(function(use) -- Packer can manage itself - use 'wbthomason/packer.nvim' + use("wbthomason/packer.nvim") -- Auto complete - use 'neovim/nvim-lspconfig' - use 'hrsh7th/nvim-cmp' - use 'hrsh7th/cmp-nvim-lsp' - use 'hrsh7th/cmp-buffer' - use 'hrsh7th/cmp-path' - use 'hrsh7th/cmp-cmdline' + use("neovim/nvim-lspconfig") + use("hrsh7th/nvim-cmp") + use("hrsh7th/cmp-nvim-lsp") + use("hrsh7th/cmp-buffer") + use("hrsh7th/cmp-path") + use("hrsh7th/cmp-cmdline") - -- Fuzzy finder - use { 'junegunn/fzf', run = 'fzf#install()' } - use 'junegunn/fzf.vim' + -- Telescope for advanced searching + use({ + "nvim-telescope/telescope.nvim", + tag = "0.1.8", + requires = { { "nvim-lua/plenary.nvim" } }, + }) + + -- Telescope FZF extension + use({ "nvim-telescope/telescope-fzf-native.nvim", run = "make" }) + + -- Tags-based plugin for searching symbols + use("ludovicchabant/vim-gutentags") -- Git gutter - use 'airblade/vim-gitgutter' + use("airblade/vim-gitgutter") -- Status bar - use 'nvim-lualine/lualine.nvim' + use("nvim-lualine/lualine.nvim") -- Git wrapper with :G - use 'tpope/vim-fugitive' + use("tpope/vim-fugitive") -- Editorconfig file support - use 'editorconfig/editorconfig-vim' + use("editorconfig/editorconfig-vim") -- Theme - use 'sainnhe/everforest' + use("sainnhe/everforest") -- Go support - use { 'fatih/vim-go', run = ':GoUpdateBinaries' } + use({ "fatih/vim-go", run = ":GoUpdateBinaries" }) -- Treesitter for better syntax highlighting - use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } + use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }) -- File explorer - use 'kyazdani42/nvim-tree.lua' + use("kyazdani42/nvim-tree.lua") -- LSP Installer - use 'williamboman/mason.nvim' - use 'williamboman/mason-lspconfig.nvim' + use("williamboman/mason.nvim") + use("williamboman/mason-lspconfig.nvim") + + -- Install luasnip and friendly-snippets + use({ + "L3MON4D3/LuaSnip", + requires = { "rafamadriz/friendly-snippets" }, + }) + + use({ + "jose-elias-alvarez/null-ls.nvim", + requires = { "nvim-lua/plenary.nvim" }, + }) - -- Automatically set up your configuration after cloning packer.nvim - -- Put this at the end after all plugins + -- Automatically set up configuration after cloning packer.nvim + -- This should be kept at the end after all plugins if packer_bootstrap then - require('packer').sync() + require("packer").sync() end end) --- Setup LSP for C/C++ with clangd -local status_ok_mason, mason = pcall(require, "mason") -if status_ok_mason then - mason.setup() -end - -local status_ok_mason_lspconfig, mason_lspconfig = pcall(require, "mason-lspconfig") -if status_ok_mason_lspconfig then - mason_lspconfig.setup() -end +-- Null ls setup +local null_ls = require("null-ls") -local status_ok_lspconfig, lspconfig = pcall(require, "lspconfig") -if status_ok_lspconfig then - lspconfig.clangd.setup{} -end +null_ls.setup({ + sources = { + null_ls.builtins.formatting.stylua, + }, +}) -- Treesitter setup -require'nvim-treesitter.configs'.setup { +require("nvim-treesitter.configs").setup({ ensure_installed = { - "c", "cpp", "go", "python", "javascript", "typescript", "java", "rust" + "c", + "cpp", + "go", + "python", + "javascript", + "typescript", + "java", + "rust", + "lua", }, highlight = { enable = true, }, -} + incremental_selection = { + enable = true, + }, + indent = { + enable = true, + }, +}) -- Lualine setup -require('lualine').setup { +require("lualine").setup({ options = { - theme = 'everforest', - section_separators = {'', ''}, - component_separators = {'', ''}, - } -} + theme = "everforest", + section_separators = { "", "" }, + component_separators = { "", "" }, + }, +}) -- Nvim-tree setup -require'nvim-tree'.setup { +require("nvim-tree").setup({ view = { - side = 'left', + side = "left", width = 30, }, actions = { @@ -146,28 +173,165 @@ require'nvim-tree'.setup { quit_on_open = false, }, }, -} +}) + +-- Mason setup +require("mason").setup() +require("mason-lspconfig").setup({ + ensure_installed = { "clangd", "pyright", "gopls", "tsserver", "rust_analyzer", "jdtls", "lua_ls" }, +}) + +-- Setup luasnip with nvim-cmp +local cmp = require("cmp") +local luasnip = require("luasnip") + +require("luasnip.loaders.from_vscode").lazy_load() + +cmp.setup({ + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + mapping = { + ["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }), + ["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }), + ["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), + ["<C-y>"] = cmp.config.disable, + ["<C-e>"] = cmp.mapping({ + i = cmp.mapping.abort(), + c = cmp.mapping.close(), + }), + ["<CR>"] = cmp.mapping.confirm({ select = true }), + ["<Tab>"] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "s" }), + ["<S-Tab>"] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "s" }), + }, + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "treesitter" }, + { name = "buffer" }, + { name = "path" }, + }), +}) + +-- Setup lspconfig. +local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()) + +local lspconfig = require("lspconfig") +local lsp_servers = { "clangd", "pyright", "gopls", "tsserver", "rust_analyzer", "jdtls", "lua_ls" } + +-- Custom configuration for lua_ls +lspconfig.lua_ls.setup({ + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = "LuaJIT", + -- Setup your lua path + path = vim.split(package.path, ";"), + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = { "vim" }, + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = { + [vim.fn.expand("$VIMRUNTIME/lua")] = true, + [vim.fn.stdpath("config") .. "/lua"] = true, + }, + }, + telemetry = { + enable = false, + }, + }, + }, +}) + +for _, lsp in ipairs(lsp_servers) do + if lsp ~= "lua_ls" then + lspconfig[lsp].setup({ + capabilities = capabilities, + }) + end +end + +-- Telescope setup +require("telescope").setup({ + defaults = { + vimgrep_arguments = { + "rg", + "--color=never", + "--no-heading", + "--with-filename", + "--line-number", + "--column", + "--smart-case", + }, + prompt_prefix = "> ", + selection_caret = "> ", + path_display = { "smart" }, + }, + pickers = { + find_files = { + theme = "dropdown", + }, + live_grep = { + theme = "dropdown", + }, + buffers = { + theme = "dropdown", + }, + help_tags = { + theme = "dropdown", + }, + }, + extensions = { + fzf = { + fuzzy = true, + override_generic_sorter = true, + override_file_sorter = true, + case_mode = "smart_case", + }, + }, +}) + +require("telescope").load_extension("fzf") -- Theme setup vim.opt.termguicolors = true -vim.g.everforest_background = 'soft' +vim.g.everforest_background = "soft" vim.g.everforest_better_performance = 1 vim.g.everforest_disable_italic_comment = 1 -vim.cmd('colorscheme everforest') +vim.cmd("colorscheme everforest") -- Syntax highlighting -vim.cmd('syntax on') +vim.cmd("syntax on") -- Key mappings -vim.api.nvim_set_keymap('n', '<leader>ff', ':Files<CR>', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '<leader>fg', ':GFiles<CR>', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '<leader>gs', ':G<CR>', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '<leader>gd', ':Gdiff<CR>', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '<leader>q', ':q<CR>', { noremap = true, silent = true }) -vim.api.nvim_set_keymap('n', '<leader>w', ':w<CR>', { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>ff", ":Telescope find_files<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>fg", ":Telescope live_grep<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>fs", ":Telescope treesitter<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>fb", ":Telescope buffers<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>ls", ":Telescope lsp_document_symbols<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>lw", ":Telescope lsp_workspace_symbols<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>gs", ":G<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>gd", ":Gdiff<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>q", ":q<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap("n", "<leader>w", ":w<CR>", { noremap = true, silent = true }) +vim.api.nvim_set_keymap( + "n", + "<leader>lf", + ":lua vim.lsp.buf.format({ async = true })<CR>", + { noremap = true, silent = true } +) + +vim.api.nvim_set_keymap("i", "<C-k>", "<cmd>lua require'luasnip'.jump(1)<CR>", { silent = true }) +vim.api.nvim_set_keymap("i", "<C-j>", "<cmd>lua require'luasnip'.jump(-1)<CR>", { silent = true }) +vim.api.nvim_set_keymap("s", "<C-k>", "<cmd>lua require'luasnip'.jump(1)<CR>", { silent = true }) +vim.api.nvim_set_keymap("s", "<C-j>", "<cmd>lua require'luasnip'.jump(-1)<CR>", { silent = true }) -- Command to run C programs -vim.api.nvim_create_user_command('RunC', function(opts) - vim.cmd('!./' .. vim.fn.expand('%<') .. ' ' .. opts.args) +vim.api.nvim_create_user_command("RunC", function(opts) + vim.cmd("!./" .. vim.fn.expand("%<") .. " " .. opts.args) end, { nargs = 1 }) - diff --git a/homebrew/Brewfile b/homebrew/Brewfile index 2fe80a0..ac5d0c6 100644 --- a/homebrew/Brewfile +++ b/homebrew/Brewfile @@ -44,6 +44,7 @@ brew "ripgrep" brew "rsync" brew "speedtest-cli" brew "splint" +brew "stylua" brew "tldr" brew "wget" brew "yt-dlp" |