improve nvim config
This commit is contained in:
parent
090df02751
commit
00cdf43ddf
@ -1,3 +1,4 @@
|
||||
vim.g.mapleader = " "
|
||||
vim.o.relativenumber = true
|
||||
vim.o.number = true
|
||||
vim.o.tabstop = 4
|
||||
@ -6,6 +7,8 @@ vim.o.shiftwidth = 4
|
||||
vim.o.expandtab = true
|
||||
vim.o.smartindent = true
|
||||
|
||||
--vim.keymap.set({"n", "v", "i"}, "<leader><leader>", "<Esc>", {noremap = true})
|
||||
|
||||
--ignore case if pattern doesn't contain upper case
|
||||
vim.o.ignorecase = true
|
||||
vim.o.smartcase = true
|
||||
@ -13,11 +16,40 @@ vim.o.smartcase = true
|
||||
--number of line to show around the cursor
|
||||
vim.o.scrolloff = 8
|
||||
|
||||
--
|
||||
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
|
||||
|
||||
--move line shortcut
|
||||
vim.keymap.set({'n', 'i'}, '<M-j>', ':m +1<CR>', {noremap = true})
|
||||
vim.keymap.set({'n', 'i'}, '<M-k>', ':m -2<CR>', {noremap = true})
|
||||
vim.keymap.set("n", "<M-j>", ":m +1<CR>==", {noremap = true})
|
||||
vim.keymap.set("n", "<M-k>", ":m -2<CR>==", {noremap = true})
|
||||
|
||||
vim.keymap.set('v', '<M-j>', ":m '>+1<CR>gv", {noremap = true})
|
||||
vim.keymap.set('v', '<M-k>', ":m '<-2<CR>gv", {noremap = true})
|
||||
vim.keymap.set("v", "<M-j>", ":m '>+1<CR>gv=gv", {noremap = true})
|
||||
vim.keymap.set("v", "<M-k>", ":m '<-2<CR>gv=gv", {noremap = true})
|
||||
|
||||
--require('packer-plugins')
|
||||
vim.keymap.set("n", "<C-d>", "<C-d>zz", {noremap = true})
|
||||
vim.keymap.set("n", "<C-u>", "<C-u>zz", {noremap = true})
|
||||
|
||||
vim.keymap.set("x", "<leader>p", "\"_dP")
|
||||
|
||||
vim.keymap.set("n", "<leader>y", "\"+y")
|
||||
vim.keymap.set("v", "<leader>y", "\"+y")
|
||||
|
||||
--surrounding
|
||||
vim.keymap.set("v", '<leader>s(', "xi()<Esc>P", {noremap = true})
|
||||
vim.keymap.set("v", '<leader>s)', "xi()<Esc>P", {noremap = true})
|
||||
vim.keymap.set("v", '<leader>s{', "xi{}<Esc>P", {noremap = true})
|
||||
vim.keymap.set("v", '<leader>s}', "xi{}<Esc>P", {noremap = true})
|
||||
vim.keymap.set("v", '<leader>s[', "xi[]<Esc>P", {noremap = true})
|
||||
vim.keymap.set("v", '<leader>s]', "xi[]<Esc>P", {noremap = true})
|
||||
vim.keymap.set("v", '<leader>s"', 'xi""<Esc>P', {noremap = true})
|
||||
vim.keymap.set("v", "<leader>s'", "xi''<Esc>P", {noremap = true})
|
||||
|
||||
--tab buffer
|
||||
vim.keymap.set("n", "<leader>fn", ":bnext<CR>", {noremap = true})
|
||||
vim.keymap.set("n", "<leader>fp", ":bprev<CR>", {noremap = true})
|
||||
|
||||
-- wrap toggle
|
||||
vim.keymap.set("n", "<leader>w", function() vim.o.wrap = not vim.o.wrap end, {noremap = true})
|
||||
|
||||
require('packer-plugins')
|
||||
require('telescope')
|
||||
|
@ -1,4 +1,43 @@
|
||||
return require('packer').startup(function()
|
||||
use 'wbthomason/packer.nvim'
|
||||
--use 'sonph/onehalf'
|
||||
use 'sonph/onehalf'
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim', tag = '0.1.1',
|
||||
-- or , branch = '0.1.x',
|
||||
requires = { {'nvim-lua/plenary.nvim'} }
|
||||
}
|
||||
use({
|
||||
'rose-pine/neovim',
|
||||
as = 'rose-pine',
|
||||
config = function()
|
||||
vim.cmd('colorscheme rose-pine')
|
||||
end
|
||||
})
|
||||
use('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'})
|
||||
use {
|
||||
'VonHeikemen/lsp-zero.nvim',
|
||||
branch = 'v2.x',
|
||||
requires = {
|
||||
-- LSP Support
|
||||
{'neovim/nvim-lspconfig'},
|
||||
{'williamboman/mason.nvim', run = function()
|
||||
pcall(vim.cmd, 'MasonUpdate')
|
||||
end,},
|
||||
{'williamboman/mason-lspconfig.nvim'}, -- Optional
|
||||
|
||||
-- Autocompletion
|
||||
{'hrsh7th/nvim-cmp'}, -- Required
|
||||
{'hrsh7th/cmp-nvim-lsp'}, -- Required
|
||||
{'L3MON4D3/LuaSnip'}, -- Required
|
||||
}
|
||||
}
|
||||
|
||||
-- Auto pairs
|
||||
use {
|
||||
"windwp/nvim-autopairs",
|
||||
config = function() require("nvim-autopairs").setup {} end
|
||||
}
|
||||
|
||||
--harpoon
|
||||
use("theprimeagen/harpoon")
|
||||
end)
|
||||
|
11
.config/nvim/plugin/harpoon.lua
Normal file
11
.config/nvim/plugin/harpoon.lua
Normal file
@ -0,0 +1,11 @@
|
||||
local mark = require("harpoon.mark")
|
||||
local ui = require("harpoon.ui")
|
||||
|
||||
vim.keymap.set("n", "<leader>a", mark.add_file)
|
||||
vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
|
||||
|
||||
vim.keymap.set("n", "<M-a>", function() ui.nav_file(1) end)
|
||||
vim.keymap.set("n", "<M-z>", function() ui.nav_file(2) end)
|
||||
vim.keymap.set("n", "<M-e>", function() ui.nav_file(3) end)
|
||||
vim.keymap.set("n", "<M-r>", function() ui.nav_file(4) end)
|
||||
vim.keymap.set("n", "<M-t>", function() ui.nav_file(5) end)
|
14
.config/nvim/plugin/lsp.lua
Normal file
14
.config/nvim/plugin/lsp.lua
Normal file
@ -0,0 +1,14 @@
|
||||
local lsp = require('lsp-zero').preset({})
|
||||
|
||||
lsp.on_attach(function(client, bufnr)
|
||||
local opts = {buffer = bufnr, remap = false}
|
||||
|
||||
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
|
||||
end)
|
||||
|
||||
lsp.ensure_installed({
|
||||
'tsserver',
|
||||
'rust-analyser',
|
||||
'eslint',
|
||||
})
|
||||
lsp.setup()
|
179
.config/nvim/plugin/packer_compiled.lua
Normal file
179
.config/nvim/plugin/packer_compiled.lua
Normal file
@ -0,0 +1,179 @@
|
||||
-- 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/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/grimhilt/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
||||
local install_cpath_pattern = "/home/grimhilt/.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/grimhilt/.local/share/nvim/site/pack/packer/start/LuaSnip",
|
||||
url = "https://github.com/L3MON4D3/LuaSnip"
|
||||
},
|
||||
["cmp-nvim-lsp"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
|
||||
url = "https://github.com/hrsh7th/cmp-nvim-lsp"
|
||||
},
|
||||
harpoon = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/harpoon",
|
||||
url = "https://github.com/theprimeagen/harpoon"
|
||||
},
|
||||
["lsp-zero.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/lsp-zero.nvim",
|
||||
url = "https://github.com/VonHeikemen/lsp-zero.nvim"
|
||||
},
|
||||
["mason-lspconfig.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
|
||||
url = "https://github.com/williamboman/mason-lspconfig.nvim"
|
||||
},
|
||||
["mason.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.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 = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
|
||||
url = "https://github.com/windwp/nvim-autopairs"
|
||||
},
|
||||
["nvim-cmp"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/nvim-cmp",
|
||||
url = "https://github.com/hrsh7th/nvim-cmp"
|
||||
},
|
||||
["nvim-lspconfig"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
||||
url = "https://github.com/neovim/nvim-lspconfig"
|
||||
},
|
||||
["nvim-treesitter"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||
url = "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||
},
|
||||
onehalf = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/onehalf",
|
||||
url = "https://github.com/sonph/onehalf"
|
||||
},
|
||||
["packer.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||
url = "https://github.com/wbthomason/packer.nvim"
|
||||
},
|
||||
["plenary.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/plenary.nvim",
|
||||
url = "https://github.com/nvim-lua/plenary.nvim"
|
||||
},
|
||||
["rose-pine"] = {
|
||||
config = { "\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0" },
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/rose-pine",
|
||||
url = "https://github.com/rose-pine/neovim"
|
||||
},
|
||||
["telescope.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/grimhilt/.local/share/nvim/site/pack/packer/start/telescope.nvim",
|
||||
url = "https://github.com/nvim-telescope/telescope.nvim"
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
-- Config for: rose-pine
|
||||
time([[Config for rose-pine]], true)
|
||||
try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0\26colorscheme rose-pine\bcmd\bvim\0", "config", "rose-pine")
|
||||
time([[Config for rose-pine]], 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
|
5
.config/nvim/plugin/telescope.lua
Normal file
5
.config/nvim/plugin/telescope.lua
Normal file
@ -0,0 +1,5 @@
|
||||
local builtin = require('telescope.builtin')
|
||||
|
||||
vim.keymap.set('n', '<leader>pf', builtin.find_files, {noremap = true})
|
||||
vim.keymap.set('n', '<C-p>', builtin.git_files, {noremap = true})
|
||||
|
35
.config/nvim/plugin/treesitter.lua
Normal file
35
.config/nvim/plugin/treesitter.lua
Normal file
@ -0,0 +1,35 @@
|
||||
require'nvim-treesitter.configs'.setup {
|
||||
-- A list of parser names, or "all" (the five listed parsers should always be installed)
|
||||
ensure_installed = { "javascript", "typescript", "rust", "c", "lua", "vim", "vimdoc", "query" },
|
||||
|
||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
||||
sync_install = false,
|
||||
|
||||
-- Automatically install missing parsers when entering buffer
|
||||
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
|
||||
auto_install = true,
|
||||
|
||||
highlight = {
|
||||
enable = true,
|
||||
|
||||
-- NOTE: these are the names of the parsers and not the filetype. (for example if you want to
|
||||
-- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is
|
||||
-- the name of the parser)
|
||||
-- list of language that will be disabled
|
||||
disable = { },
|
||||
-- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
|
||||
disable = function(lang, buf)
|
||||
local max_filesize = 100 * 1024 -- 100 KB
|
||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
||||
if ok and stats and stats.size > max_filesize then
|
||||
return true
|
||||
end
|
||||
end,
|
||||
|
||||
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
||||
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
||||
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
||||
-- Instead of true it can also be a list of languages
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
}
|
Loading…
Reference in New Issue
Block a user