diff --git a/config/nvim/lua/editor/option.lua b/config/nvim/lua/editor/option.lua index 3f6ef78..93f3d1d 100644 --- a/config/nvim/lua/editor/option.lua +++ b/config/nvim/lua/editor/option.lua @@ -19,6 +19,7 @@ local options = { hlsearch = true, incsearch = true, ignorecase = true, + jumpoptions = "stack", number = true, ruler = true, relativenumber = true, @@ -107,6 +108,7 @@ vim.cmd("nnoremap ; :") -- silent = true, -- noremap = true -- }) + -- vim.keymap.set("n", ";", ":", {noremap = true, silent = true}) --vim.api.nvim_set_keymap("i", "HH", "", { diff --git a/config/nvim/lua/neo/lazy.lua b/config/nvim/lua/neo/lazy.lua index 6e45707..d60efe4 100644 --- a/config/nvim/lua/neo/lazy.lua +++ b/config/nvim/lua/neo/lazy.lua @@ -41,6 +41,13 @@ local lazyopts = { }, } +local function luasnip_build() + if vim.fn.has("win32") then + return "make install_jsregexp CC=clang.exe SHELL=C:\\Program Files\\Git\\usr\\bin\\bash.exe .SHELLFLAGS=-c" + end + return "make install_jsregexp" +end + local plugins = { { "nvim-lua/plenary.nvim", @@ -251,7 +258,7 @@ local plugins = { -- follow latest release. version = "v2.*", -- Replace by the latest released major (first number of latest release) -- install jsregexp (optional!). - build = "make install_jsregexp", + build = luasnip_build(), dependencies = { "rafamadriz/friendly-snippets", }