From 6d0bab25471165faa74a894df69a76556a7e8d34 Mon Sep 17 00:00:00 2001 From: Exide Date: Sat, 23 Nov 2024 22:25:53 +0300 Subject: [PATCH] And some more --- lazy-lock.json | 36 ++++++++++++++++++----------------- lazyvim.json | 2 +- lua/config/keymaps.lua | 10 +++++++++- lua/config/lazy.lua | 3 +++ lua/config/options.lua | 5 ++++- lua/plugins/diffview.lua | 3 +++ lua/plugins/git-fugitive.lua | 3 +++ lua/plugins/todo-comments.lua | 13 +++++++++++++ lua/plugins/zenmode.lua | 8 ++++++++ 9 files changed, 63 insertions(+), 20 deletions(-) create mode 100644 lua/plugins/diffview.lua create mode 100644 lua/plugins/git-fugitive.lua create mode 100644 lua/plugins/todo-comments.lua create mode 100644 lua/plugins/zenmode.lua diff --git a/lazy-lock.json b/lazy-lock.json index e6b3ebd..026b455 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,52 +1,54 @@ { - "LazyVim": { "branch": "main", "commit": "704c29110d578186f0ca3eac67b753ddf52541fc" }, + "LazyVim": { "branch": "main", "commit": "adcbfc72fd8d0808d78bdfe0940d98c6432c4ef0" }, "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, - "catppuccin": { "branch": "main", "commit": "637d99e638bc6f1efedac582f6ccab08badac0c6" }, + "catppuccin": { "branch": "main", "commit": "a4c64d7605f6eb95674e322bbbedfaa00aab7904" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "conform.nvim": { "branch": "master", "commit": "023f795dbcf32d4351b6a9ed2e613d471b5bb812" }, - "dashboard-nvim": { "branch": "master", "commit": "ae309606940d26d8c9df8b048a6e136b6bbec478" }, + "conform.nvim": { "branch": "master", "commit": "62d5accad8b29d6ba9b58d3dff90c43a55621c60" }, + "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, - "gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" }, + "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, "grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" }, "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" }, "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" }, "lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "cab00668464d2914d0752b86168b4a431cc93eb2" }, + "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "31c149067d38b97720d2a179619f7745a0006ecc" }, "mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, - "noice.nvim": { "branch": "main", "commit": "221ffbc499d322699ea079fcd878a2399529e775" }, + "noice.nvim": { "branch": "main", "commit": "9ccd02965382922c33762933c5601318f93e19fb" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, - "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" }, - "nvim-dap": { "branch": "master", "commit": "29d1f8814fa4fcc194ec574de998a42a22ebbe4a" }, + "nvim-cmp": { "branch": "main", "commit": "be7bd4c5f860c79da97af3a26d489af50babfd4b" }, + "nvim-dap": { "branch": "master", "commit": "cc92b054720a96170eca6bd9bdedd43d2b0a7a8a" }, "nvim-dap-python": { "branch": "master", "commit": "3e3dd98d4d83715c9e0e429b4a5da7bd706e6ceb" }, "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" }, - "nvim-lint": { "branch": "master", "commit": "36da8dd0ddc4f88e0beae234c20e75397326f143" }, - "nvim-lspconfig": { "branch": "master", "commit": "87c7c83ce62971e0bdb29bb32b8ad2b19c8f95d0" }, + "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" }, + "nvim-lspconfig": { "branch": "master", "commit": "c646154d6e4db9b2979eeb517d0b817ad00c9c47" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, - "nvim-treesitter": { "branch": "master", "commit": "20e10ca6914f65cf1410232433fb58de70ab6b39" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" }, + "nvim-treesitter": { "branch": "master", "commit": "efb2e9c607cab1e4f7171493b7c6f63bd39073fc" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, - "snacks.nvim": { "branch": "main", "commit": "3f24e0a477c98b319f3d59051c12cc38c1dae21f" }, + "snacks.nvim": { "branch": "main", "commit": "7564a30cad803c01f8ecc15683a280d2f0e9bdb7" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "9758827c3b380ba89da4a2212b6255d01afbcf08" }, + "tokyonight.nvim": { "branch": "main", "commit": "c2725eb6d086c8c9624456d734bd365194660017" }, "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" }, "ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" }, "venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" }, - "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" } + "vim-fugitive": { "branch": "master", "commit": "320b18fba2a4f2fe3c8225c778c687e0d2620384" }, + "which-key.nvim": { "branch": "main", "commit": "68e37e12913a66b60073906f5d3f14dee0de19f2" }, + "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } } diff --git a/lazyvim.json b/lazyvim.json index dec6854..7fd2a72 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -3,7 +3,7 @@ ], "news": { - "NEWS.md": "7107" + "NEWS.md": "7429" }, "version": 7 } \ No newline at end of file diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index b67177c..f864a11 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -3,6 +3,14 @@ -- Add any additional keymaps here local builtin = require 'telescope.builtin' +local dapui = require 'dapui' -vim.keymap.set('n', '', builtin.find_files, { desc = '[S]earch [F]iles' }) vim.keymap.set("i", "jj", "") +vim.keymap.set('n', '', builtin.find_files, { desc = '[S]earch [F]iles' }) + +vim.keymap.set('n', 'dfv', function() dapui.float_element('scopes', { enter = true }) end, { desc = 'Float variables' }) +vim.keymap.set('n', 'dfs', function() dapui.float_element('stacks', { enter = true }) end, { desc = 'Float stacks' }) +vim.keymap.set('n', 'dfw', function() dapui.float_element('watches', { enter = true }) end, { desc = 'Float watches' }) +vim.keymap.set('n', 'dfb', function() dapui.float_element('breakpoints', { enter = true }) end, { desc = 'Float breakpoints' }) +vim.keymap.set('n', 'dfd', function() dapui.float_element('repl', { position = "center" }) end, { desc = 'Float debug window' }) +vim.keymap.set('n', 'dfc', function() dapui.float_element('console', { position = "center", height = 40, width = 120 }) end, { desc = 'Float console' }) diff --git a/lua/config/lazy.lua b/lua/config/lazy.lua index 53f4e94..01f1013 100644 --- a/lua/config/lazy.lua +++ b/lua/config/lazy.lua @@ -55,4 +55,7 @@ require("lazy").setup({ }, }, }, + + -- restricting amount of concurrent tasks on windows because windows sucks + concurrency = jit.os:find("Windows") and 5 or nil, }) diff --git a/lua/config/options.lua b/lua/config/options.lua index 29804e0..eba6b85 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -4,4 +4,7 @@ -- disable LazyVim auto format -- https://www.reddit.com/r/neovim/comments/1arkhtx/how_to_disable_format_on_save_in_lazyvim/ -vim.g.autoformat = false \ No newline at end of file +vim.g.autoformat = false + +-- disabling sync with system clipboard because I don't like an easy way +vim.opt.clipboard = "" diff --git a/lua/plugins/diffview.lua b/lua/plugins/diffview.lua new file mode 100644 index 0000000..aab3fd3 --- /dev/null +++ b/lua/plugins/diffview.lua @@ -0,0 +1,3 @@ +return { + "sindrets/diffview.nvim" +} diff --git a/lua/plugins/git-fugitive.lua b/lua/plugins/git-fugitive.lua new file mode 100644 index 0000000..0b426c0 --- /dev/null +++ b/lua/plugins/git-fugitive.lua @@ -0,0 +1,3 @@ +return { + "tpope/vim-fugitive" +} diff --git a/lua/plugins/todo-comments.lua b/lua/plugins/todo-comments.lua new file mode 100644 index 0000000..009cfde --- /dev/null +++ b/lua/plugins/todo-comments.lua @@ -0,0 +1,13 @@ +-- https://github.com/folke/todo-comments.nvim +-- I'm not used to adding colons after tags +return { + 'folke/todo-comments.nvim', + opts = { + highlight = { + pattern = [[.*<(KEYWORDS)\s*]], + }, + search = { + pattern = [[\b(KEYWORDS)\b]], + } + } +} diff --git a/lua/plugins/zenmode.lua b/lua/plugins/zenmode.lua new file mode 100644 index 0000000..fb31b40 --- /dev/null +++ b/lua/plugins/zenmode.lua @@ -0,0 +1,8 @@ +return { + "folke/zen-mode.nvim", + opts = { + window = { + width = 160 + } + } +}