fix: spring cleanup
This commit is contained in:
parent
b5be5a3659
commit
6060e83a16
4 changed files with 71 additions and 100 deletions
|
|
@ -1,65 +1,65 @@
|
|||
return {
|
||||
"folke/tokyonight.nvim",
|
||||
tag = "stable",
|
||||
lazy = false,
|
||||
enabled = true,
|
||||
priority = 1000,
|
||||
opts = {},
|
||||
config = function()
|
||||
local tokyonight = require("tokyonight")
|
||||
local util = require("tokyonight.util")
|
||||
tokyonight.setup({
|
||||
styles = {
|
||||
-- See :help nvim_set_hl
|
||||
comments = { italic = true },
|
||||
--functions = { underdotted = true },
|
||||
},
|
||||
on_colors = function(colors)
|
||||
-- Brighten up comments a bit
|
||||
colors.comment = "#888fac"
|
||||
-- Better visible visual selection background color
|
||||
--colors.bg_visual = "#e82a86"
|
||||
--colors.bg_visual = colors.teal
|
||||
end,
|
||||
on_highlights = function(hl, c)
|
||||
-- Brighter line numbers
|
||||
hl.LineNr = {
|
||||
fg = util.darken(c.dark5, 0.6),
|
||||
}
|
||||
--hl.ColorColumn = {
|
||||
-- bg = c.purple,
|
||||
--}
|
||||
"folke/tokyonight.nvim",
|
||||
tag = "stable",
|
||||
lazy = false,
|
||||
enabled = false,
|
||||
priority = 1000,
|
||||
opts = {},
|
||||
config = function()
|
||||
local tokyonight = require("tokyonight")
|
||||
local util = require("tokyonight.util")
|
||||
tokyonight.setup({
|
||||
styles = {
|
||||
-- See :help nvim_set_hl
|
||||
comments = { italic = true },
|
||||
--functions = { underdotted = true },
|
||||
},
|
||||
on_colors = function(colors)
|
||||
-- Brighten up comments a bit
|
||||
colors.comment = "#888fac"
|
||||
-- Better visible visual selection background color
|
||||
--colors.bg_visual = "#e82a86"
|
||||
--colors.bg_visual = colors.teal
|
||||
end,
|
||||
on_highlights = function(hl, c)
|
||||
-- Brighter line numbers
|
||||
hl.LineNr = {
|
||||
fg = util.darken(c.dark5, 0.6),
|
||||
}
|
||||
--hl.ColorColumn = {
|
||||
-- bg = c.purple,
|
||||
--}
|
||||
|
||||
-- Remove borders from Telescope windows
|
||||
local prompt = "#2d3149"
|
||||
hl.TelescopeNormal = {
|
||||
bg = c.bg_dark,
|
||||
fg = c.fg_dark,
|
||||
}
|
||||
hl.TelescopeBorder = {
|
||||
bg = c.bg_dark,
|
||||
fg = c.bg_dark,
|
||||
}
|
||||
hl.TelescopePromptNormal = {
|
||||
bg = prompt,
|
||||
}
|
||||
hl.TelescopePromptBorder = {
|
||||
bg = prompt,
|
||||
fg = prompt,
|
||||
}
|
||||
hl.TelescopePromptTitle = {
|
||||
bg = prompt,
|
||||
fg = prompt,
|
||||
}
|
||||
hl.TelescopePreviewTitle = {
|
||||
bg = c.bg_dark,
|
||||
fg = c.bg_dark,
|
||||
}
|
||||
hl.TelescopeResultsTitle = {
|
||||
bg = c.bg_dark,
|
||||
fg = c.bg_dark,
|
||||
}
|
||||
end,
|
||||
})
|
||||
end,
|
||||
-- Remove borders from Telescope windows
|
||||
local prompt = "#2d3149"
|
||||
hl.TelescopeNormal = {
|
||||
bg = c.bg_dark,
|
||||
fg = c.fg_dark,
|
||||
}
|
||||
hl.TelescopeBorder = {
|
||||
bg = c.bg_dark,
|
||||
fg = c.bg_dark,
|
||||
}
|
||||
hl.TelescopePromptNormal = {
|
||||
bg = prompt,
|
||||
}
|
||||
hl.TelescopePromptBorder = {
|
||||
bg = prompt,
|
||||
fg = prompt,
|
||||
}
|
||||
hl.TelescopePromptTitle = {
|
||||
bg = prompt,
|
||||
fg = prompt,
|
||||
}
|
||||
hl.TelescopePreviewTitle = {
|
||||
bg = c.bg_dark,
|
||||
fg = c.bg_dark,
|
||||
}
|
||||
hl.TelescopeResultsTitle = {
|
||||
bg = c.bg_dark,
|
||||
fg = c.bg_dark,
|
||||
}
|
||||
end,
|
||||
})
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
-- keyboard shortcuts
|
||||
|
||||
-- Leader key set to space, base for any key combo
|
||||
-- vim.g.mapleader = " "
|
||||
-- Leader key. Base for any key combo
|
||||
vim.g.mapleader = ";"
|
||||
|
||||
--vim.keymap.set("n", "<leader>r", vim.cmd.Ex, { noremap = true, desc = "netrw File Browser" }) -- netrw file explorer
|
||||
--vim.keymap.set("n", "<leader>e", "<cmd>lua require('oil').toggle_float('.')<CR>", { noremap = true, silent = true })
|
||||
vim.keymap.set("n", "<leader>e", ":Oil --float<CR>", { desc = "Oil" })
|
||||
|
||||
-- List recently opened files
|
||||
|
|
@ -20,7 +17,7 @@ vim.keymap.set(
|
|||
)
|
||||
|
||||
-- Live find string (using ripgrep)
|
||||
vim.keymap.set("n", "<leader>fg", ":Telescope live_grep<CR>", { noremap = true, desc = "Search string" })
|
||||
vim.keymap.set("n", "<leader>fg", ":Telescope live_grep<CR>", { noremap = true, desc = "String search" })
|
||||
|
||||
-- Find string under cursor (using ripgrep)
|
||||
vim.keymap.set(
|
||||
|
|
@ -29,18 +26,10 @@ vim.keymap.set(
|
|||
":Telescope grep_string<CR>",
|
||||
{ noremap = true, desc = "Search text under cursor in cwd/grep search string" }
|
||||
)
|
||||
-- Find string under cursor
|
||||
--vim.keymap.set(
|
||||
-- "n",
|
||||
-- "<leader>fs",
|
||||
-- [[<cmd>lua require('telescope.builtin').grep_string()<cr>]],
|
||||
-- { silent = true, noremap = true }
|
||||
--)
|
||||
|
||||
vim.keymap.set("n", "<leader><leader>", ":Telescope buffers<CR>", { noremap = true, desc = "Show open buffers" })
|
||||
-- todo-comments.nvim
|
||||
vim.keymap.set("n", "<leader>ft", ":TodoTelescope<CR>", { noremap = true, desc = "Find TODOs" })
|
||||
--vim.keymap.set("n", "<leader>gs", ":Telescope git_status<CR>", { noremap = true, desc = "Git status" })
|
||||
vim.keymap.set(
|
||||
"n",
|
||||
"<leader>gla",
|
||||
|
|
@ -48,15 +37,12 @@ vim.keymap.set(
|
|||
{ noremap = true, desc = "Git log (across all files)" }
|
||||
)
|
||||
vim.keymap.set("n", "<leader>glf", ":Telescope git_bcommits<CR>", { noremap = true, desc = "Git log (this file)" })
|
||||
--vim.keymap.set("n", "<leader>gdp", ":Gitsigns diffthis<CR>", { noremap = true, desc = "Git diff previous (this file)" })
|
||||
--vim.keymap.set("n", "<leader>gd", ":Gitsigns diffthis<CR>", { noremap = true, desc = "Git diff previous (this file)" })
|
||||
vim.keymap.set("n", "<leader>gd", function()
|
||||
if next(require("diffview.lib").views) == nil then
|
||||
vim.cmd("DiffviewOpen")
|
||||
else
|
||||
vim.cmd("DiffviewClose")
|
||||
end
|
||||
--end, { noremap = true, desc = "Diff this shit" })
|
||||
end, { noremap = true, desc = "Toggle diff/stage UI " })
|
||||
vim.keymap.set(
|
||||
"n",
|
||||
|
|
@ -72,14 +58,11 @@ vim.keymap.set("n", "b", "B") -- skip punctuation when moving to end of previous
|
|||
|
||||
--vim.keymap.set("n", "<leader>i", "gg=G``", { noremap = true, desc = "Re-indent whole file" }) -- '``' makes it stay at current line+column position
|
||||
|
||||
-- Thank you @ThePrimeagen for those
|
||||
-- https://github.com/ThePrimeagen/init.lua/blob/master/lua/theprimeagen/remap.lua
|
||||
-- Thanks https://github.com/ThePrimeagen/init.lua/blob/master/lua/theprimeagen/remap.lua
|
||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv") -- move whole lines/blocks down in visual mode
|
||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv") -- move whole lines/blocks up in visual mode
|
||||
|
||||
vim.keymap.set("n", "<C-d>", "<C-d>zz") -- eye-friendly down scrolling
|
||||
vim.keymap.set("n", "<C-u>", "<C-u>zz") -- eye-friendly up scrolling
|
||||
|
||||
vim.keymap.set("n", "J", "mzJ`z") -- when merging lines, keep cursor at current position
|
||||
|
||||
vim.keymap.set(
|
||||
|
|
@ -99,24 +82,21 @@ vim.keymap.set({ "n", "v" }, "<leader>o", function()
|
|||
})
|
||||
end, { desc = "Format file or range (in visual mode)" })
|
||||
|
||||
-- Toggle zen-mode.nvim
|
||||
vim.keymap.set("n", "<leader>z", ":ZenMode<CR>")
|
||||
|
||||
-- Go to next diagnostic item (any severity)
|
||||
vim.keymap.set({ "n", "v" }, "<leader>da", function()
|
||||
vim.diagnostic.goto_next({})
|
||||
vim.diagnostic.get_next({})
|
||||
vim.api.nvim_feedkeys("zz", "n", false)
|
||||
end, { desc = "Go to next diagnostic" })
|
||||
|
||||
-- Go to next diagnostic item (error severity)
|
||||
vim.keymap.set({ "n", "v" }, "<leader>de", function()
|
||||
vim.diagnostic.goto_next({ severity = vim.diagnostic.severity.ERROR })
|
||||
vim.diagnostic.get_next({ severity = vim.diagnostic.severity.ERROR })
|
||||
vim.api.nvim_feedkeys("zz", "n", false)
|
||||
end, { desc = "Go to next error diagnostic" })
|
||||
|
||||
-- Go to next diagnostic item (warning severity)
|
||||
vim.keymap.set({ "n", "v" }, "<leader>dw", function()
|
||||
vim.diagnostic.goto_next({ severity = vim.diagnostic.severity.WARN })
|
||||
vim.diagnostic.get_next({ severity = vim.diagnostic.severity.WARN })
|
||||
vim.api.nvim_feedkeys("zz", "n", false)
|
||||
end, { desc = "Go to next warning diagnostic" })
|
||||
|
||||
|
|
@ -125,10 +105,6 @@ vim.keymap.set({ "n", "v" }, "<leader>dd", function()
|
|||
vim.diagnostic.enable(not vim.diagnostic.is_enabled())
|
||||
end, { desc = "Turn diagnostics on/off" })
|
||||
|
||||
-- Toggle trouble (for document)
|
||||
--vim.keymap.set("n", "<leader>qq", ":TroubleToggle<CR>")
|
||||
--vim.keymap.set("n", "<leader>qq", "<cmd>Trouble diagnostics toggle<cr>")
|
||||
|
||||
-- By default, show virtual_text and hide virtual_lines.
|
||||
-- This keymap allows to do the opposite. Can be useful when there are multiple
|
||||
-- severities on the same line
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue