This commit is contained in:
2023-12-20 13:29:15 -05:00
parent 4dd73953f5
commit 9e694b6608
4 changed files with 96 additions and 4 deletions

View File

@@ -0,0 +1,28 @@
local options = {
terminals = {
-- shell = vim.o.shell,
-- list = {},
type_opts = {
float = {
-- relative = "editor",
row = 0,
col = 0,
width = 0.9,
height = 0.9,
-- border = "single",
},
-- horizontal = { location = "rightbelow", split_ratio = 0.3 },
-- vertical = { location = "rightbelow", split_ratio = 0.5 },
},
},
-- behavior = {
-- autoclose_on_quit = {
-- enabled = false,
-- confirm = true,
-- },
-- close_on_exit = true,
-- auto_insert = true,
-- },
}
return options

View File

@@ -18,6 +18,7 @@ M.general = {
["<leader>ws"] = { "<C-w>s", "Split horizontal" },
["<leader>wo"] = { "<C-w>o", "Maximize split" },
["<leader>wc"] = { "<C-w>c", "Close split" },
["<leader>wx"] = { "<C-w>c", "Close split" },
["<leader>w="] = { "<C-w>=", "Even splits" },
["<leader>h"] = { "<C-w>h", "Focus left split" },
["<leader>j"] = { "<C-w>j", "Focus lower split" },
@@ -35,6 +36,7 @@ M.general = {
["<leader>n"] = { "<cmd> NvimTreeToggle <CR>", "Toggle nvimtree" },
["<leader>N"] = { "<cmd> set nu! <CR>", "Toggle line number" },
["<leader>x"] = { "<cmd>bdelete<CR>", "Close Buffer and window" },
["<leader>c"] = { "<cmd>Bdelete<CR>", "Close Buffer" },
["<leader>b"] = { "<cmd> Telescope buffers <CR>", "Find buffers" },
@@ -43,7 +45,7 @@ M.general = {
["gu"] = { "<cmd>diffget //2<CR>", "Select left in conflict" },
["gh"] = { "<cmd>diffget //3<CR>", "Select right in conflict" },
["gl"] = {
["ge"] = {
function()
vim.diagnostic.open_float { border = "rounded" }
end,

View File

@@ -23,6 +23,13 @@ local plugins = {
},
-- override plugin configs
{
"NvChad/nvterm",
opts = function()
return require "custom.configs.nvterm"
end,
},
{
"williamboman/mason.nvim",
opts = vim.tbl_deep_extend("force", overrides.mason, {
@@ -143,11 +150,66 @@ local plugins = {
enabled = false,
},
{ "rouge8/neotest-rust" },
{ "jfpedroza/neotest-elixir" },
{
"lewis6991/gitsigns.nvim",
enabled = false,
"nvim-neotest/neotest",
lazy = false,
dependencies = {
"nvim-lua/plenary.nvim",
"antoinemadec/FixCursorHold.nvim",
"nvim-treesitter/nvim-treesitter",
},
config = function()
require("neotest").setup {
adapters = {
require "neotest-rust",
require "neotest-elixir" {
-- -- The Mix task to use to run the tests
-- -- Can be a function to return a dynamic value.
-- -- Default: "test"
-- mix_task = { "my_custom_task" },
-- -- Other formatters to pass to the test command as the formatters are overridden
-- -- Can be a function to return a dynamic value.
-- -- Default: {"ExUnit.CLIFormatter"}
-- extra_formatters = { "ExUnit.CLIFormatter", "ExUnitNotifier" },
-- -- Extra test block identifiers
-- -- Can be a function to return a dynamic value.
-- -- Block identifiers "test", "feature" and "property" are always supported by default.
-- -- Default: {}
-- extra_block_identifiers = { "test_with_mock" },
-- -- Extra arguments to pass to mix test
-- -- Can be a function that receives the position, to return a dynamic value
-- -- Default: {}
-- args = { "--trace" },
-- -- Command wrapper
-- -- Must be a function that receives the mix command as a table, to return a dynamic value
-- -- Default: function(cmd) return cmd end
-- post_process_command = function(cmd)
-- return vim.tbl_flatten { { "env", "FOO=bar" }, cmd }
-- end,
-- -- Delays writes so that results are updated at most every given milliseconds
-- -- Decreasing this number improves snappiness at the cost of performance
-- -- Can be a function to return a dynamic value.
-- -- Default: 1000
-- write_delay = 1000,
},
},
}
end,
},
-- {
-- "rouge8/neotest-rust",
-- config = function() end,
-- },
--
-- {
-- "jfpedroza/neotest-elixir",
-- config = function() end,
-- },
-- To make a plugin not be loaded
-- {
-- "NvChad/nvim-colorizer.lua",