summaryrefslogtreecommitdiff
path: root/.config/nvim/lua
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua')
-rw-r--r--.config/nvim/lua/options.lua1
-rw-r--r--.config/nvim/lua/plugins/catppuccin.lua4
-rw-r--r--.config/nvim/lua/plugins/cmp.lua13
-rw-r--r--.config/nvim/lua/plugins/dap.lua57
-rw-r--r--.config/nvim/lua/plugins/neotest.lua46
-rw-r--r--.config/nvim/lua/plugins/telescope.lua6
-rw-r--r--.config/nvim/lua/plugins/treesitter.lua1
7 files changed, 4 insertions, 124 deletions
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 652ceae..bd14907 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -10,3 +10,4 @@ vim.o.statusline = "%f %y%h%w%m%r%=%l:%c %P"
vim.g.mapleader = " "
vim.g.maplocalleader = " "
+vim.api.nvim_set_keymap('n', '\\', ':noh<cr>', {})
diff --git a/.config/nvim/lua/plugins/catppuccin.lua b/.config/nvim/lua/plugins/catppuccin.lua
index aa00b3f..9d9bce5 100644
--- a/.config/nvim/lua/plugins/catppuccin.lua
+++ b/.config/nvim/lua/plugins/catppuccin.lua
@@ -7,12 +7,8 @@ return {
require("catppuccin").setup({
flavour = "macchiato",
integrations = {
- leap = true,
neogit = true,
- notify = true,
- neotest = true,
which_key = true,
- fidget = true,
},
})
vim.cmd.colorscheme("catppuccin")
diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
index 9ad472b..edc5091 100644
--- a/.config/nvim/lua/plugins/cmp.lua
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -92,18 +92,5 @@ return {
})
end,
},
- {
- "rcarriga/cmp-dap",
- dependencies = { "hrsh7th/nvim-cmp" },
- ft = { "dap-repl", "dapui_watches", "dapui_hover" },
- config = function()
- local cmp = require("cmp")
- cmp.setup.filetype({ "dap-repl", "dapui_watches", "dapui_hover" }, {
- sources = {
- { name = "dap" },
- },
- })
- end,
- },
}
diff --git a/.config/nvim/lua/plugins/dap.lua b/.config/nvim/lua/plugins/dap.lua
deleted file mode 100644
index dcbd62c..0000000
--- a/.config/nvim/lua/plugins/dap.lua
+++ /dev/null
@@ -1,57 +0,0 @@
-return {
- {
- "mfussenegger/nvim-dap",
- dependencies = {
- { "leoluz/nvim-dap-go", opts = {} },
- {
- "mfussenegger/nvim-dap-python",
- config = function()
- require("dap-python").setup(vim.fn.exepath("python"))
- end,
- },
- {
- "rcarriga/nvim-dap-ui",
- dependencies = { "mfussenegger/nvim-dap" },
- keys = {
- { "<leader>du", function() require("dapui").toggle() end, desc = "Toggle UI" },
- { "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = { "n", "v" } },
- },
- config = function()
- local dapui = require("dapui")
- dapui.setup()
-
- local dap = require("dap")
- dap.listeners.after.event_initialized["dapui_config"] = dapui.open
- dap.listeners.before.event_terminated["dapui_config"] = dapui.close
- dap.listeners.before.event_exited["dapui_config"] = dapui.close
- end,
- },
- },
- keys = {
- { "<leader>db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" },
- { "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
- { "<leader>dc", function() require("dap").continue() end, desc = "Continue" },
- { "<leader>dC", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" },
- { "<leader>dg", function() require("dap").goto_() end, desc = "Go to line (no execute)" },
- { "<leader>di", function() require("dap").step_into() end, desc = "Step Into" },
- { "<leader>dj", function() require("dap").down() end, desc = "Down" },
- { "<leader>dk", function() require("dap").up() end, desc = "Up" },
- { "<leader>dl", function() require("dap").run_last() end, desc = "Run Last" },
- { "<leader>do", function() require("dap").step_out() end, desc = "Step Out" },
- { "<leader>dO", function() require("dap").step_over() end, desc = "Step Over" },
- { "<leader>dp", function() require("dap").pause() end, desc = "Pause" },
- { "<leader>dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" },
- { "<leader>ds", function() require("dap").session() end, desc = "Session" },
- { "<leader>dt", function() require("dap").terminate() end, desc = "Terminate" },
- { "<leader>dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" },
- },
- config = function()
- require("dap")
- local sign = vim.fn.sign_define
- sign("DapBreakpoint", { text = "●", texthl = "DapBreakpoint", linehl = "", numhl = ""})
- sign("DapBreakpointCondition", { text = "●", texthl = "DapBreakpointCondition", linehl = "", numhl = ""})
- sign("DapLogPoint", { text = "◆", texthl = "DapLogPoint", linehl = "", numhl = ""})
- end,
- },
-}
-
diff --git a/.config/nvim/lua/plugins/neotest.lua b/.config/nvim/lua/plugins/neotest.lua
deleted file mode 100644
index 5e22696..0000000
--- a/.config/nvim/lua/plugins/neotest.lua
+++ /dev/null
@@ -1,46 +0,0 @@
-return {
- {
- "nvim-neotest/neotest",
- dependencies = {
- "nvim-lua/plenary.nvim",
- "nvim-treesitter/nvim-treesitter",
- "antoinemadec/FixCursorHold.nvim",
-
- "nvim-neotest/neotest-python",
- "rouge8/neotest-rust",
- "nvim-neotest/neotest-go",
- },
- keys = {
- { "<leader>tt", function() require("neotest").run.run(vim.fn.expand("%")) end, desc = "Run buffer" },
- { "<leader>tT", function() require("neotest").run.run(vim.loop.cwd()) end, desc = "Run all files" },
- { "<leader>tr", function() require("neotest").run.run() end, desc = "Run nearest test" },
- { "<leader>td", function() require("neotest").run.run({strategy="dap"}) end, desc = "Debug nearest test" },
- { "<leader>ts", function() require("neotest").summary.toggle() end, desc = "Toggle summary" },
- { "<leader>to", function() require("neotest").output.open({enter=true, auto_close=true}) end, desc = "Show output" },
- { "<leader>tO", function() require("neotest").output_panel.toggle() end, desc = "Toggle output panel" },
- { "<leader>tS", function() require("neotest").run.stop() end, desc = "Stop" },
- { "<leader>twt", function() require("neotest").watch.watch(vim.fn.expand("%")) end, desc = "Watch buffer" },
- { "<leader>twT", function() require("neotest").watch.watch(vim.loop.cwd()) end, desc = "Watch all files" },
- { "<leader>twr", function() require("neotest").watch.watch() end, desc = "Watch nearest test" },
- { "<leader>tws", function() require("neotest").watch.stop() end, desc = "Stop watching" },
- },
- config = function()
- local neotest_ns = vim.api.nvim_create_namespace("neotest")
- vim.diagnostic.config({
- virtual_text = {
- format = function(diagnostic)
- return diagnostic.message:gsub("\n", " "):gsub("\t", " "):gsub("%s+", " "):gsub("^%s+", "")
- end,
- },
- }, neotest_ns)
-
- require("neotest").setup({
- adapters = {
- require("neotest-python"),
- require("neotest-rust"),
- require("neotest-go"),
- },
- })
- end,
- },
-}
diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua
index 84f806c..8dfcce3 100644
--- a/.config/nvim/lua/plugins/telescope.lua
+++ b/.config/nvim/lua/plugins/telescope.lua
@@ -6,10 +6,10 @@ return {
"nvim-tree/nvim-web-devicons",
},
keys = {
- { "<leader>fF", "<cmd>Telescope find_files<cr>", desc = "Find files" },
- { "<leader>ff", "<cmd>Telescope git_files<cr>", desc = "Find git files" },
+ { "<leader>ff", "<cmd>Telescope find_files<cr>", desc = "Find files" },
+ { "<leader>fF", "<cmd>Telescope git_files<cr>", desc = "Find git files" },
{ "<leader>fg", "<cmd>Telescope live_grep<cr>", desc = "Live grep" },
- { "<leader>fb", "<cmd>Telescope buffers<cr>", desc = "Buffers" },
+ { "<leader>fb", "<cmd>Telescope buffers<cr>", desc = "Find buffers" },
{ "<leader>fh", "<cmd>Telescope help_tags<cr>", desc = "Help tags" },
},
cmd = "Telescope",
diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua
index d948ac6..3f7c5ac 100644
--- a/.config/nvim/lua/plugins/treesitter.lua
+++ b/.config/nvim/lua/plugins/treesitter.lua
@@ -1,7 +1,6 @@
return {
{
"nvim-treesitter/nvim-treesitter",
- dependencies = { "nvim-treesitter/nvim-treesitter-textobjects" },
event = { "BufReadPre", "BufNewFile" },
config = function()
require("nvim-treesitter.configs").setup({
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-16 14:12:24 +0000