This commit is contained in:
RingOfStorms (Joshua Bell) 2023-08-13 21:18:51 -05:00
parent f607bde009
commit d7d4d85972
5 changed files with 270 additions and 268 deletions

View file

@ -38,7 +38,12 @@ vim.api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
-- if vim.bo.filetype == 'neo-tree' then -- if vim.bo.filetype == 'neo-tree' then
vim.api.nvim_command("stopinsert") vim.api.nvim_command("stopinsert")
-- end -- end
end end,
})
vim.api.nvim_create_autocmd({ "BufEnter" }, {
pattern = "*.http",
command = "set filetype=http",
}) })
--vim.api.nvim_create_autocmd('BufEnter', { --vim.api.nvim_create_autocmd('BufEnter', {

View file

@ -21,8 +21,8 @@ require("util").keymaps({
["<leader>a"] = { "ggVG", desc = "Select all" }, ["<leader>a"] = { "ggVG", desc = "Select all" },
["<leader>w"] = { "<cmd>w<cr>", desc = "Save" }, ["<leader>w"] = { "<cmd>w<cr>", desc = "Save" },
["<leader>q"] = { "<cmd>confirm q<cr>", desc = "Quit" }, ["<leader>q"] = { "<cmd>confirm q<cr>", desc = "Quit" },
["<leader>cq"] = { "<cmd>bd<cr>", desc = "Close current buffer" }, ["<leader>bq"] = { "<cmd>bp|bd #<cr>", desc = "Close current buffer only" },
["<leader>tn"] = { "<cmd>tabnew<cr>", desc = "" }, ["<leader>tn"] = { "<cmd>tabnew<cr>", desc = "Create new tab" },
["<leader>tq"] = { "<cmd>tabclose<cr>", desc = "Close current tab" }, ["<leader>tq"] = { "<cmd>tabclose<cr>", desc = "Close current tab" },
["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" }, ["|"] = { "<cmd>vsplit<cr>", desc = "Vertical Split" },
["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" }, ["\\"] = { "<cmd>split<cr>", desc = "Horizontal Split" },
@ -63,7 +63,7 @@ require("util").keymaps({
}, },
["<leader>lz"] = { "<cmd>e<CR>", desc = "Edit current file again / Restart LSP Server" }, ["<leader>lz"] = { "<cmd>e<CR>", desc = "Edit current file again / Restart LSP Server" },
["<leader>,uu"] = { ':let @u = trim(tolower(system("uuidgen")))<cr>a<C-r>u', desc = "Generate and insert UUID" }, ["<leader>,uu"] = { ':let @u = trim(tolower(system("uuidgen")))<cr>a<C-r>u', desc = "Generate and insert UUID" },
["<leader>b"] = { "<cmd>b#<cr>", desc = "Switch to last buffer" }, ["B"] = { "<cmd>b#<cr>", desc = "Switch to last buffer" },
}, },
v = { v = {
["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" }, ["J"] = { ":m '>+1<CR>gv=gv", desc = "Visually move block down" },

View file

@ -2,6 +2,9 @@ return {
"rest-nvim/rest.nvim", "rest-nvim/rest.nvim",
event = "BufEnter *.http", event = "BufEnter *.http",
dependencies = { "nvim-lua/plenary.nvim" }, dependencies = { "nvim-lua/plenary.nvim" },
opts = {
encode_url = false,
},
keys = { keys = {
{ {
"<leader>r", "<leader>r",

View file

@ -85,12 +85,6 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagn
update_in_insert = true, update_in_insert = true,
}) })
local signs = { "Error", "Warn", "Hint", "Info" }
for _, type in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = "", texthl = hl, numhl = hl })
end
-- LSP config -- LSP config
-- Took lots of inspiration from this kickstart lua file: https://github.com/hjr3/dotfiles/blob/main/.config/nvim/init.lua -- Took lots of inspiration from this kickstart lua file: https://github.com/hjr3/dotfiles/blob/main/.config/nvim/init.lua
@ -240,8 +234,8 @@ return {
end, { "i", "s" }), end, { "i", "s" }),
}), }),
sources = { sources = {
{ name = "copilot", priority = 9 }, { name = "copilot", priority = 8 },
{ name = "nvim_lsp", priority = 8 }, { name = "nvim_lsp", priority = 9 },
{ nane = "buffer", priority = 7 }, { nane = "buffer", priority = 7 },
{ name = "luasnip", priority = 6 }, { name = "luasnip", priority = 6 },
{ name = "path" }, { name = "path" },