summaryrefslogtreecommitdiff
path: root/nvim/lua/plugins
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--nvim/lua/plugins.lua82
-rw-r--r--nvim/lua/plugins/blankline.lua7
-rw-r--r--nvim/lua/plugins/dap.lua157
-rw-r--r--nvim/lua/plugins/dap_go.lua159
-rw-r--r--nvim/lua/plugins/dapui.lua2
-rw-r--r--nvim/lua/plugins/headlines.lua5
-rw-r--r--nvim/lua/plugins/lsp_saga.lua8
-rw-r--r--nvim/lua/plugins/lsp_signature.lua15
-rw-r--r--nvim/lua/plugins/tree.lua32
-rw-r--r--nvim/lua/plugins/treesitter.lua2
10 files changed, 226 insertions, 243 deletions
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 2e6b946..cec8ae7 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -6,75 +6,50 @@ require("lazy").setup({
},
{ "neovim/nvim-lspconfig" },
{
- "lukas-reineke/indent-blankline.nvim",
- main = "ibl",
- --@module "ibl"
- --@type ibl.config
- config = true,
- },
- {
- "lukas-reineke/headlines.nvim",
- dependencies = "nvim-treesitter/nvim-treesitter",
- config = true,
- },
- {
- "mfussenegger/nvim-dap",
- },
- {
- "ray-x/lsp_signature.nvim",
- event = "VeryLazy",
+ "arnarg/todotxt.nvim",
+ dependencies = { "MunifTanjim/nui.nvim" },
opts = {
- doc_lines = 1,
- max_height = 3,
- hint_prefix = "",
- hint_prefix = {
- above = "↙ ",
- current = "← ",
- below = "↖ ",
- },
- floating_window = true,
+ todo_file = "~/Документы/todo.txt",
},
},
{
- "nvimdev/lspsaga.nvim",
- opts = {
- lightbulb = {
- enable = false,
+ name = "resize",
+ dir = "~/.config/nvim/lua/myplugins",
+ keys = {
+ {
+ "<C-S-Left>",
+ function()
+ require("myplugins.resize").ResizeLeft()
+ end,
+ silent = true,
},
- },
- },
- {
- "karb94/neoscroll.nvim",
- opts = {
- stop_eof = false,
- respect_scrolloff = true,
- mappings = {
- "<C-u>",
- "<C-d>",
- "<C-b>",
- "<C-f>",
- "<C-y>",
- "<C-e>",
- "zt",
- "zz",
- "zb",
+ {
+ "<C-S-Right>",
+ function()
+ require("myplugins.resize").ResizeRight()
+ end,
+ silent = true,
},
- },
- keys = {
{
- "<PageUp>",
+ "<C-S-Up>",
function()
- require("neoscroll").scroll(-vim.api.nvim_win_get_height(0) + 3, { duration = 150 })
+ require("myplugins.resize").ResizeUp()
end,
+ silent = true,
},
{
- "<PageDown>",
+ "<C-S-Down>",
function()
- require("neoscroll").scroll(vim.api.nvim_win_get_height(0) - 3, { duration = 150 })
+ require("myplugins.resize").ResizeDown()
end,
+ silent = true,
},
},
},
+ require("plugins.blankline"),
+ require("plugins.headlines"),
+ require("plugins.lsp_saga"),
+ require("plugins.lsp_signature"),
require("plugins.autosave"),
require("plugins.cmp"),
require("plugins.treesitter"),
@@ -82,6 +57,7 @@ require("lazy").setup({
require("plugins.conform"),
require("plugins.dapui"),
require("plugins.dap"),
+ require("plugins.dap_go"),
require("plugins.go"),
require("plugins.goimpl"),
require("plugins.lualine"),
diff --git a/nvim/lua/plugins/blankline.lua b/nvim/lua/plugins/blankline.lua
new file mode 100644
index 0000000..b74d9e6
--- /dev/null
+++ b/nvim/lua/plugins/blankline.lua
@@ -0,0 +1,7 @@
+return {
+ "lukas-reineke/indent-blankline.nvim",
+ main = "ibl",
+ --@module "ibl"
+ --@type ibl.config
+ config = true,
+}
diff --git a/nvim/lua/plugins/dap.lua b/nvim/lua/plugins/dap.lua
index da87df9..ab44a1e 100644
--- a/nvim/lua/plugins/dap.lua
+++ b/nvim/lua/plugins/dap.lua
@@ -1,158 +1,3 @@
-local default_config = {
- delve = {
- path = "dlv",
- initialize_timeout_sec = 20,
- port = "${port}",
- args = {},
- build_flags = "",
- -- Automatically handle the issue on delve Windows versions < 1.24.0
- -- where delve needs to be run in attched mode or it will fail (actually crashes).
- detached = vim.fn.has("win32") == 0,
- output_mode = "remote",
- },
- tests = {
- verbose = false,
- },
-}
-
-local function setup_go_configuration(dap, configs)
- local common_debug_configs = {
- {
- type = "go",
- name = "Debug",
- request = "launch",
- program = "${workspaceFolder}",
- args = {},
- buildFlags = configs.delve.build_flags,
- outputMode = configs.delve.output_mode,
- },
- }
-
- if dap.configurations.go == nil then
- dap.configurations.go = {}
- end
-
- for _, config in ipairs(common_debug_configs) do
- table.insert(dap.configurations.go, config)
- end
-
- if configs == nil or configs.dap_configurations == nil then
- return
- end
-
- for _, config in ipairs(configs.dap_configurations) do
- if config.type == "go" then
- table.insert(dap.configurations.go, config)
- end
- end
-end
-
return {
- "leoluz/nvim-dap-go",
- dependencies = { "mfussenegger/nvim-dap" },
- opts = true,
- config = function()
- local dap, dapui = require("dap"), require("dapui")
-
- dap.adapters.go = {
- type = "server",
- port = "${port}",
- executable = {
- command = "dlv",
- args = { "dap", "-l", "127.0.0.1:${port}" },
- },
- }
-
- setup_go_configuration(dap, default_config)
-
- dap.defaults.fallback.terminal_win_cmd = "enew | set filetype=dap-terminal"
- dap.listeners.before.attach.dapui_config = function()
- dapui.open()
- end
- dap.listeners.before.launch.dapui_config = function()
- dapui.open()
- end
- dap.listeners.before.event_terminated.dapui_config = function()
- dapui.close()
- end
- dap.listeners.before.event_exited.dapui_config = function()
- dapui.close()
- end
-
- vim.api.nvim_set_hl(0, "DapBreakpoint", { ctermbg = 0, fg = "#993939", bg = "#31353f" })
- vim.api.nvim_set_hl(0, "DapLogPoint", { ctermbg = 0, fg = "#61afef", bg = "#31353f" })
- vim.api.nvim_set_hl(0, "DapStopped", { ctermbg = 0, fg = "#98c379", bg = "#31353f" })
-
- vim.fn.sign_define(
- "DapBreakpoint",
- { text = "!", texthl = "DapBreakpoint", linehl = "DapBreakpoint", numhl = "DapBreakpoint" }
- )
- vim.fn.sign_define(
- "DapBreakpointCondition",
- { text = "?", texthl = "DapBreakpoint", linehl = "DapBreakpoint", numhl = "DapBreakpoint" }
- )
- vim.fn.sign_define(
- "DapBreakpointRejected",
- { text = "RJ", texthl = "DapBreakpoint", linehl = "DapBreakpoint", numhl = "DapBreakpoint" }
- )
- vim.fn.sign_define(
- "DapLogPoint",
- { text = "i", texthl = "DapLogPoint", linehl = "DapLogPoint", numhl = "DapLogPoint" }
- )
- vim.fn.sign_define(
- "DapStopped",
- { text = "→", texthl = "DapStopped", linehl = "DapStopped", numhl = "DapStopped" }
- )
- end,
- keys = {
- {
- "<F5>",
- function()
- require("dap").continue()
- end,
- silent = true,
- },
- {
- "<F17>", -- S-F5
- function()
- require("dap").restart()
- end,
- silent = true,
- },
- {
- "<F29>", -- C-F5
- function()
- require("dap").terminate()
- end,
- silent = true,
- },
- {
- "<F8>",
- function()
- require("dap").step_over()
- end,
- silent = true,
- },
- {
- "<F7>",
- function()
- require("dap").step_into()
- end,
- silent = true,
- },
- {
- "<F19>", -- S-F7
- function()
- require("dap").step_out()
- end,
- silent = true,
- },
- {
- "<A-b>",
- function()
- require("dap").toggle_breakpoint()
- end,
- silent = true,
- },
- },
+ "mfussenegger/nvim-dap",
}
diff --git a/nvim/lua/plugins/dap_go.lua b/nvim/lua/plugins/dap_go.lua
new file mode 100644
index 0000000..705fab7
--- /dev/null
+++ b/nvim/lua/plugins/dap_go.lua
@@ -0,0 +1,159 @@
+local default_config = {
+ delve = {
+ path = "dlv",
+ initialize_timeout_sec = 20,
+ port = "${port}",
+ args = {},
+ build_flags = "",
+ -- Automatically handle the issue on delve Windows versions < 1.24.0
+ -- where delve needs to be run in attched mode or it will fail (actually crashes).
+ detached = vim.fn.has("win32") == 0,
+ output_mode = "remote",
+ cwd = nil,
+ },
+ tests = {
+ verbose = false,
+ },
+}
+
+local function setup_go_configuration(dap, configs)
+ local common_debug_configs = {
+ {
+ type = "go",
+ name = "Debug",
+ request = "launch",
+ program = "${workspaceFolder}",
+ args = {},
+ buildFlags = configs.delve.build_flags,
+ outputMode = configs.delve.output_mode,
+ },
+ }
+
+ if dap.configurations.go == nil then
+ dap.configurations.go = {}
+ end
+
+ for _, config in ipairs(common_debug_configs) do
+ table.insert(dap.configurations.go, config)
+ end
+
+ if configs == nil or configs.dap_configurations == nil then
+ return
+ end
+
+ for _, config in ipairs(configs.dap_configurations) do
+ if config.type == "go" then
+ table.insert(dap.configurations.go, config)
+ end
+ end
+end
+
+return {
+ "leoluz/nvim-dap-go",
+ dependencies = { "mfussenegger/nvim-dap" },
+ opts = true,
+ config = function()
+ local dap, dapui = require("dap"), require("dapui")
+
+ dap.adapters.go = {
+ type = "server",
+ port = "${port}",
+ executable = {
+ command = "dlv",
+ args = { "dap", "-l", "127.0.0.1:${port}" },
+ },
+ }
+
+ setup_go_configuration(dap, default_config)
+
+ dap.defaults.fallback.terminal_win_cmd = "enew | set filetype=dap-terminal"
+ dap.listeners.before.attach.dapui_config = function()
+ dapui.open()
+ end
+ dap.listeners.before.launch.dapui_config = function()
+ dapui.open()
+ end
+ dap.listeners.before.event_terminated.dapui_config = function()
+ dapui.close()
+ end
+ dap.listeners.before.event_exited.dapui_config = function()
+ dapui.close()
+ end
+
+ vim.api.nvim_set_hl(0, "DapBreakpoint", { ctermbg = 0, fg = "#993939", bg = "#31353f" })
+ vim.api.nvim_set_hl(0, "DapLogPoint", { ctermbg = 0, fg = "#61afef", bg = "#31353f" })
+ vim.api.nvim_set_hl(0, "DapStopped", { ctermbg = 0, fg = "#98c379", bg = "#31353f" })
+
+ vim.fn.sign_define(
+ "DapBreakpoint",
+ { text = "!", texthl = "DapBreakpoint", linehl = "DapBreakpoint", numhl = "DapBreakpoint" }
+ )
+ vim.fn.sign_define(
+ "DapBreakpointCondition",
+ { text = "?", texthl = "DapBreakpoint", linehl = "DapBreakpoint", numhl = "DapBreakpoint" }
+ )
+ vim.fn.sign_define(
+ "DapBreakpointRejected",
+ { text = "RJ", texthl = "DapBreakpoint", linehl = "DapBreakpoint", numhl = "DapBreakpoint" }
+ )
+ vim.fn.sign_define(
+ "DapLogPoint",
+ { text = "i", texthl = "DapLogPoint", linehl = "DapLogPoint", numhl = "DapLogPoint" }
+ )
+ vim.fn.sign_define(
+ "DapStopped",
+ { text = "→", texthl = "DapStopped", linehl = "DapStopped", numhl = "DapStopped" }
+ )
+ end,
+ keys = {
+ {
+ "<F5>",
+ function()
+ require("dap").continue()
+ end,
+ silent = true,
+ },
+ {
+ "<F17>", -- S-F5
+ function()
+ require("dap").restart()
+ end,
+ silent = true,
+ },
+ {
+ "<F29>", -- C-F5
+ function()
+ require("dap").terminate()
+ end,
+ silent = true,
+ },
+ {
+ "<F8>",
+ function()
+ require("dap").step_over()
+ end,
+ silent = true,
+ },
+ {
+ "<F7>",
+ function()
+ require("dap").step_into()
+ end,
+ silent = true,
+ },
+ {
+ "<F19>", -- S-F7
+ function()
+ require("dap").step_out()
+ end,
+ silent = true,
+ },
+ {
+ "<A-b>",
+ function()
+ require("dap").toggle_breakpoint()
+ end,
+ silent = true,
+ },
+ },
+}
diff --git a/nvim/lua/plugins/dapui.lua b/nvim/lua/plugins/dapui.lua
index 93df74b..5d35e1e 100644
--- a/nvim/lua/plugins/dapui.lua
+++ b/nvim/lua/plugins/dapui.lua
@@ -52,8 +52,6 @@ return {
{
elements = {
"repl",
- "breakpoints",
- "scopes",
},
size = 0.3,
position = "bottom",
diff --git a/nvim/lua/plugins/headlines.lua b/nvim/lua/plugins/headlines.lua
new file mode 100644
index 0000000..5d92245
--- /dev/null
+++ b/nvim/lua/plugins/headlines.lua
@@ -0,0 +1,5 @@
+return {
+ "lukas-reineke/headlines.nvim",
+ dependencies = "nvim-treesitter/nvim-treesitter",
+ config = true,
+ }
diff --git a/nvim/lua/plugins/lsp_saga.lua b/nvim/lua/plugins/lsp_saga.lua
new file mode 100644
index 0000000..ab8177f
--- /dev/null
+++ b/nvim/lua/plugins/lsp_saga.lua
@@ -0,0 +1,8 @@
+return {
+ "nvimdev/lspsaga.nvim",
+ opts = {
+ lightbulb = {
+ enable = false,
+ },
+ },
+}
diff --git a/nvim/lua/plugins/lsp_signature.lua b/nvim/lua/plugins/lsp_signature.lua
new file mode 100644
index 0000000..b9add0b
--- /dev/null
+++ b/nvim/lua/plugins/lsp_signature.lua
@@ -0,0 +1,15 @@
+return {
+ "ray-x/lsp_signature.nvim",
+ event = "VeryLazy",
+ opts = {
+ doc_lines = 1,
+ max_height = 3,
+ hint_prefix = "",
+ hint_prefix = {
+ above = "↙ ",
+ current = "← ",
+ below = "↖ ",
+ },
+ floating_window = true,
+ },
+}
diff --git a/nvim/lua/plugins/tree.lua b/nvim/lua/plugins/tree.lua
index 94d1f11..3bf9eed 100644
--- a/nvim/lua/plugins/tree.lua
+++ b/nvim/lua/plugins/tree.lua
@@ -1,5 +1,4 @@
-local HEIGHT_RATIO = 0.8
-local WIDTH_RATIO = 0.5
+local WIDTH_RATIO = 0.25
return {
"nvim-tree/nvim-tree.lua",
@@ -9,36 +8,10 @@ return {
opts = {
disable_netrw = true,
hijack_netrw = true,
- hijack_directories = {
- enable = true,
- auto_open = true,
- },
sort = {
sorter = "case_sensitive",
},
view = {
- -- width = 30,
- float = {
- enable = true,
- open_win_config = function()
- local screen_w = vim.opt.columns:get()
- local screen_h = vim.opt.lines:get() - vim.opt.cmdheight:get()
- local window_w = screen_w * WIDTH_RATIO
- local window_h = screen_h * HEIGHT_RATIO
- local window_w_int = math.floor(window_w)
- local window_h_int = math.floor(window_h)
- local center_x = (screen_w - window_w) / 2
- local center_y = ((vim.opt.lines:get() - window_h) / 2) - vim.opt.cmdheight:get()
- return {
- border = "rounded",
- relative = "editor",
- row = center_y,
- col = center_x,
- width = window_w_int,
- height = window_h_int,
- }
- end,
- },
width = function()
return math.floor(vim.opt.columns:get() * WIDTH_RATIO)
end,
@@ -60,11 +33,8 @@ return {
filters = {
dotfiles = false,
},
- sync_root_with_cwd = true,
- respect_buf_cwd = true,
update_focused_file = {
enable = true,
- update_root = true,
},
},
keys = {
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index 08d05e9..59e9294 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -7,7 +7,7 @@ return {
additional_vim_regex_highlighting = false,
},
ensure_installed = "all",
- ignore_install = { "gdhsader", "phpdoc" },
+ ignore_install = { "gdhsader", "phpdoc", "org" },
indent = { enable = true },
auto_install = true,
sync_install = true,
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-09 11:36:50 +0000