From 6ac678077eacb9c33af573ef0f2e6012b979d186 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Mon, 29 Jan 2024 16:06:10 +0200 Subject: [PATCH] feat: enable dap fix: git push --- lazy-lock.json | 19 +++++++++++++------ lua/plugins/dap.lua | 1 - lua/plugins/fugitive.lua | 28 ++++++++++++++++++++++++++++ lua/plugins/harpoon.lua | 2 +- lua/plugins/lspconfig.lua | 21 +++++++++++++++++---- lua/plugins/rust_tools.lua | 17 ++++++++++------- lua/plugins/tmux_navigator.lua | 18 +++++++++++++++++- lua/plugins/treesitter.lua | 6 +++++- lua/plugins/trouble.lua | 14 -------------- lua/solo/keymaps.lua | 13 ++++--------- 10 files changed, 95 insertions(+), 44 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 11e7be9..a54502c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,8 +27,8 @@ "dracula.nvim": { "branch": "main", "commit": "a6cb758d4b182d9f2b7e742910078d94877c1059" }, "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" }, "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, - "gitsigns.nvim": { "branch": "main", "commit": "0a2a93f687ec051292943a4d139366332ac93688" }, - "harpoon": { "branch": "harpoon2", "commit": "2cd4e03372f7ee5692c8caa220f479ea07970f17" }, + "gitsigns.nvim": { "branch": "main", "commit": "fb9fd5312476b51a42a98122616e1c448d823d5c" }, + "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" }, "hypersonic.nvim": { "branch": "main", "commit": "a98dbd6b5ac1aac3cd895990e08d1ea40e67a9e3" }, "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" }, @@ -40,20 +40,26 @@ "markdown.nvim": { "branch": "master", "commit": "c5cb265f8e997476925c165d660678048ec47f38" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" }, "mason-null-ls.nvim": { "branch": "main", "commit": "558de4372d23bd432cc3594666c4d812cd071bbf" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, "mason.nvim": { "branch": "main", "commit": "dcd0ea30ccfc7d47e879878d1270d6847a519181" }, "melange-nvim": { "branch": "master", "commit": "ca3444c8e5002ee5ab6f077660317f869c7b6a36" }, "neodev.nvim": { "branch": "main", "commit": "64b2a51b02c6f2ae177c745e4d8bc801a339fe09" }, "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" }, - "neorg": { "branch": "main", "commit": "28cbafbc0cde316d8e2618ff26377200225e9393" }, + "neorg": { "branch": "main", "commit": "599d79e173a9019abd9a4a6acbc6ec9d269e595a" }, "nightfly": { "branch": "master", "commit": "0c5f52d717c65951173455a70592f6383b3487e7" }, "nightfox.nvim": { "branch": "main", "commit": "57b8154aba0de8ced36722ea2674a7b97e4f468f" }, "none-ls.nvim": { "branch": "main", "commit": "a311c7cc8f17543143a7482cdbe3a384c371d56a" }, "nvim": { "branch": "main", "commit": "afab7ec2a79c7127627dede79c0018b6e45663d0" }, "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, + "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" }, + "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" }, "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" }, "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" }, - "nvim-treesitter": { "branch": "master", "commit": "efda19a54a157da8635aa6cb84f56a10593b1a23" }, + "nvim-treesitter": { "branch": "master", "commit": "ed82d82b77e4fa3bd4593eda8fc4c4ff95a5eb25" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, @@ -66,7 +72,7 @@ "rainbow_csv": { "branch": "master", "commit": "6955d13a65e0161e8dad488b6045441d527d62ec" }, "runner.nvim": { "branch": "main", "commit": "237f7b72c10c34f60c55022d2d79a5f8e5a531a5" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, - "tagbar": { "branch": "master", "commit": "fcd31ec145bbc628b90371be381717a1498b7c12" }, + "tagbar": { "branch": "master", "commit": "12edcb59449b335555652898f82dd6d5c59d519a" }, "telescope-bibtex.nvim": { "branch": "master", "commit": "b10ec78df938a1e06217f965b32fb1b960681cff" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-git-diffs.nvim": { "branch": "main", "commit": "366df26227e6d478d5c55e04771d61875c4f22ac" }, @@ -81,6 +87,7 @@ "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, "tokyonight.nvim": { "branch": "main", "commit": "e3301873c1e96903daebb98cc9b5926810bf73dd" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee" }, "treesitter-utils": { "branch": "main", "commit": "0e1ac3ae9ae55a371f09aa1d7bbc757275567627" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, @@ -95,7 +102,7 @@ "vim-illuminate": { "branch": "master", "commit": "97c1265ff0b67064b6cfdc15bafc50202a537ae2" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-tmux-navigator": { "branch": "master", "commit": "38b1d0402c4600543281dc85b3f51884205674b6" }, - "vimtex": { "branch": "master", "commit": "fe20ab1bd82a23441ac55054afefcd60001947a2" }, + "vimtex": { "branch": "master", "commit": "a397999be98e99482348e7108baa795c244a0f15" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua index 9b14664..69027f7 100644 --- a/lua/plugins/dap.lua +++ b/lua/plugins/dap.lua @@ -1,6 +1,5 @@ return { "jayp0521/mason-nvim-dap.nvim", - enabled = false, opts = { ensure_installed = { "python", diff --git a/lua/plugins/fugitive.lua b/lua/plugins/fugitive.lua index 4627050..f56dfc8 100644 --- a/lua/plugins/fugitive.lua +++ b/lua/plugins/fugitive.lua @@ -4,5 +4,33 @@ return { keys = { { "gg", vim.cmd.G, desc = "[G]it" }, { "gd", vim.cmd.Gdiffsplit, desc = "[G]it [D]iff" }, + { + "gh", + function() + vim.cmd.diffget("//2") + end, + desc = "[G]it Select Left", + }, + { + "gl", + function() + vim.cmd.diffget("//3") + end, + desc = "[G]it Select Right", + }, + { + "gp", + function() + vim.cmd.Git("pull --rebase") + end, + desc = "[G]it [P]ull", + }, + { + "gP", + function() + vim.cmd.Git("push -u origin") + end, + desc = "[G]it [P]ush", + }, }, } diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua index 52e82a5..d71c297 100644 --- a/lua/plugins/harpoon.lua +++ b/lua/plugins/harpoon.lua @@ -11,7 +11,7 @@ return { desc = "Harpoon [A]dd File", }, { - "", + "", function() local harpoon = require("harpoon") harpoon.ui:toggle_quick_menu(harpoon:list()) diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 9f7dd91..2f6e701 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -6,6 +6,7 @@ return { "hrsh7th/cmp-nvim-lsp", "folke/neodev.nvim", "nvim-telescope/telescope.nvim", + "folke/trouble.nvim", }, config = function() @@ -44,11 +45,25 @@ return { ) nmap("wa", vim.lsp.buf.add_workspace_folder, "[W]orkspace [A]dd Folder") nmap("wr", vim.lsp.buf.remove_workspace_folder, "[W]orkspace [R]emove Folder") + nmap("ws", vim.lsp.buf.workspace_symbol, "[W]orkspace [S]ymbol") + nmap("wd", vim.diagnostic.open_float, "[W]orkspace [D]iagnostic") nmap("wl", function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) end, "[W]orkspace [L]ist Folders") nmap("lD", vim.lsp.buf.type_definition, "Type [D]efinition") nmap("lr", vim.lsp.buf.rename, "[R]ename") + nmap("lj", vim.diagnostic.goto_next, "Diagnostic Next") + nmap("lk", vim.diagnostic.goto_prev, "Diagnostic Prev") + nmap("]d", function() + local trouble = require("trouble") + trouble.open("workspace_diagnostics") + trouble.next({ skip_groups = true, jump = true }) + end, "Trouble Next") + nmap("[d", function() + local trouble = require("trouble") + trouble.open("workspace_diagnostics") + trouble.previous({ skip_groups = true, jump = true }) + end, "Trouble Prev") vim.keymap.set( { "n", "v" }, "la", @@ -76,7 +91,7 @@ return { vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" }) end - local config = { + vim.diagnostic.config({ virtual_text = true, -- virtual text signs = { active = signs, -- show signs @@ -92,9 +107,7 @@ return { header = "", prefix = "", }, - } - - vim.diagnostic.config(config) + }) vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "rounded", diff --git a/lua/plugins/rust_tools.lua b/lua/plugins/rust_tools.lua index db00044..5ecc6df 100644 --- a/lua/plugins/rust_tools.lua +++ b/lua/plugins/rust_tools.lua @@ -18,13 +18,16 @@ return { tools = { -- on_initialized = nil, on_initialized = function() - vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "InsertLeave", "BufWritePost" }, { - group = vim.api.nvim_create_augroup("InitializeRustAnalyzer", { clear = true }), - pattern = { "*.rs" }, - callback = function() - vim.lsp.codelens.refresh() - end, - }) + vim.api.nvim_create_autocmd( + { "BufEnter", "CursorHold", "InsertLeave", "BufWritePost", "InsertEnter" }, + { + group = vim.api.nvim_create_augroup("InitializeRustAnalyzer", { clear = true }), + pattern = { "*.rs" }, + callback = function() + vim.lsp.codelens.refresh() + end, + } + ) end, reload_workspace_from_cargo_toml = true, inlay_hints = { diff --git a/lua/plugins/tmux_navigator.lua b/lua/plugins/tmux_navigator.lua index a5dbe61..93cefa1 100644 --- a/lua/plugins/tmux_navigator.lua +++ b/lua/plugins/tmux_navigator.lua @@ -1 +1,17 @@ -return { "christoomey/vim-tmux-navigator" } +return { + "christoomey/vim-tmux-navigator", + cmds = { + "TmuxNavigateLeft", + "TmuxNavigateDown", + "TmuxNavigateUp", + "TmuxNavigateRight", + "TmuxNavigatePrevious", + }, + keys = { + { "", vim.cmd.TmuxNavigateLeft, desc = "Focus window left", mode = { "n", "t" } }, + { "", vim.cmd.TmuxNavigateDown, desc = "Focus window down", mode = { "n", "t" } }, + { "", vim.cmd.TmuxNavigateUp, desc = "Focus window up", mode = { "n", "t" } }, + { "", vim.cmd.TmuxNavigateRight, desc = "Focus window right", mode = { "n", "t" } }, + { "", vim.cmd.TmuxNavigatePrevious, desc = "Focus window previous", mode = { "n", "t" } }, + }, +} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 5582662..aa91d2e 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -3,9 +3,11 @@ return { build = ":TSUpdate", dependencies = { "p00f/nvim-ts-rainbow", + "nvim-treesitter/nvim-treesitter-context", "mechatroner/rainbow_csv", "JoosepAlviste/nvim-ts-context-commentstring", "nvim-treesitter/nvim-treesitter-textobjects", + "luckasRanarison/tree-sitter-hyprlang", }, config = function() local ts_repeat_move = require("nvim-treesitter.textobjects.repeatable_move") @@ -42,7 +44,7 @@ return { -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). -- Using this option may slow down your editor, and you may see some duplicate highlights. -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = { "markdown" }, + additional_vim_regex_highlighting = true, disable = function(lang, buf) local max_filesize = 100 * 1024 -- 100 KB @@ -177,5 +179,7 @@ return { }, }, }) + vim.cmd.highlight("TreesitterContext guibg=None") + vim.cmd.highlight("TreesitterContextLineNumberBottom gui=underline guisp=Grey") end, } diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index d11e616..55e20f8 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -23,20 +23,6 @@ return { end, desc = "[D]ocument Diagnostics", }, - { - "[d", - function() - require("trouble").next({ skip_groups = true, jump = true }) - end, - desc = "Trouble Next", - }, - { - "]d", - function() - require("trouble").previous({ skip_groups = true, jump = true }) - end, - desc = "Trouble Prev", - }, }, opts = { position = "bottom", -- position of the list can be: bottom, top, left, right diff --git a/lua/solo/keymaps.lua b/lua/solo/keymaps.lua index 22d601e..3d36788 100644 --- a/lua/solo/keymaps.lua +++ b/lua/solo/keymaps.lua @@ -29,11 +29,6 @@ nmap("g#", "g#zz") vim.keymap.set({ "n" }, "j", "gj", { desc = "Allows to navigate though wrapped lines", noremap = true }) vim.keymap.set({ "n" }, "k", "gk", { desc = "Allows to navigate though wrapped lines", noremap = true }) -vim.keymap.set({ "n", "t" }, "", vim.cmd.TmuxNavigateLeft, { desc = "Focus window left", noremap = true }) -vim.keymap.set({ "n", "t" }, "", vim.cmd.TmuxNavigateDown, { desc = "Focus window down", noremap = true }) -vim.keymap.set({ "n", "t" }, "", vim.cmd.TmuxNavigateUp, { desc = "Focus window up", noremap = true }) -vim.keymap.set({ "n", "t" }, "", vim.cmd.TmuxNavigateRight, { desc = "Focus window right", noremap = true }) - nmap("", "resize -2", "Resize window up") nmap("", "resize +2", "Resize window down") nmap("", "vertical resize -2", "Resize window left") @@ -71,7 +66,7 @@ vmap("<", "", ":m '<-2gv=gv", "Move lines up") vmap("", ":m '>+1gv=gv", "Move lines down") -tmap("t", "", "h") -tmap("t", "", "j") -tmap("t", "", "k") -tmap("t", "", "l") +-- tmap("t", "", "h") +-- tmap("t", "", "j") +-- tmap("t", "", "k") +-- tmap("t", "", "l")