kayprish/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

💄 style(nvim): indent to 2 spaces

Browse source
This commit is contained in:
Sergio Laín 2023-10-18 12:04:10 +02:00
parent 853b323773
commit 66af3b6fc1
No known key found for this signature in database
GPG key ID: 14C9B8080681777B
3 changed files with 50 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/nvim/lua/plugins/compiler.lua
View file

@ -4,5 +4,5 @@ return {
cmd = { "CompilerOpen", "CompilerToggleResults", "CompilerRedo" }, cmd = { "CompilerOpen", "CompilerToggleResults", "CompilerRedo" },
dependencies = { "stevearc/overseer.nvim" }, dependencies = { "stevearc/overseer.nvim" },
opts = {}, opts = {},
} },
} }

4
.config/nvim/lua/plugins/git.lua
View file

@ -10,10 +10,6 @@ return {
"akinsho/git-conflict.nvim", "akinsho/git-conflict.nvim",
opts = { opts = {
default_mappings = false, default_mappings = false,
highlights = {
incoming = "DiffAdd",
current = "DiffText",
},
}, },
keys = { keys = {
{ "<leader>gct", "<cmd>GitConflictChooseTheirs<cr>", desc = "Choose Their Changes" }, { "<leader>gct", "<cmd>GitConflictChooseTheirs<cr>", desc = "Choose Their Changes" },