From f5adba476494fac0cf6084644d0984c21920ca93 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Wed, 18 Oct 2023 11:44:57 +0200 Subject: [PATCH] first commit --- init.lua | 6 ++ lua/colorscheme.lua | 9 ++ lua/config/nvim-cmp.lua | 80 +++++++++++++++ lua/keymaps.lua | 50 ++++++++++ lua/lsp.lua | 16 +++ lua/options.lua | 26 +++++ lua/plugins.lua | 74 ++++++++++++++ plugin/packer_compiled.lua | 199 +++++++++++++++++++++++++++++++++++++ 8 files changed, 460 insertions(+) create mode 100644 init.lua create mode 100644 lua/colorscheme.lua create mode 100644 lua/config/nvim-cmp.lua create mode 100644 lua/keymaps.lua create mode 100644 lua/lsp.lua create mode 100644 lua/options.lua create mode 100644 lua/plugins.lua create mode 100644 plugin/packer_compiled.lua diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..aad2678 --- /dev/null +++ b/init.lua @@ -0,0 +1,6 @@ +require('plugins') +require('options') +require('keymaps') +require('colorscheme') +require('lsp') + diff --git a/lua/colorscheme.lua b/lua/colorscheme.lua new file mode 100644 index 0000000..cf76673 --- /dev/null +++ b/lua/colorscheme.lua @@ -0,0 +1,9 @@ +-- define your colorscheme here +local colorscheme = 'monokai_pro' + +local is_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme) +if not is_ok then + vim.notify('colorscheme ' .. colorscheme .. ' not found!') + return +end + diff --git a/lua/config/nvim-cmp.lua b/lua/config/nvim-cmp.lua new file mode 100644 index 0000000..1b5b601 --- /dev/null +++ b/lua/config/nvim-cmp.lua @@ -0,0 +1,80 @@ +local has_words_before = function() + unpack = unpack or table.unpack + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil +end + +local luasnip = require("luasnip") +local cmp = require("cmp") + +cmp.setup({ + snippet = { + -- REQUIRED - you must specify a snippet engine + expand = function(args) + require('luasnip').lsp_expand(args.body) -- For `luasnip` users. + end, + }, + mapping = cmp.mapping.preset.insert({ + -- Use to scroll the docs + [''] = cmp.mapping.scroll_docs( -4), + [''] = cmp.mapping.scroll_docs(4), + -- Use to switch in items + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + -- Use (Enter) to confirm selection + -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + [''] = cmp.mapping.confirm({ select = true }), + + -- A super tab + -- sourc: https://github.com/hrsh7th/nvim-cmp/wiki/Example-mappings#luasnip + [""] = cmp.mapping(function(fallback) + -- Hint: if the completion menu is visible select next one + if cmp.visible() then + cmp.select_next_item() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { "i", "s" }), -- i - insert mode; s - select mode + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable( -1) then + luasnip.jump( -1) + else + fallback() + end + end, { "i", "s" }), + }), + + -- Let's configure the item's appearance + -- source: https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance + formatting = { + -- Set order from left to right + -- kind: single letter indicating the type of completion + -- abbr: abbreviation of "word"; when not empty it is used in the menu instead of "word" + -- menu: extra text for the popup menu, displayed after "word" or "abbr" + fields = { 'abbr', 'menu' }, + + -- customize the appearance of the completion menu + format = function(entry, vim_item) + vim_item.menu = ({ + nvim_lsp = '[Lsp]', + luasnip = '[Luasnip]', + buffer = '[File]', + path = '[Path]', + })[entry.source.name] + return vim_item + end, + }, + + -- Set source precedence + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, -- For nvim-lsp + { name = 'luasnip' }, -- For luasnip user + { name = 'buffer' }, -- For buffer word completion + { name = 'path' }, -- For path completion + }) +}) + diff --git a/lua/keymaps.lua b/lua/keymaps.lua new file mode 100644 index 0000000..c25fb5c --- /dev/null +++ b/lua/keymaps.lua @@ -0,0 +1,50 @@ +-- define common options +local opts = { + noremap = true, -- non-recursive + silent = true, -- do not show message +} + +----------------- +-- Normal mode -- +----------------- + +-- Hint: see `:h vim.map.set()` +-- Better window navigation +vim.api.nvim_set_keymap('n', '', 'h', opts) +vim.api.nvim_set_keymap('n', '', 'j', opts) +vim.api.nvim_set_keymap('n', '', 'k', opts) +vim.api.nvim_set_keymap('n', '', 'l', opts) + +-- Resize with arrows +-- delta: 2 lines +vim.api.nvim_set_keymap('n', '', ':resize -2', opts) +vim.api.nvim_set_keymap('n', '', ':resize +2', opts) +vim.api.nvim_set_keymap('n', '', ':vertical resize -2', opts) +vim.api.nvim_set_keymap('n', '', ':vertical resize +2', opts) + +----------------- +-- Visual mode -- +----------------- + +-- Hint: start visual mode with the same area as the previous area and the same mode +vim.api.nvim_set_keymap('v', '<', '', '>gv', opts) + + +--------------------- +-- Mardown Preview -- +--------------------- + +vim.api.nvim_set_keymap('n', '', ':MarkdownPreview', opts) +vim.api.nvim_set_keymap('n', '', ':MarkdownPreviewStop', opts) +vim.api.nvim_set_keymap('i', '', ':MarkdownPreview', opts) +vim.api.nvim_set_keymap('i', '', ':MarkdownPreviewStop', opts) + +------------------ +-- NNN explorer -- +------------------ +vim.api.nvim_set_keymap('n', '', ':NnnExplorer', opts) +vim.api.nvim_set_keymap('n', '', ':NnnPicker', opts) + +vim.api.nvim_set_keymap('i', '', ':call v:null', {noremap = true}) + diff --git a/lua/lsp.lua b/lua/lsp.lua new file mode 100644 index 0000000..77acfc1 --- /dev/null +++ b/lua/lsp.lua @@ -0,0 +1,16 @@ +require('mason').setup({ + ui = { + icons = { + package_installed = "✓", + package_pending = "➜", + package_uninstalled = "✗" + } + } +}) + +require('mason-lspconfig').setup({ + -- A list of servers to automatically install if they're not already installed + ensure_installed = { 'pylsp', 'gopls', 'lua_ls', 'rust_analyzer', 'clangd' }, +}) + + diff --git a/lua/options.lua b/lua/options.lua new file mode 100644 index 0000000..15a53fd --- /dev/null +++ b/lua/options.lua @@ -0,0 +1,26 @@ +vim.opt.clipboard = 'unnamedplus' -- use system clipboard +vim.opt.completeopt = {'menu', 'menuone', 'noselect'} +vim.opt.mouse = 'a' -- allow the mouse to be used in Nvim + +-- Tab +vim.opt.tabstop = 4 -- number of visual spaces per TAB +vim.opt.softtabstop = 4 -- number of spacesin tab when editing +vim.opt.shiftwidth = 4 -- insert 4 spaces on a tab +vim.opt.expandtab = true -- tabs are spaces, mainly because of python + +-- UI config +vim.opt.number = true -- show absolute number +vim.opt.relativenumber = false -- add numbers to each line on the left side +vim.opt.cursorline = true -- highlight cursor line underneath the cursor horizontally +vim.opt.splitbelow = true -- open new vertical split bottom +vim.opt.splitright = true -- open new horizontal splits right +vim.opt.termguicolors = true -- enable 24-bit RGB color in the TUI +vim.opt.showmode = true + +-- Searching +vim.opt.incsearch = true -- search as characters are entered +vim.opt.hlsearch = false -- do not highlight matches +vim.opt.ignorecase = true -- ignore case in searches by default +vim.opt.smartcase = true -- but make it case sensitive if an uppercase is entered + + diff --git a/lua/plugins.lua b/lua/plugins.lua new file mode 100644 index 0000000..5e7345f --- /dev/null +++ b/lua/plugins.lua @@ -0,0 +1,74 @@ +-- Install Packer automatically if it's not installed(Bootstraping) +-- Hint: string concatenation is done by `..` +local ensure_packer = function() + local fn = vim.fn + 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]] + return true + end + return false +end +local packer_bootstrap = ensure_packer() + + +-- Reload configurations if we modify plugins.lua +-- Hint +-- - replaced with the filename of the buffer being manipulated +vim.cmd([[ + augroup packer_user_config + autocmd! + autocmd BufWritePost plugins.lua source | PackerSync + augroup end +]]) + + +-- Install plugins here - `use ...` +-- Packer.nvim hints +-- after = string or list, -- Specifies plugins to load before this plugin. See "sequencing" below +-- config = string or function, -- Specifies code to run after this plugin is loaded +-- requires = string or list, -- Specifies plugin dependencies. See "dependencies". +-- ft = string or list, -- Specifies filetypes which load this plugin. +-- run = string, function, or table, -- Specify operations to be run after successful installs/updates of a plugin +return require('packer').startup(function(use) + -- Packer can manage itself + use 'wbthomason/packer.nvim' + use 'tanvirtin/monokai.nvim' + use { + "williamboman/mason.nvim", + run = ":MasonUpdate" -- :MasonUpdate updates registry contents + } + use { 'williamboman/mason-lspconfig.nvim'} + + use { 'neovim/nvim-lspconfig' } + use { 'hrsh7th/nvim-cmp', config = [[require('config.nvim-cmp')]] } + use { 'hrsh7th/cmp-nvim-lsp', after = 'nvim-cmp' } + --use { 'hrsh7th/cmp-buffer', after = 'nvim-cmp' } -- buffer auto-completion + use { 'hrsh7th/cmp-path', after = 'nvim-cmp' } -- path auto-completion + use { 'hrsh7th/cmp-cmdline', after = 'nvim-cmp' } -- cmdline auto-completion + use 'L3MON4D3/LuaSnip' + use 'saadparwaiz1/cmp_luasnip' + + use({ + "iamcco/markdown-preview.nvim", + run = function() vim.fn["mkdp#util#install"]() end, + }) + + -- File manager + use { + "luukvbaal/nnn.nvim", + config = function() require("nnn").setup() end + } + + use { 'https://git.richoux.me/tfa/vim-log-highlighting', after = 'nvim-cmp' } -- cmdline auto-completion + + use 'mzlogin/vim-markdown-toc' + + -- Automatically set up your configuration after cloning packer.nvim + -- Put this at the end after all plugins + if packer_bootstrap then + require('packer').sync() + end +end) + diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua new file mode 100644 index 0000000..32a8409 --- /dev/null +++ b/plugin/packer_compiled.lua @@ -0,0 +1,199 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "/home/gabriel/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/gabriel/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/gabriel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/gabriel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/gabriel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + LuaSnip = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + ["cmp-cmdline"] = { + after_files = { "/home/gabriel/.local/share/nvim/site/pack/packer/opt/cmp-cmdline/after/plugin/cmp_cmdline.lua" }, + load_after = {}, + loaded = true, + needs_bufread = false, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/opt/cmp-cmdline", + url = "https://github.com/hrsh7th/cmp-cmdline" + }, + ["cmp-nvim-lsp"] = { + after_files = { "/home/gabriel/.local/share/nvim/site/pack/packer/opt/cmp-nvim-lsp/after/plugin/cmp_nvim_lsp.lua" }, + load_after = {}, + loaded = true, + needs_bufread = false, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/opt/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-path"] = { + after_files = { "/home/gabriel/.local/share/nvim/site/pack/packer/opt/cmp-path/after/plugin/cmp_path.lua" }, + load_after = {}, + loaded = true, + needs_bufread = false, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/opt/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + cmp_luasnip = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + url = "https://github.com/saadparwaiz1/cmp_luasnip" + }, + ["markdown-preview.nvim"] = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/markdown-preview.nvim", + url = "https://github.com/iamcco/markdown-preview.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["monokai.nvim"] = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/monokai.nvim", + url = "https://github.com/tanvirtin/monokai.nvim" + }, + ["nnn.nvim"] = { + config = { "\27LJ\2\n1\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\bnnn\frequire\0" }, + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/nnn.nvim", + url = "https://github.com/luukvbaal/nnn.nvim" + }, + ["nvim-cmp"] = { + after = { "cmp-cmdline", "vim-log-highlighting", "cmp-nvim-lsp", "cmp-path" }, + config = { "require('config.nvim-cmp')" }, + loaded = true, + only_config = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["vim-log-highlighting"] = { + load_after = {}, + loaded = true, + needs_bufread = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/opt/vim-log-highlighting", + url = "https://git.richoux.me/tfa/vim-log-highlighting" + }, + ["vim-markdown-toc"] = { + loaded = true, + path = "/home/gabriel/.local/share/nvim/site/pack/packer/start/vim-markdown-toc", + url = "https://github.com/mzlogin/vim-markdown-toc" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: nvim-cmp +time([[Config for nvim-cmp]], true) +require('config.nvim-cmp') +time([[Config for nvim-cmp]], false) +-- Config for: nnn.nvim +time([[Config for nnn.nvim]], true) +try_loadstring("\27LJ\2\n1\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\bnnn\frequire\0", "config", "nnn.nvim") +time([[Config for nnn.nvim]], false) +-- Load plugins in order defined by `after` +time([[Sequenced loading]], true) +vim.cmd [[ packadd cmp-nvim-lsp ]] +vim.cmd [[ packadd cmp-path ]] +vim.cmd [[ packadd vim-log-highlighting ]] +vim.cmd [[ packadd cmp-cmdline ]] +time([[Sequenced loading]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end