mirror of
https://github.com/pojokcodeid/nvim-lazy.git
synced 2025-07-10 01:14:30 +02:00
add: update config
This commit is contained in:
parent
a2b9217202
commit
880a48e1a3
8 changed files with 128 additions and 85 deletions
|
@ -4,7 +4,7 @@ require("config.lazy")
|
|||
require("user.colorscheme")
|
||||
require("user.keymaps")
|
||||
-- require("user.snip")
|
||||
-- require("core.neovide")
|
||||
require("core.neovide")
|
||||
require("custom.autocmd")
|
||||
require("custom.keymaps")
|
||||
-- require("user.nvim-tree")
|
||||
|
|
|
@ -1,14 +1,35 @@
|
|||
if vim.g.neovide then
|
||||
local opts = { noremap = true, silent = true }
|
||||
vim.g.neovide_input_use_logo = 1 -- enable use of the logo (cmd) key
|
||||
vim.keymap.set("n", "<c-s>", ":w<CR>") -- Save
|
||||
vim.keymap.set("v", "<c-c>", '"+y') -- Copy
|
||||
vim.keymap.set("n", "<c-v>", '"+P') -- Paste normal mode
|
||||
vim.keymap.set("v", "<c-v>", '"+P') -- Paste visual mode
|
||||
vim.keymap.set("c", "<c-v>", "<C-R>+") -- Paste command mode
|
||||
vim.keymap.set("i", "<c-v>", '<ESC>l"+Pli') -- Paste insert mode
|
||||
vim.keymap.set("n", "<c-/>", "<esc><cmd>lua require('Comment.api').toggle.linewise.current()<cr>$i<Right><leader>")
|
||||
vim.keymap.set("i", "<c-/>", "<esc><cmd>lua require('Comment.api').toggle.linewise.current()<cr>$i<Right><leader>")
|
||||
vim.keymap.set("v", "<c-/>", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>")
|
||||
vim.keymap.set("n", "<c-s>", ":w<CR>", opts) -- Save
|
||||
vim.keymap.set("v", "<c-c>", '"+y', opts) -- Copy
|
||||
vim.keymap.set("n", "<c-v>", '"+P', opts) -- Paste normal mode
|
||||
vim.keymap.set("v", "<c-v>", '"+P', opts) -- Paste visual mode
|
||||
vim.keymap.set("x", "<c-v>", '"+P', opts) -- Paste visual mode
|
||||
vim.keymap.set("c", "<c-v>", "<C-R>+", opts) -- Paste command mode
|
||||
vim.keymap.set("c", "<c-v>", '"+P', opts) -- Paste command mode
|
||||
vim.keymap.set("i", "<c-v>", '<ESC>l"+Pli', opts) -- Paste insert mode
|
||||
vim.keymap.set(
|
||||
"n",
|
||||
"<c-/>",
|
||||
"<esc><cmd>lua require('Comment.api').toggle.linewise.current()<cr>$i<Right><leader>",
|
||||
opts
|
||||
)
|
||||
vim.keymap.set(
|
||||
"i",
|
||||
"<c-/>",
|
||||
"<esc><cmd>lua require('Comment.api').toggle.linewise.current()<cr>$i<Right><leader>",
|
||||
opts
|
||||
)
|
||||
vim.keymap.set("v", "<c-/>", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", opts)
|
||||
|
||||
-- vim.keymap.set("n", "<C-s>", ":w<CR>", opts) -- Save
|
||||
-- vim.keymap.set("v", "<C-c>", '"+y', opts) -- Copy
|
||||
-- vim.keymap.set("n", "<C-v>", '"+P', opts) -- Paste normal mode
|
||||
-- vim.keymap.set("v", "<C-v>", '"+P', opts) -- Paste visual mode
|
||||
-- vim.keymap.set("c", "<C-v>", "<C-R>+", opts) -- Paste command mode
|
||||
-- vim.keymap.set("i", "<C-v>", '<ESC>l"+Pli', opts) -- Paste insert mode
|
||||
-- vim.keymap.set("t", "<C-v>", '<C-\\><C-n>"+Pi', opts)
|
||||
|
||||
vim.o.guifont = "Hasklug_Nerd_Font:h15"
|
||||
vim.g.neovide_padding_top = 0
|
||||
|
@ -17,9 +38,8 @@ if vim.g.neovide then
|
|||
vim.g.neovide_padding_left = 1
|
||||
|
||||
-- config for transparent
|
||||
--vim.g.neovide_transparency = 0.8
|
||||
vim.g.neovide_hide_mouse_when_typing = false
|
||||
vim.g.neovide_transparency = 1
|
||||
vim.g.neovide_hide_mouse_when_typing = false
|
||||
vim.g.neovide_underline_automatic_scaling = false
|
||||
vim.g.neovide_refresh_rate_idle = 5
|
||||
vim.g.neovide_no_idle = true
|
||||
|
@ -42,11 +62,19 @@ if vim.g.neovide then
|
|||
vim.g.neovide_scale_factor = 1
|
||||
vim.opt.cmdheight = 0
|
||||
vim.opt.spell = false
|
||||
|
||||
vim.g.neovide_window_blurred = true
|
||||
vim.g.neovide_floating_blur_amount_x = 2.0
|
||||
vim.g.neovide_floating_blur_amount_y = 2.0
|
||||
vim.g.neovide_floating_shadow = false
|
||||
vim.g.neovide_floating_z_height = 10
|
||||
vim.g.neovide_light_angle_degrees = 45
|
||||
vim.g.neovide_light_radius = 5
|
||||
end
|
||||
|
||||
-- Allow clipboard copy paste in neovim
|
||||
vim.g.neovide_input_use_logo = 1
|
||||
vim.api.nvim_set_keymap("", "<c-v>", "+p<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("!", "<c-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("t", "<c-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("v", "<c-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
-- -- Allow clipboard copy paste in neovim
|
||||
-- vim.g.neovide_input_use_logo = 1
|
||||
-- vim.api.nvim_set_keymap("", "<c-v>", "+p<CR>", { noremap = true, silent = true })
|
||||
-- vim.api.nvim_set_keymap("!", "<c-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
-- vim.api.nvim_set_keymap("t", "<c-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
-- vim.api.nvim_set_keymap("v", "<c-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
|
|
|
@ -3,3 +3,9 @@ local keymap = vim.api.nvim_set_keymap
|
|||
|
||||
keymap("n", "]h", '<cmd>lua print("Testing")<cr>', opts)
|
||||
keymap("n", "f", "<cmd>NvimTreeFindFileToggle<cr><cr><Up>", opts)
|
||||
|
||||
-- Allow clipboard copy paste in neovim
|
||||
vim.api.nvim_set_keymap("", "<C-v>", "+p<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("!", "<C-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("t", "<C-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("v", "<C-v>", "<C-R>+", { noremap = true, silent = true })
|
||||
|
|
|
@ -8,7 +8,7 @@ return {
|
|||
lazy = false, -- make sure we load this during startup if it is your main colorscheme
|
||||
priority = 1000, -- make sure to load this before all the other start plugins
|
||||
config = function()
|
||||
local is_transparent = true
|
||||
local is_transparent = false
|
||||
local palette = require("github-theme.palette").load("github_dark_dimmed")
|
||||
require("github-theme").setup({
|
||||
options = {
|
||||
|
|
|
@ -1,40 +1,46 @@
|
|||
local is_neovide = false
|
||||
if vim.g.neovide then
|
||||
is_neovide = true
|
||||
end
|
||||
|
||||
return {
|
||||
-- animations
|
||||
-- {
|
||||
-- "echasnovski/mini.animate",
|
||||
-- event = "InsertEnter",
|
||||
-- opts = function()
|
||||
-- -- don't use animate when scrolling with the mouse
|
||||
-- local mouse_scrolled = false
|
||||
-- for _, scroll in ipairs({ "Up", "Down" }) do
|
||||
-- local key = "<ScrollWheel" .. scroll .. ">"
|
||||
-- vim.keymap.set({ "", "i" }, key, function()
|
||||
-- mouse_scrolled = true
|
||||
-- return key
|
||||
-- end, { expr = true })
|
||||
-- end
|
||||
--
|
||||
-- local animate = require("mini.animate")
|
||||
-- return {
|
||||
-- resize = {
|
||||
-- timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
|
||||
-- },
|
||||
-- scroll = {
|
||||
-- timing = animate.gen_timing.linear({ duration = 150, unit = "total" }),
|
||||
-- subscroll = animate.gen_subscroll.equal({
|
||||
-- predicate = function(total_scroll)
|
||||
-- if mouse_scrolled then
|
||||
-- mouse_scrolled = false
|
||||
-- return false
|
||||
-- end
|
||||
-- return total_scroll > 1
|
||||
-- end,
|
||||
-- }),
|
||||
-- },
|
||||
-- }
|
||||
-- end,
|
||||
-- config = function(_, opts)
|
||||
-- require("mini.animate").setup(opts)
|
||||
-- end,
|
||||
-- },
|
||||
{
|
||||
"echasnovski/mini.animate",
|
||||
event = "BufRead",
|
||||
enabled = not is_neovide,
|
||||
opts = function()
|
||||
-- don't use animate when scrolling with the mouse
|
||||
local mouse_scrolled = false
|
||||
for _, scroll in ipairs({ "Up", "Down" }) do
|
||||
local key = "<ScrollWheel" .. scroll .. ">"
|
||||
vim.keymap.set({ "", "i" }, key, function()
|
||||
mouse_scrolled = true
|
||||
return key
|
||||
end, { expr = true })
|
||||
end
|
||||
|
||||
local animate = require("mini.animate")
|
||||
return {
|
||||
resize = {
|
||||
timing = animate.gen_timing.linear({ duration = 100, unit = "total" }),
|
||||
},
|
||||
scroll = {
|
||||
timing = animate.gen_timing.linear({ duration = 150, unit = "total" }),
|
||||
subscroll = animate.gen_subscroll.equal({
|
||||
predicate = function(total_scroll)
|
||||
if mouse_scrolled then
|
||||
mouse_scrolled = false
|
||||
return false
|
||||
end
|
||||
return total_scroll > 1
|
||||
end,
|
||||
}),
|
||||
},
|
||||
}
|
||||
end,
|
||||
config = function(_, opts)
|
||||
require("mini.animate").setup(opts)
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
@ -1,24 +1,24 @@
|
|||
return {
|
||||
-- {
|
||||
-- "NvChad/nvim-colorizer.lua",
|
||||
-- opts = {
|
||||
-- user_default_options = {
|
||||
-- tailwind = true,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
-- {
|
||||
-- "hrsh7th/nvim-cmp",
|
||||
-- dependencies = {
|
||||
-- { "roobert/tailwindcss-colorizer-cmp.nvim", config = true },
|
||||
-- },
|
||||
-- opts = function(_, opts)
|
||||
-- -- original kind icon formatter
|
||||
-- local format_kinds = opts.formatting.format
|
||||
-- opts.formatting.format = function(entry, item)
|
||||
-- format_kinds(entry, item) -- add icons
|
||||
-- return require("tailwindcss-colorizer-cmp").formatter(entry, item)
|
||||
-- end
|
||||
-- end,
|
||||
-- },
|
||||
{
|
||||
"NvChad/nvim-colorizer.lua",
|
||||
opts = {
|
||||
user_default_options = {
|
||||
tailwind = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = {
|
||||
{ "roobert/tailwindcss-colorizer-cmp.nvim", config = true },
|
||||
},
|
||||
opts = function(_, opts)
|
||||
-- original kind icon formatter
|
||||
local format_kinds = opts.formatting.format
|
||||
opts.formatting.format = function(entry, item)
|
||||
format_kinds(entry, item) -- add icons
|
||||
return require("tailwindcss-colorizer-cmp").formatter(entry, item)
|
||||
end
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
|
@ -20,6 +20,7 @@ return {
|
|||
{
|
||||
"folke/noice.nvim",
|
||||
lazy = true,
|
||||
enabled = true,
|
||||
dependencies = {
|
||||
{ "MunifTanjim/nui.nvim" },
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue