commit ccbd88ca6658c5625b1cf0096e7d48a18a10d664 Author: Zev Averbach Date: Fri Oct 21 22:58:17 2022 +0200 first diff --git a/coc-settings.json b/coc-settings.json new file mode 100644 index 0000000..e69de29 diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..aa5ed98 --- /dev/null +++ b/init.lua @@ -0,0 +1,126 @@ +-- [[ init.lua ]] +require('opts') -- Options +require('keys') -- Keymaps +require('plug') -- Plugins + + +vim.api.nvim_command [[colorscheme tokyonight]] + +require('impatient') +require('hlargs').setup() +require('illuminate') +local rt = require("rust-tools") + +rt.setup({ + server = { + on_attach = function(_, bufnr) + -- Hover actions + vim.keymap.set("n", "", rt.hover_actions.hover_actions, { buffer = bufnr }) + -- Code action groups + vim.keymap.set("n", "a", rt.code_action_group.code_action_group, { buffer = bufnr }) + end, + }, +}) + +-- LSP Diagnostics Options Setup +-- copy-pasted from https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/ + +local sign = function(opts) + vim.fn.sign_define(opts.name, { + texthl = opts.name, + text = opts.text, + numhl = '' + }) +end + +sign({name = 'DiagnosticSignError', text = ''}) +sign({name = 'DiagnosticSignWarn', text = ''}) +sign({name = 'DiagnosticSignHint', text = ''}) +sign({name = 'DiagnosticSignInfo', text = ''}) + +vim.diagnostic.config({ + virtual_text = false, + keys_signs = true, + update_in_insert = true, + underline = true, + severity_sort = false, + float = { + border = 'rounded', + source = 'always', + header = '', + prefix = '', + }, +}) + +vim.cmd([[ +set signcolumn=yes +autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false }) +]]) + +local cmp = require'cmp' +cmp.setup({ + -- Enable LSP snippets + snippet = { + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) + end, + }, + mapping = { + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + -- Add tab support + [''] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.close(), + [''] = cmp.mapping.confirm({ + behavior = cmp.ConfirmBehavior.Insert, + select = true, + }) + }, + -- Installed sources: + sources = { + { name = 'path' }, -- file paths + { name = 'nvim_lsp', keyword_length = 3 }, -- from language server + { name = 'nvim_lsp_signature_help'}, -- display function signatures with current parameter emphasized + { name = 'nvim_lua', keyword_length = 2}, -- complete neovim's Lua runtime API such vim.lsp.* + { name = 'buffer', keyword_length = 2 }, -- source current buffer + { name = 'vsnip', keyword_length = 2 }, -- nvim-cmp source for vim-vsnip + { name = 'calc'}, -- source for math calculation + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + formatting = { + fields = {'menu', 'abbr', 'kind'}, + format = function(entry, item) + local menu_icon ={ + nvim_lsp = 'λ', + vsnip = '⋗', + buffer = 'Ω', + path = '🖫', + } + item.menu = menu_icon[entry.source.name] + return item + end, + }, +}) + +-- Treesitter Plugin Setup +require('nvim-treesitter.configs').setup { + ensure_installed = { "lua", "rust", "toml" }, + auto_install = true, + highlight = { + enable = true, + additional_vim_regex_highlighting=false, + }, + ident = { enable = true }, + rainbow = { + enable = true, + extended_mode = true, + max_file_lines = nil, + } +} diff --git a/lua/keymap.lua b/lua/keymap.lua new file mode 100644 index 0000000..e8875e0 --- /dev/null +++ b/lua/keymap.lua @@ -0,0 +1,21 @@ +local M = {} + +local function bind(op, outer_opts) + outer_opts = outer_opts or {noremap = true} + return function(lhs, rhs, opts) + opts = vim.tbl_extend("force", + outer_opts, + opts or {} + ) + vim.keymap.set(op, lhs, rhs, opts) + end +end + +M.nmap = bind("n", {noremap = false}) +M.nnoremap = bind("n") +M.vnoremap = bind("v") +M.xnoremap = bind("x") +M.inoremap = bind("i") +M.tnoremap = bind("t") + +return M diff --git a/lua/keys.lua b/lua/keys.lua new file mode 100644 index 0000000..bebef73 --- /dev/null +++ b/lua/keys.lua @@ -0,0 +1,85 @@ +local nnoremap = require("keymap").nnoremap +local xnoremap = require("keymap").xnoremap +local inoremap = require("keymap").inoremap +local vnoremap = require("keymap").vnoremap +local tnoremap = require("keymap").tnoremap +local nmap = require("keymap").nmap + +vim.g.mapleader = ' ' + +nnoremap("pv", "Ex") +nnoremap("pk", "PackerSync") +nnoremap("", "w") +nnoremap("w", "bw") +-- xnoremap("p", "\"_dP") + +nnoremap("k", ":e ~/.config/nvim/lua/keys.lua") +nnoremap("o", ":e ~/.config/nvim/lua/opts.lua") +nnoremap("i", ":e ~/.config/nvim/init.lua") +nnoremap("p", ":e ~/.config/nvim/lua/plug.lua") + +-- FloaTerm configuration +nmap("gt", ":FloatermNew --name=myfloat --height=0.8 --width=0.7 --autoclose=2 fish ") +tnoremap("", ":q") + +-- save all and quit +nnoremap("q", ":waZQ") + +-- navigate buffers +nnoremap("", ":bp") +nnoremap("", ":bn") + +-- clear highlights +nnoremap("", ":noh") + +-- Telescope +nnoremap("f", "lua require('telescope.builtin').find_files()") +nnoremap("g", "lua require('telescope.builtin').live_grep()") +nnoremap("b", "lua require('telescope.builtin').buffers()") + +-- nnoremap("t", "Pytest file") +-- nnoremap("tt", "Pytest function") + +-- source current file +nnoremap("s", "source") + +nmap("l", ":call CocAction('diagnosticNext')") +nmap("gd", ":call CocAction('jumpDefinition')") + +-- In insert or command mode, move normally by using Ctrl +inoremap("", "") +inoremap("", "") + +-- move selection +nnoremap("", ":m .+1==") +nnoremap("", ":m .-2==") +inoremap("", ":m .+1==gi") +inoremap("", ":m .-2==gi") +vnoremap("", ":m '>+1gv=gv") +vnoremap("", ":m '<-2gv=gv") + +nnoremap("", "echo 'No left for you!'") +vnoremap("", "echo 'No left for you!'") +inoremap("", "echo 'No left for you!'") +nnoremap("", "echo 'No right for you!'") +vnoremap("", "echo 'No right for you!'") +inoremap("", "echo 'No right for you!'") +nnoremap("", "echo 'No up for you!'") +vnoremap("", "echo 'No up for you!'") +inoremap("", "echo 'No up for you!'") +nnoremap("", "echo 'No down for you!'") +vnoremap("", "echo 'No down for you!'") +inoremap("", "echo 'No down for you!'") + +-- Vimspector +vim.cmd([[ +nmap 1 call vimspector#Launch() +nmap 2 call vimspector#StepOver() +nmap 3 call vimspector#Reset() +nmap 7 call vimspector#StepOver()") +nmap 8 call vimspector#StepOut()") +nmap 9 call vimspector#StepInto()") +]]) +nmap("Db", ":call vimspector#ToggleBreakpoint()") +nmap("Dw", ":call vimspector#AddWatch()") +nmap("De", ":call vimspector#Evaluate()") diff --git a/lua/opts.lua b/lua/opts.lua new file mode 100644 index 0000000..e3d91c9 --- /dev/null +++ b/lua/opts.lua @@ -0,0 +1,44 @@ +vim.opt.hidden = true +vim.opt.guicursor = "" + +vim.opt.nu = true +vim.opt.relativenumber = true + +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.expandtab = true +vim.opt.hlsearch = false +vim.opt.incsearch = true +vim.opt.wrap = true + +vim.opt.smartindent = true + +vim.g.mapleader = " " +-- vim.g.python3_host_prog = os.getenv('HOME') .. '/.local/venv/nvim/bin/python' +-- +--Set completeopt to have a better completion experience +-- :help completeopt +-- menuone: popup even when there's only one match +-- noinsert: Do not insert text until a selection is made +-- noselect: Do not select, force to select one from the menu +-- shortness: avoid showing extra messages when using completion +-- updatetime: set updatetime for CursorHold +vim.opt.completeopt = {'menuone', 'noselect', 'noinsert'} +vim.opt.shortmess = vim.opt.shortmess + { c = true} +vim.api.nvim_set_option('updatetime', 300) + +-- Fixed column for diagnostics to appear +-- Show autodiagnostic popup on cursor hover_range +-- Goto previous / next diagnostic warning / error +-- Show inlay_hints more frequently +vim.cmd([[ +set signcolumn=yes +autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false }) +]]) + +vim.cmd([[ +let g:vimspector_sidebar_width = 85 +let g:vimspector_bottombar_height = 15 +let g:vimspector_terminal_maxwidth = 70 +]]) diff --git a/lua/plug.lua b/lua/plug.lua new file mode 100644 index 0000000..cd9548e --- /dev/null +++ b/lua/plug.lua @@ -0,0 +1,49 @@ +require("mason").setup() + +return require('packer').startup(function(use) + use 'wbthomason/packer.nvim' + use 'folke/tokyonight.nvim' + use 'kyazdani42/nvim-web-devicons' + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.0', + requires = { {'nvim-lua/plenary.nvim'} } + } + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate' + } + use {'neoclide/coc.nvim', branch = 'release'} + use 'mfussenegger/nvim-dap' + use 'alfredodeza/pytest.vim' + use 'tpope/vim-commentary' + use 'williamboman/mason.nvim' + use 'williamboman/mason-lspconfig.nvim' + use 'neovim/nvim-lspconfig' + use 'simrat39/rust-tools.nvim' + + -- copy pasted from https://rsdlt.github.io/posts/rust-nvim-ide-guide-walkthrough-development-debug/ + use 'hrsh7th/nvim-cmp' + + -- LSP completion source: + use 'hrsh7th/cmp-nvim-lsp' + + -- Useful completion sources: + use 'hrsh7th/cmp-nvim-lua' + use 'hrsh7th/cmp-nvim-lsp-signature-help' + use 'hrsh7th/cmp-vsnip' + use 'hrsh7th/cmp-path' + use 'hrsh7th/cmp-buffer' + use 'hrsh7th/vim-vsnip' + use 'puremourning/vimspector' + use 'voldikss/vim-floaterm' + use 'lewis6991/impatient.nvim' + use { + 'm-demare/hlargs.nvim', + requires = { 'nvim-treesitter/nvim-treesitter' } + } + use 'RRethy/vim-illuminate' + use { + "windwp/nvim-autopairs", + config = function() require("nvim-autopairs").setup {} end + } +end) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua new file mode 100644 index 0000000..b2b7bea --- /dev/null +++ b/plugin/packer_compiled.lua @@ -0,0 +1,239 @@ +-- 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 = "/Users/zev/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/zev/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/zev/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/zev/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/Users/zev/.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 = { + ["cmp-buffer"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/cmp-buffer", + url = "https://github.com/hrsh7th/cmp-buffer" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["cmp-nvim-lsp-signature-help"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp-signature-help", + url = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help" + }, + ["cmp-nvim-lua"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/cmp-nvim-lua", + url = "https://github.com/hrsh7th/cmp-nvim-lua" + }, + ["cmp-path"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + ["cmp-vsnip"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/cmp-vsnip", + url = "https://github.com/hrsh7th/cmp-vsnip" + }, + ["coc.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/coc.nvim", + url = "https://github.com/neoclide/coc.nvim" + }, + ["hlargs.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/hlargs.nvim", + url = "https://github.com/m-demare/hlargs.nvim" + }, + ["impatient.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/impatient.nvim", + url = "https://github.com/lewis6991/impatient.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["nvim-autopairs"] = { + config = { "\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" }, + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/nvim-autopairs", + url = "https://github.com/windwp/nvim-autopairs" + }, + ["nvim-cmp"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-dap"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/nvim-dap", + url = "https://github.com/mfussenegger/nvim-dap" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["nvim-web-devicons"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/nvim-web-devicons", + url = "https://github.com/kyazdani42/nvim-web-devicons" + }, + ["packer.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["pytest.vim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/pytest.vim", + url = "https://github.com/alfredodeza/pytest.vim" + }, + ["rust-tools.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/rust-tools.nvim", + url = "https://github.com/simrat39/rust-tools.nvim" + }, + ["telescope.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + ["tokyonight.nvim"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/tokyonight.nvim", + url = "https://github.com/folke/tokyonight.nvim" + }, + ["vim-commentary"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/vim-commentary", + url = "https://github.com/tpope/vim-commentary" + }, + ["vim-floaterm"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/vim-floaterm", + url = "https://github.com/voldikss/vim-floaterm" + }, + ["vim-illuminate"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/vim-illuminate", + url = "https://github.com/RRethy/vim-illuminate" + }, + ["vim-vsnip"] = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/vim-vsnip", + url = "https://github.com/hrsh7th/vim-vsnip" + }, + vimspector = { + loaded = true, + path = "/Users/zev/.local/share/nvim/site/pack/packer/start/vimspector", + url = "https://github.com/puremourning/vimspector" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: nvim-autopairs +time([[Config for nvim-autopairs]], true) +try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") +time([[Config for nvim-autopairs]], 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 diff --git a/site/pack/packer/start/packer.nvim b/site/pack/packer/start/packer.nvim new file mode 160000 index 0000000..6afb674 --- /dev/null +++ b/site/pack/packer/start/packer.nvim @@ -0,0 +1 @@ +Subproject commit 6afb67460283f0e990d35d229fd38fdc04063e0a