Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 23 additions & 32 deletions setups/common/.config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,46 +1,37 @@
{
"FTerm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
"FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" },
"alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" },
"alpha-nvim": { "branch": "main", "commit": "f6682d95210a598f277dd21a437f0e66440e3f17" },
"arrow.nvim": { "branch": "master", "commit": "6e0f726f55f99332dd726a53effd6813786b6d49" },
"barbar.nvim": { "branch": "master", "commit": "539d73def39c9172b4d4d769f14090e08f37b29d" },
"catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" },
"catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" },
"copilot-lsp": { "branch": "main", "commit": "1b6d8273594643f51bb4c0c1d819bdb21b42159d" },
"copilot-lualine": { "branch": "main", "commit": "222e90bd8dcdf16ca1efc4e784416afb5f011c31" },
"copilot.lua": { "branch": "master", "commit": "5ace9ecd0db9a7a6c14064e4ce4ede5b800325f3" },
"csvview.nvim": { "branch": "main", "commit": "8d068c526ab5ade68226de036d533298cd93a399" },
"copilot.lua": { "branch": "master", "commit": "ad7e729e9a6348f7da482be0271d452dbc4c8e2c" },
"csvview.nvim": { "branch": "main", "commit": "7022e18a0fbae9aecf99a3ba02b2a541edc2b8a1" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"fzf-lua": { "branch": "main", "commit": "9d579feab4d3035627150e5e9b6e8fbf5e814ef6" },
"gitsigns.nvim": { "branch": "main", "commit": "42d6aed4e94e0f0bbced16bbdcc42f57673bd75e" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"iron.nvim": { "branch": "master", "commit": "746414e67adcd3ad2ad5dbe6262543b55ac3f3cd" },
"fzf-lua": { "branch": "main", "commit": "657c1bbb7357c61e26a20d868b53a460b05c18c0" },
"gitsigns.nvim": { "branch": "main", "commit": "8d82c240f190fc33723d48c308ccc1ed8baad69d" },
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
"iron.nvim": { "branch": "master", "commit": "88cd340407b959f1168af2a6ae5a3d180e6df32c" },
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
"lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "bf9e7205192015dc48727744f21e09ac986664f9" },
"mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
"neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" },
"neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
"neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" },
"neowiki.nvim": { "branch": "main", "commit": "86f705604f9f2e6c1a0f238ebe8df9fb843e71c7" },
"noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
"lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "0a3b42c3e503df87aef6d6513e13148381495c3a" },
"mason.nvim": { "branch": "main", "commit": "b03fb0f20bc1d43daf558cda981a2be22e73ac42" },
"neogit": { "branch": "master", "commit": "e06745228600a585b88726fc9fba44a373c15a47" },
"neowiki.nvim": { "branch": "main", "commit": "b3f544e63ecb55a3c741e15ea025a7c8a6886713" },
"nord.nvim": { "branch": "main", "commit": "07647ad23e5b7fc1599a841dcd8f173b9aeb0419" },
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-dap": { "branch": "master", "commit": "cdfd55a133f63228c55f91378f12908cb2a78ded" },
"nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" },
"nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" },
"nvim-dap-view": { "branch": "main", "commit": "526e597a67e959c9064bf29d5810a490e7cd5c18" },
"nvim-lspconfig": { "branch": "master", "commit": "c4f67bf85b01a57e3c130352c0a0e453ab8cd5b9" },
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
"nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
"nvim-tree.lua": { "branch": "master", "commit": "eb33612bff2fb31f54946fb5dcadc89e905e81ec" },
"nvim-treesitter": { "branch": "main", "commit": "4fc09bee78e91bf4ba471cdab4bf9dfa37fde51c" },
"nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" },
"nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" },
"nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
"quicker.nvim": { "branch": "master", "commit": "fc041830fa7cf093786b0d5990d99cf3c7b0c129" },
"nvim-dap-view": { "branch": "main", "commit": "64e2d57788ef93469af1e0319311f669a3126cd3" },
"nvim-lspconfig": { "branch": "master", "commit": "cb5bc0b2b35a6d513e3298d285db81453e791f4f" },
"nvim-tree.lua": { "branch": "master", "commit": "509962f21ab7289d8dcd28568af539be39a8c01e" },
"nvim-treesitter-context": { "branch": "master", "commit": "b0c45cefe2c8f7b55fc46f34e563bc428ef99636" },
"nvim-web-devicons": { "branch": "master", "commit": "c72328a5494b4502947a022fe69c0c47e53b6aa6" },
"plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
"quicker.nvim": { "branch": "master", "commit": "063cc44da1eef8681bbd653b29d3bc961780886a" },
"vim-css-color": { "branch": "master", "commit": "14fd934cdd9ca1ac0e53511094e612eb9bace373" },
"vim-peekaboo": { "branch": "master", "commit": "2a8a3187ba6b15201b2563a3f0331fcdf49da36c" },
"vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" },
"vimtex": { "branch": "master", "commit": "aed184681f177ae6071e56cd7a2b9441261fca52" },
"vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" },
"vimtex": { "branch": "master", "commit": "9306903316c3ddd250676b7cf97c84a84c9c8f99" },
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
}
80 changes: 40 additions & 40 deletions setups/common/.config/nvim/lua/plugins/noice.lua
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
return {
{
"folke/noice.nvim",
event = "VeryLazy",
dependencies = {
"MunifTanjim/nui.nvim",
{
"rcarriga/nvim-notify",
config = function()
vim.notify = require("notify")
-- {
-- "folke/noice.nvim",
-- event = "VeryLazy",
-- dependencies = {
-- "MunifTanjim/nui.nvim",
-- {
-- "rcarriga/nvim-notify",
-- config = function()
-- vim.notify = require("notify")

require("notify").setup({
stages = "fade",
timeout = 3000,
background_colour = "#000000",
})
end,
},
},
opts = {
lsp = {
override = {
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
["vim.lsp.util.stylize_markdown"] = true,
["cmp.entry.get_documentation"] = true,
},
hover = {
enabled = false,
},
signature = {
enabled = false,
},
},
-- require("notify").setup({
-- stages = "fade",
-- timeout = 3000,
-- background_colour = "#000000",
-- })
-- end,
-- },
-- },
-- opts = {
-- lsp = {
-- override = {
-- ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
-- ["vim.lsp.util.stylize_markdown"] = true,
-- ["cmp.entry.get_documentation"] = true,
-- },
-- hover = {
-- enabled = false,
-- },
-- signature = {
-- enabled = false,
-- },
-- },

presets = {
bottom_search = true,
command_palette = true,
long_message_to_split = true,
inc_rename = false,
lsp_doc_border = true,
},
},
},
-- presets = {
-- bottom_search = true,
-- command_palette = true,
-- long_message_to_split = true,
-- inc_rename = false,
-- lsp_doc_border = true,
-- },
-- },
-- },
}
140 changes: 70 additions & 70 deletions setups/common/.config/nvim/lua/plugins/nvim_neotest.lua
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
return {
"nvim-neotest/neotest",
dependencies = {
"nvim-neotest/nvim-nio",
"nvim-lua/plenary.nvim",
"antoinemadec/FixCursorHold.nvim",
"nvim-treesitter/nvim-treesitter",
"nvim-neotest/neotest-python",
},
keys = {
{
"<leader>tr",
function()
require("neotest").run.run()
end,
desc = "Neotest: run nearest test",
},
{
"<leader>tf",
function()
require("neotest").run.run(vim.fn.expand("%"))
end,
desc = "Neotest: run tests in file",
},
{
"<leader>ta",
function()
require("neotest").run.run({ suite = true })
end,
desc = "Neotest: run all tests",
},
{
"<leader>ts",
function()
require("neotest").summary.toggle()
end,
desc = "Neotest: toggle summary",
},
{
"<leader>tl",
function()
require("neotest").run.run_last()
end,
desc = "Neotest: run last test",
},
},
config = function()
require("neotest").setup({
adapters = {
require("neotest-python")({
dap = { justMyCode = false },
args = { "--log-level", "DEBUG" },
runner = "pytest",
python = ".venv/bin/python",
pytest_discover_instances = false,
}),
},
icons = {
passed = "✔",
running = "⏱",
failed = "✖",
skipped = "➟",
unknown = "?",
},
quickfix = {
enabled = false,
},
})
-- "nvim-neotest/neotest",
-- dependencies = {
-- "nvim-neotest/nvim-nio",
-- "nvim-lua/plenary.nvim",
-- "antoinemadec/FixCursorHold.nvim",
-- "nvim-treesitter/nvim-treesitter",
-- "nvim-neotest/neotest-python",
-- },
-- keys = {
-- {
-- "<leader>tr",
-- function()
-- require("neotest").run.run()
-- end,
-- desc = "Neotest: run nearest test",
-- },
-- {
-- "<leader>tf",
-- function()
-- require("neotest").run.run(vim.fn.expand("%"))
-- end,
-- desc = "Neotest: run tests in file",
-- },
-- {
-- "<leader>ta",
-- function()
-- require("neotest").run.run({ suite = true })
-- end,
-- desc = "Neotest: run all tests",
-- },
-- {
-- "<leader>ts",
-- function()
-- require("neotest").summary.toggle()
-- end,
-- desc = "Neotest: toggle summary",
-- },
-- {
-- "<leader>tl",
-- function()
-- require("neotest").run.run_last()
-- end,
-- desc = "Neotest: run last test",
-- },
-- },
-- config = function()
-- require("neotest").setup({
-- adapters = {
-- require("neotest-python")({
-- dap = { justMyCode = false },
-- args = { "--log-level", "DEBUG" },
-- runner = "pytest",
-- python = ".venv/bin/python",
-- pytest_discover_instances = false,
-- }),
-- },
-- icons = {
-- passed = "✔",
-- running = "⏱",
-- failed = "✖",
-- skipped = "➟",
-- unknown = "?",
-- },
-- quickfix = {
-- enabled = false,
-- },
-- })

-- Make sure the sign column is always visible
vim.o.signcolumn = "yes"
end,
-- -- Make sure the sign column is always visible
-- vim.o.signcolumn = "yes"
-- end,
}
Loading
Loading