diff --git a/nvim/init.lua b/nvim/init.lua index be8da67..a31476b 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -198,11 +198,10 @@ require("packer").startup { config = function() local map = vim.api.nvim_set_keymap map("", "", ":vertical Git:vertical resize 60", {}) - map("", "gg", - ":vertical Git log --oneline --all --graph:vertical resize 60", + map("", "gg", ":vertical Gclog!:vertical resize -40", {}) + map("", "gG", ":vertical 0Gclog!:vertical resize -40", {}) - map("", "gc", ":vertical 0Gclog!", {}) - map("", "gB", ":Git blame", {}) + map("", "gb", ":Git blame", {}) end } @@ -233,7 +232,7 @@ require("packer").startup { ["n gx"] = [[lua require("gitsigns").reset_hunk()]], ["v gx"] = [[lua require("gitsigns").reset_hunk({vim.fn.line("."), vim.fn.line("v")})]], ["n gi"] = [[lua require("gitsigns").preview_hunk()]], - ["n gb"] = [[lua require("gitsigns").blame_line(true)]], + -- ["n gb"] = [[lua require("gitsigns").blame_line(true)]], -- Text objects ["o ih"] = [[:lua require("gitsigns.actions").select_hunk()]], @@ -448,7 +447,7 @@ require("packer").startup { "nvim-telescope/telescope.nvim", requires = { "nvim-lua/popup.nvim", "nvim-lua/plenary.nvim", - "nvim-telescope/telescope-live-grep-raw.nvim" + "nvim-telescope/telescope-rg.nvim" }, config = function() -- TODO grep with regex @@ -739,17 +738,22 @@ require("packer").startup { customTags = { "!ChildAccessor mapping", "!ChildContainer mapping", "!ConstantAccessor mapping", "!Dtype scalar", - "!ConstantTensorAccessor mapping", "!DtypeTensor scalar", + "!ParameterAccessor mapping", "!DtypeTensor scalar", "!ImportClass scalar", "!ReferenceContainer mapping", "!ReferenceLink mapping", "!SeriesTensor mapping", - "!SeriesTensorAccessor mapping", "!UDFtensorfactory scalar", + "!SeriesAccessor mapping", "!UDFtensorfactory scalar", "!UDFnu scalar", "!UDFvalidator scalar", "!Unit scalar", "!UserClass mapping", "!UserInstance mapping", - "!getattr mapping" + "!getattr mapping", + "!timedelta mapping" } } } } + nvim_lsp.html.setup {on_attach = on_attach } + nvim_lsp.jsonls.setup {on_attach = on_attach } + nvim_lsp.cssls.setup {on_attach = on_attach } + nvim_lsp.eslint.setup {on_attach = on_attach } nvim_lsp.pyright.setup { on_attach = on_attach, settings = {