fix: formatting
This commit is contained in:
parent
c6affee6c1
commit
eebbb6c4b7
12 changed files with 642 additions and 640 deletions
12
init.lua
12
init.lua
|
@ -14,16 +14,16 @@ end
|
|||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
-- Fix for yanking to system clipboard on Windows
|
||||
if vim.fn.has('wsl') == 1 then
|
||||
if vim.fn.has("wsl") == 1 then
|
||||
vim.g.clipboard = {
|
||||
name = 'WslClipboard',
|
||||
name = "WslClipboard",
|
||||
copy = {
|
||||
['+'] = 'clip.exe',
|
||||
['*'] = 'clip.exe',
|
||||
["+"] = "clip.exe",
|
||||
["*"] = "clip.exe",
|
||||
},
|
||||
paste = {
|
||||
['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
|
||||
['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
|
||||
["+"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
|
||||
["*"] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
|
||||
},
|
||||
cache_enabled = 0,
|
||||
}
|
||||
|
|
|
@ -13,9 +13,9 @@ vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move lines under cursor d
|
|||
vim.keymap.set("n", "n", "nzzzv", { desc = "Go to next search result and keep cursor centered on screen" })
|
||||
vim.keymap.set("n", "N", "Nzzzv", { desc = "Go to previous search result and keep cursor centered on screen" })
|
||||
|
||||
vim.keymap.set("x", "<Leader>p", "\"_dP", { desc = "Paste without replacing clipboard contents" })
|
||||
vim.keymap.set("x", "<Leader>p", '"_dP', { desc = "Paste without replacing clipboard contents" })
|
||||
|
||||
vim.keymap.set("n", "<Leader>y", "\"*y", { desc = "Yank into system clipboard" })
|
||||
vim.keymap.set("v", "<Leader>y", "\"*y", { desc = "Yank into system clipboard" })
|
||||
vim.keymap.set("n", "<Leader>y", '"*y', { desc = "Yank into system clipboard" })
|
||||
vim.keymap.set("v", "<Leader>y", '"*y', { desc = "Yank into system clipboard" })
|
||||
|
||||
vim.keymap.set("i", "jk", "<Esc>", { desc = "Exit insert mode" })
|
||||
|
|
|
@ -38,8 +38,8 @@ return {
|
|||
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require('luasnip').lsp_expand(args.body)
|
||||
end
|
||||
require("luasnip").lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
|
||||
sources = cmp.config.sources({
|
||||
|
@ -91,8 +91,7 @@ return {
|
|||
opts = {
|
||||
options = {
|
||||
custom_commentstring = function()
|
||||
return require("ts_context_commentstring.internal").calculate_commentstring()
|
||||
or vim.bo.commentstring
|
||||
return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring
|
||||
end,
|
||||
},
|
||||
},
|
||||
|
|
|
@ -15,7 +15,7 @@ return {
|
|||
opts = {
|
||||
default_integrations = true,
|
||||
dim_inactive = {
|
||||
enabled = true
|
||||
enabled = true,
|
||||
},
|
||||
flavour = "macchiato",
|
||||
integrations = {
|
||||
|
@ -41,7 +41,7 @@ return {
|
|||
treesitter = true,
|
||||
treesitter_context = true,
|
||||
which_key = true,
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -151,8 +151,8 @@ return {
|
|||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "LazyGit" }
|
||||
}
|
||||
{ "<leader>gg", "<cmd>LazyGit<cr>", desc = "LazyGit" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
|
@ -166,6 +166,6 @@ return {
|
|||
changedelete = { text = "▎" },
|
||||
untracked = { text = "▎" },
|
||||
},
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
return { {
|
||||
return {
|
||||
{
|
||||
"mfussenegger/nvim-lint",
|
||||
opts = {
|
||||
events = { "BufWritePost", "BufReadPost", "InsertLeave" },
|
||||
|
@ -23,7 +24,8 @@ return { {
|
|||
end,
|
||||
})
|
||||
end,
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
event = { "BufWritePost", "BufReadPost", "InsertLeave" },
|
||||
opts = function()
|
||||
|
@ -32,7 +34,8 @@ return { {
|
|||
return {
|
||||
sources = {
|
||||
diagnostics.vale,
|
||||
},
|
||||
}
|
||||
end,
|
||||
},
|
||||
}
|
||||
end
|
||||
} }
|
||||
|
|
|
@ -10,8 +10,8 @@ return {
|
|||
"lua_ls",
|
||||
"tsserver",
|
||||
"html",
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"WhoIsSethDaniel/mason-tool-installer.nvim",
|
||||
|
@ -25,7 +25,7 @@ return {
|
|||
"vale",
|
||||
},
|
||||
automatic_installation = true,
|
||||
}
|
||||
},
|
||||
},
|
||||
-- lspconfig should be the last step.
|
||||
{
|
||||
|
@ -39,7 +39,7 @@ return {
|
|||
servers = {
|
||||
tsserver = {},
|
||||
lua_ls = {},
|
||||
}
|
||||
},
|
||||
},
|
||||
config = function(_, opts)
|
||||
local lspconfig = require("lspconfig")
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
return {
|
||||
{
|
||||
'freddiehaddad/feline.nvim',
|
||||
"freddiehaddad/feline.nvim",
|
||||
init = function()
|
||||
local ctp_feline = require('catppuccin.groups.integrations.feline')
|
||||
local ctp_feline = require("catppuccin.groups.integrations.feline")
|
||||
|
||||
ctp_feline.setup()
|
||||
|
||||
require("feline").setup({
|
||||
components = ctp_feline.get(),
|
||||
})
|
||||
end
|
||||
end,
|
||||
},
|
||||
{
|
||||
"famiu/bufdelete.nvim",
|
||||
|
@ -37,8 +37,8 @@ return {
|
|||
text_align = "left",
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"lukas-reineke/indent-blankline.nvim",
|
||||
|
@ -96,17 +96,17 @@ return {
|
|||
{
|
||||
"stevearc/dressing.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {}
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"rcarriga/nvim-notify",
|
||||
opts = {
|
||||
timeout = 2000,
|
||||
stages = "static",
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"MunifTanjim/nui.nvim"
|
||||
"MunifTanjim/nui.nvim",
|
||||
},
|
||||
{
|
||||
"folke/noice.nvim",
|
||||
|
@ -115,7 +115,7 @@ return {
|
|||
dependencies = {
|
||||
"MunifTanjim/nui.nvim",
|
||||
"rcarriga/nvim-notify",
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
"goolord/alpha-nvim",
|
||||
|
@ -159,5 +159,5 @@ return {
|
|||
|
||||
alpha.setup(dashboard.opts)
|
||||
end,
|
||||
}
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue