servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[fix] Update plugins and change formatting for some stuff

Browse Source
This commit is contained in:
Uttarayan
2023-04-06 23:50:29 +05:30
parent 4283263600
commit c09e85d4eb
2 changed files with 242 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
config/nvim/lazy-lock.json
View File

@@ -1,14 +1,14 @@
{ {
"SchemaStore.nvim": { "branch": "main", "commit": "dde293000b626cca90804e7b82731173f195b3ee" }, "SchemaStore.nvim": { "branch": "main", "commit": "a592fbe98959d13014b022ec1b1418498309019c" },
"barbecue.nvim": { "branch": "main", "commit": "a0e19486ccc1fb134f6ef7bf914d07bbb462e346" }, "barbecue.nvim": { "branch": "main", "commit": "a0e19486ccc1fb134f6ef7bf914d07bbb462e346" },
"chadtree": { "branch": "chad", "commit": "38a86b349902b7afd0589200b98a7459b32d6c1a" }, "chadtree": { "branch": "chad", "commit": "67b12761b2ab6885f1585ef9820221cdeae9100f" },
"comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" }, "comfortable-motion.vim": { "branch": "master", "commit": "e20aeafb07c6184727b29f7674530150f7ab2036" },
"copilot.vim": { "branch": "release", "commit": "b6e5624351ba735e25eb8864d7d22819aad00606" }, "copilot.vim": { "branch": "release", "commit": "b6e5624351ba735e25eb8864d7d22819aad00606" },
"coq.artifacts": { "branch": "artifacts", "commit": "073ffdc8504c4b5ff98c099002fb58adaf2f782e" }, "coq.artifacts": { "branch": "artifacts", "commit": "82e29fb9443f41573483fa83e39490d7a6324c8c" },
"coq.thirdparty": { "branch": "3p", "commit": "6b52ae60235525d6a00fc091de4598ac88a63ecc" }, "coq.thirdparty": { "branch": "3p", "commit": "83b1b7b9545b94f20df42b4ef224de576e628aaf" },
"coq_nvim": { "branch": "coq", "commit": "c831bf452846bae4179edac3f395e8e5a679a150" }, "coq_nvim": { "branch": "coq", "commit": "45137deb2a34a8b1482fa0f49927e171223a9173" },
"d2-vim": { "branch": "master", "commit": "981c87dccb63df2887cc41b96e84bf550f736c57" }, "d2-vim": { "branch": "master", "commit": "981c87dccb63df2887cc41b96e84bf550f736c57" },
"diffview.nvim": { "branch": "main", "commit": "932d10de327bccdedee439d9d55f4d857caa334e" }, "diffview.nvim": { "branch": "main", "commit": "6bebefbc4c90e6d2b8c65e65b055d284475d89f8" },
"formatter.nvim": { "branch": "master", "commit": "ed949c13e1a942db29ababa35e8c7864ced90eb6" }, "formatter.nvim": { "branch": "master", "commit": "ed949c13e1a942db29ababa35e8c7864ced90eb6" },
"galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" }, "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" },
"git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" }, "git-conflict.nvim": { "branch": "main", "commit": "80bc8931d4ed8c8c4d289a08e1838fcf4741408d" },
@@ -19,24 +19,26 @@
"leap.nvim": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" }, "leap.nvim": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" },
"lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
"lsp_signature.nvim": { "branch": "master", "commit": "1882019270be445a8cad4353f1530574f2b2d02d" }, "lsp_signature.nvim": { "branch": "master", "commit": "1882019270be445a8cad4353f1530574f2b2d02d" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "b64fdede85fd5e0b720ce722919e0a9b95ed6547" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "d88d3564b2ae1d35163ccefda7184d7df104e198" },
"mason.nvim": { "branch": "main", "commit": "baee73f710fda10d3f946dc98f14b6923f38e3f1" }, "mason.nvim": { "branch": "main", "commit": "b54d4e3171cc9735de915dbb97e987fb1f05dad9" },
"no-neck-pain.nvim": { "branch": "main", "commit": "33db10e593edc7d720c0f5c0320899bd1dd014e1" }, "no-neck-pain.nvim": { "branch": "main", "commit": "33db10e593edc7d720c0f5c0320899bd1dd014e1" },
"null-ls.nvim": { "branch": "main", "commit": "5855128178fa78293acdfb5b4e41ef046779240b" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
"nvim-dap": { "branch": "master", "commit": "1dd02e82c77d558e30ba831db4c2e7ed534e874f" }, "nvim-dap": { "branch": "master", "commit": "1dd02e82c77d558e30ba831db4c2e7ed534e874f" },
"nvim-dap-ui": { "branch": "master", "commit": "56a2df0e96bfa64ebd6967e7cad877a1530633d5" }, "nvim-dap-ui": { "branch": "master", "commit": "56a2df0e96bfa64ebd6967e7cad877a1530633d5" },
"nvim-lspconfig": { "branch": "master", "commit": "94291c924f0efdbc16ac625cf77ae7d3a7fa5821" }, "nvim-lspconfig": { "branch": "master", "commit": "7d5af779acbc8a6ff9dfd7f2d39ae898fb67480f" },
"nvim-navic": { "branch": "master", "commit": "5b37ffc213f37acb529eda2b319deee4c5b8c55b" }, "nvim-navic": { "branch": "master", "commit": "27124a773d362628b114cd12016e743dab4ccf3e" },
"nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" }, "nvim-notify": { "branch": "master", "commit": "50d037041ada0895aeba4c0215cde6d11b7729c4" },
"nvim-treesitter": { "branch": "master", "commit": "2f3113ff6d554e3fe4da3610135c2f404f7aa270" }, "nvim-nu": { "branch": "main", "commit": "f45f36a97fb0ea6e39f08cc2fac7a2fb3dc3999b" },
"nvim-treesitter-context": { "branch": "master", "commit": "959265a5d438462dc5d3dde215b915109c3d6fcb" }, "nvim-treesitter": { "branch": "master", "commit": "c85d059c462ae7de0aa2a6ed0589f0b223e0e6a9" },
"nvim-web-devicons": { "branch": "master", "commit": "d92b3f4275f4774c0cb23b8b094a41d1dbb3e78c" }, "nvim-treesitter-context": { "branch": "master", "commit": "68eaeb86738c660f7f31afb2cbfb2bdec50bbd92" },
"octo.nvim": { "branch": "master", "commit": "91a87271552828a499c2ddcc6a3e36f09f38c1d3" }, "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" },
"octo.nvim": { "branch": "master", "commit": "f37efab489a99b4a104e5ee18c73453d5e828b62" },
"plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
"rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" }, "rest.nvim": { "branch": "main", "commit": "0fdb69f328529b34a2279c14be63b3325dc52740" },
"rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
"sonokai": { "branch": "master", "commit": "bf1e4d016a08cc3fb2a3060309d00e04dbd4fc22" }, "sonokai": { "branch": "master", "commit": "a4d96b68fb1ba00fb2e91d2f46705de9cddbb348" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
"telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" }, "telescope.nvim": { "branch": "master", "commit": "942fe5faef47b21241e970551eba407bc10d9547" },

434
config/nvim/lua/plugins.lua
View File

@@ -19,238 +19,254 @@ vim.opt.rtp:prepend(lazypath)
-- local use = require('packer').use -- local use = require('packer').use
return require('lazy').setup({ return require('lazy').setup({
'ellisonleao/glow.nvim', 'ellisonleao/glow.nvim',
'samoshkin/vim-mergetool', 'samoshkin/vim-mergetool',
'mhartington/formatter.nvim', 'mhartington/formatter.nvim',
'christianrondeau/vim-base64', 'christianrondeau/vim-base64',
'tpope/vim-commentary', 'tpope/vim-commentary',
'tpope/vim-fugitive', 'tpope/vim-fugitive',
'tpope/vim-repeat', 'tpope/vim-repeat',
'tpope/vim-speeddating', 'tpope/vim-speeddating',
'tpope/vim-surround', 'tpope/vim-surround',
'tpope/vim-vinegar', 'tpope/vim-vinegar',
'tpope/vim-abolish', 'tpope/vim-abolish',
'yuttie/comfortable-motion.vim', 'yuttie/comfortable-motion.vim',
'ruanyl/vim-gh-line', 'ruanyl/vim-gh-line',
'rest-nvim/rest.nvim', 'rest-nvim/rest.nvim',
'b0o/SchemaStore.nvim', 'b0o/SchemaStore.nvim',
'rcarriga/nvim-notify', 'rcarriga/nvim-notify',
'folke/todo-comments.nvim', 'folke/todo-comments.nvim',
'github/copilot.vim', 'github/copilot.vim',
'ggandor/leap.nvim', 'ggandor/leap.nvim',
{ 'shortcuts/no-neck-pain.nvim', version = "*" }, { 'shortcuts/no-neck-pain.nvim', version = "*" },
{ 'folke/zen-mode.nvim', config = function() require('zen-mode').setup() end }, { 'folke/zen-mode.nvim', config = function() require('zen-mode').setup() end },
{ 'folke/twilight.nvim', config = function() require('twilight').setup() end }, { 'folke/twilight.nvim', config = function() require('twilight').setup() end },
{ 'pwntester/octo.nvim', config = function() require('octo').setup() end }, { 'pwntester/octo.nvim', config = function() require('octo').setup() end },
{ {
'utilyre/barbecue.nvim', 'utilyre/barbecue.nvim',
version = "*", version = "*",
config = function() require('barbecue').setup() end, config = function() require('barbecue').setup() end,
dependencies = { dependencies = {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
'SmiteshP/nvim-navic', 'SmiteshP/nvim-navic',
'nvim-tree/nvim-web-devicons' 'nvim-tree/nvim-web-devicons'
},
}, },
},
{ 'akinsho/git-conflict.nvim', { 'akinsho/git-conflict.nvim',
version = "*", version = "*",
config = function() config = function()
require('git-conflict').setup() require('git-conflict').setup()
end end
}, },
{ 'williamboman/mason.nvim', { 'williamboman/mason.nvim',
config = function() config = function()
require("mason").setup({ require("mason").setup({
ui = { ui = {
icons = { icons = {
package_installed = "✓", package_installed = "✓",
package_pending = "➜", package_pending = "➜",
package_uninstalled = "✗" package_uninstalled = "✗"
}
} }
} })
}) end
end },
}, {
{ "williamboman/mason-lspconfig.nvim",
"williamboman/mason-lspconfig.nvim", config = function()
config = function() require("mason-lspconfig").setup({
require("mason-lspconfig").setup({ ensure_installed = { "lua_ls", "rust_analyzer" },
ensure_installed = { "lua_ls", "rust_analyzer" }, automatic_installation = true,
automatic_installation = true, })
}) end
end },
},
{ {
'NTBBloodbath/galaxyline.nvim', branch = 'main', 'NTBBloodbath/galaxyline.nvim', branch = 'main',
config = function() require('statusline') end, config = function() require('statusline') end,
dependencies = { 'nvim-tree/nvim-web-devicons' } dependencies = { 'nvim-tree/nvim-web-devicons' }
}, },
{ 'sainnhe/sonokai', config = function() require('colorscheme') end }, { 'sainnhe/sonokai', config = function() require('colorscheme') end },
{ 'folke/which-key.nvim', config = function() require("which-key").setup() end }, { 'folke/which-key.nvim', config = function() require("which-key").setup() end },
{ 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } }, { 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } },
{ {
'nvim-telescope/telescope-fzf-native.nvim', 'nvim-telescope/telescope-fzf-native.nvim',
-- build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build', -- build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build',
build = 'make', build = 'make',
config = function() config = function()
require('telescope').setup { require('telescope').setup {
defaults = { defaults = {
initial_mode = 'insert', initial_mode = 'insert',
},
extensions = {
fzf = {
fuzzy = true, -- false will only do exact matching
override_generic_sorter = true, -- override the generic sorter
override_file_sorter = true, -- override the file sorter
case_mode = "smart_case", -- or "ignore_case" or "respect_case"
}
}
}
require('telescope').load_extension('fzf')
end,
},
{ 'nvim-telescope/telescope-ui-select.nvim',
config = function()
require("telescope").load_extension("ui-select")
end
},
{ 'norcalli/nvim-colorizer.lua', config = function() require 'colorizer'.setup() end, },
-- lsp
-- use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, }
{
'folke/trouble.nvim',
config = function()
-- local actions = require("telescope.actions")
require("trouble").setup()
local trouble = require("trouble.providers.telescope")
local telescope = require("telescope")
telescope.setup {
defaults = {
mappings = {
i = { ["<c-t>"] = trouble.open_with_trouble },
n = { ["<c-t>"] = trouble.open_with_trouble },
}, },
}, extensions = {
} fzf = {
end, fuzzy = true, -- false will only do exact matching
}, override_generic_sorter = true, -- override the generic sorter
override_file_sorter = true, -- override the file sorter
case_mode = "smart_case", -- or "ignore_case" or "respect_case"
}
}
}
require('telescope').load_extension('fzf')
end,
},
{ 'neovim/nvim-lspconfig', config = function() require("lsp") end, }, { 'nvim-telescope/telescope-ui-select.nvim',
{ 'nvim-lua/lsp-status.nvim' }, config = function()
{ 'ray-x/lsp_signature.nvim' }, require("telescope").load_extension("ui-select")
{ 'terrastruct/d2-vim' }, end
{ },
'andweeb/presence.nvim',
config = function()
require "presence".setup({ { 'norcalli/nvim-colorizer.lua', config = function() require 'colorizer'.setup() end, },
auto_update = true,
main_image = "file", -- lsp
-- use { 'onsails/lspkind-nvim', config = function() require'lspkind'.init() end, }
{
'folke/trouble.nvim',
config = function()
-- local actions = require("telescope.actions")
require("trouble").setup()
local trouble = require("trouble.providers.telescope")
local telescope = require("telescope")
telescope.setup {
defaults = {
mappings = {
i = { ["<c-t>"] = trouble.open_with_trouble },
n = { ["<c-t>"] = trouble.open_with_trouble },
},
},
}
end,
},
{ 'neovim/nvim-lspconfig', config = function() require("lsp") end, },
{ 'nvim-lua/lsp-status.nvim' },
{ 'ray-x/lsp_signature.nvim' },
{ 'terrastruct/d2-vim' },
{
'andweeb/presence.nvim',
config = function()
require "presence".setup({
auto_update = true,
main_image = "file",
})
end },
{ 'ms-jpq/coq_nvim', dependencies = { 'ms-jpq/coq.artifacts' }, build = ':COQdeps',
config = function()
-- require("coq")
vim.g.coq_settings.keymap = { jump_to_mark = "<c-j>" }
end
},
{ 'jose-elias-alvarez/null-ls.nvim', config = function()
local null_ls = require("null-ls")
null_ls.setup({
sources = {
null_ls.builtins.formatting.stylua,
null_ls.builtins.diagnostics.eslint,
null_ls.builtins.completion.spell,
},
}) })
end }, end },
{ 'ms-jpq/coq_nvim', dependencies = { 'ms-jpq/coq.artifacts' }, build = ':COQdeps', { 'ms-jpq/chadtree', build = ':CHADdeps' },
config = function() { 'ms-jpq/coq.thirdparty', config = function()
-- require("coq") require("coq_3p")({
vim.g.coq_settings.keymap = { jump_to_mark = "<c-j>" } {
src = "repl",
sh = "sh",
shell = { p = "perl", n = "node" },
max_lines = 99,
deadline = 500,
unsafe = { "rm", "poweroff", "mv" }
},
{ src = "bc", short_name = "MATH", precision = 6 },
{ src = "copilot", short_name = "COP", accept_key = "<C-l>" },
{ src = "dap" }
})
end end
}, },
{ 'ms-jpq/chadtree', build = ':CHADdeps' },
{ 'ms-jpq/coq.thirdparty', config = function()
require("coq_3p")({
{
src = "repl",
sh = "sh",
shell = { p = "perl", n = "node" },
max_lines = 99,
deadline = 500,
unsafe = { "rm", "poweroff", "mv" }
},
{ src = "bc", short_name = "MATH", precision = 6 },
{ src = "copilot", short_name = "COP", accept_key = "<C-l>" },
{ src = "dap" }
})
end
},
-- use 'airblade/vim-rooter' -- use 'airblade/vim-rooter'
-- use({ -- use({
-- "https://git.sr.ht/~whynothugo/lsp_lines.nvim", -- "https://git.sr.ht/~whynothugo/lsp_lines.nvim",
-- config = function() -- config = function()
-- require("lsp_lines").setup() -- require("lsp_lines").setup()
-- end, -- end,
-- }) -- })
{ {
'lukas-reineke/indent-blankline.nvim', 'lukas-reineke/indent-blankline.nvim',
config = function() config = function()
require("indent_blankline").setup { require("indent_blankline").setup {
show_end_of_line = true, show_end_of_line = true,
} }
end end
}, },
{ 'sindrets/diffview.nvim', dependencies = 'nvim-lua/plenary.nvim' }, { 'sindrets/diffview.nvim', dependencies = 'nvim-lua/plenary.nvim' },
{ {
'akinsho/toggleterm.nvim', 'akinsho/toggleterm.nvim',
config = function() require 'setup.toggleterm' end, config = function() require 'setup.toggleterm' end,
}, },
-- { -- {
-- 'glepnir/dashboard-nvim', -- 'glepnir/dashboard-nvim',
-- config = function() require 'setup.dashboard' end, -- config = function() require 'setup.dashboard' end,
-- }, -- },
{ {
'nvim-treesitter/nvim-treesitter', 'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate' build = ':TSUpdate'
}, },
{
'LhKipp/nvim-nu',
dependencies = { 'jose-elias-alvarez/null-ls.nvim' },
config = function() require('nu').setup {} end,
},
{ {
'nvim-treesitter/nvim-treesitter-context', 'nvim-treesitter/nvim-treesitter-context',
dependencies = { 'nvim-treesitter/nvim-treesitter' } dependencies = { 'nvim-treesitter/nvim-treesitter' }
}, },
-- { -- {
-- 'saecki/crates.nvim', -- 'saecki/crates.nvim',
-- tag = 'v0.2.1', -- tag = 'v0.2.1',
-- dependencies = { 'nvim-lua/plenary.nvim' }, -- dependencies = { 'nvim-lua/plenary.nvim' },
-- config = function() -- config = function()
-- require('crates').setup { -- require('crates').setup {
-- src = { -- src = {
-- coq = { -- coq = {
-- enabled = true, -- enabled = true,
-- name = "crates.nvim", -- name = "crates.nvim",
-- }, -- },
-- }, -- },
-- } -- }
-- end, -- end,
-- }, -- },
{ 'simrat39/rust-tools.nvim', config = function() require 'setup.rust-tools' end }, { 'simrat39/rust-tools.nvim', config = function() require 'setup.rust-tools' end },
{ {
"rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap" }, "rcarriga/nvim-dap-ui", dependencies = { "mfussenegger/nvim-dap" },
config = function() require("dapui").setup() end config = function() require("dapui").setup() end
}, },
{ {
'phaazon/hop.nvim', 'phaazon/hop.nvim',
branch = 'v2', -- optional but strongly recommended branch = 'v2', -- optional but strongly recommended
config = function() config = function()
-- you can configure Hop the way you like here; see :h hop-config -- you can configure Hop the way you like here; see :h hop-config
require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' } require 'hop'.setup { keys = 'etovxqpdygfblzhckisuran' }
end end
}, },
}); });