diff --git a/init.lua b/init.lua index 5ca7743c..3def633b 100644 --- a/init.lua +++ b/init.lua @@ -210,6 +210,7 @@ vim.o.hlsearch = false -- Make line numbers default vim.wo.number = true +vim.api.nvim_set_hl(0, 'LineNr', { fg = "white" }) -- Enable mouse mode vim.o.mouse = 'a' diff --git a/lua/custom/configs/remaps.lua b/lua/custom/configs/remaps.lua new file mode 100644 index 00000000..76513428 --- /dev/null +++ b/lua/custom/configs/remaps.lua @@ -0,0 +1,38 @@ +-- thanks https://github.com/ThePrimeagen/init.lua/blob/master/lua/theprimeagen/remap.lua + +-- move hightlighted code +vim.keymap.set("v", "J", ":m '>+1gv=gv") +vim.keymap.set("v", "K", ":m '<-2gv=gv") + +-- J appends line below to current line but cursor doesn't move +vim.keymap.set("n", "J", "mzJ`z") + +-- keeps cursos in middle when moving/searching +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "n", "nzzzv") +vim.keymap.set("n", "N", "Nzzzv") + +-- greatest remap ever +-- paste without adding deleted text to buffer +vim.keymap.set("x", "p", [["_dP]]) + +-- next greatest remap ever : asbjornHaland +-- yank/delete into system clipboard +vim.keymap.set({ "n", "v" }, "y", [["+y]]) +vim.keymap.set("n", "Y", [["+Y]]) +vim.keymap.set({ "n", "v" }, "d", [["_d]]) + +-- dont press this +vim.keymap.set("n", "Q", "") + +-- quickfix nav +vim.keymap.set("n", "", "cnextzz") +vim.keymap.set("n", "", "cprevzz") +vim.keymap.set("n", "k", "lnextzz") +vim.keymap.set("n", "j", "lprevzz") + +-- find/replace word you're on +vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) +-- make script executable +vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) diff --git a/lua/custom/configs/set.lua b/lua/custom/configs/set.lua index d1ffe60c..c6fb7be9 100644 --- a/lua/custom/configs/set.lua +++ b/lua/custom/configs/set.lua @@ -7,3 +7,11 @@ vim.opt.shiftwidth = 4 vim.opt.expandtab = true vim.opt.smartindent = true + +vim.opt.termguicolors = true + +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" +vim.opt.isfname:append("@-@") + +vim.opt.updatetime = 50 diff --git a/lua/custom/init.lua b/lua/custom/init.lua index 31be9c85..6ce41784 100644 --- a/lua/custom/init.lua +++ b/lua/custom/init.lua @@ -1,3 +1,4 @@ require("custom.configs.set") +require("custom.configs.remaps") require("custom.configs.jdtls") require("custom.statusline.init") diff --git a/lua/custom/plugins/autoformat.lua b/lua/custom/plugins/autoformat.lua index bc56b15b..c2f972d5 100644 --- a/lua/custom/plugins/autoformat.lua +++ b/lua/custom/plugins/autoformat.lua @@ -46,7 +46,7 @@ return { -- Tsserver usually works poorly. Sorry you work with bad languages -- You can remove this line if you know what you're doing :) - if client.name == 'tsserver' then + if client.name == 'tsserver' or client.name == 'jsonls' then return end