From 6efd6ad74347aadf4a4798c73c125ae28947c506 Mon Sep 17 00:00:00 2001 From: Oliver Ladner Date: Fri, 31 May 2024 08:20:35 +0200 Subject: [PATCH] upgrade to Neovim 0.10 --- README.md | 1 - lazy-lock.json | 46 ++++++++++++++--------------- lua/weeheavy/plugins/catppuccin.lua | 1 + lua/weeheavy/plugins/diffview.lua | 2 +- lua/weeheavy/plugins/kanagawa.lua | 27 ----------------- lua/weeheavy/plugins/lualine.lua | 3 +- lua/weeheavy/plugins/nightfox.lua | 17 ++++++----- lua/weeheavy/plugins/oil.lua | 3 +- lua/weeheavy/plugins/rosepine.lua | 9 ++++++ lua/weeheavy/plugins/tokyonight.lua | 1 + lua/weeheavy/plugins/treesitter.lua | 1 + lua/weeheavy/plugins/troube.lua | 9 ------ lua/weeheavy/plugins/trouble.lua | 24 +++++++++++++++ lua/weeheavy/plugins/zenmode.lua | 45 +++++++++++++++++++++++++++- 14 files changed, 115 insertions(+), 74 deletions(-) delete mode 100644 lua/weeheavy/plugins/kanagawa.lua create mode 100644 lua/weeheavy/plugins/rosepine.lua delete mode 100644 lua/weeheavy/plugins/troube.lua create mode 100644 lua/weeheavy/plugins/trouble.lua diff --git a/README.md b/README.md index 2425de6..a42864d 100644 --- a/README.md +++ b/README.md @@ -115,4 +115,3 @@ See [CHEATSHEET](CHEATSHEET.md) - - solution to search-replace visual blocks -- PoC diff --git a/lazy-lock.json b/lazy-lock.json index 0d3e5f0..7a9279a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,34 +1,32 @@ { - "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, - "catppuccin": { "branch": "main", "commit": "a1439ad7c584efb3d0ce14ccb835967f030450fe" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "conform.nvim": { "branch": "master", "commit": "3d59cbd01a4b74124c5a6fb23b8cc63e5c2db3d5" }, + "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "conform.nvim": { "branch": "master", "commit": "9b26e81c4292106e68dda3e7b64473434fd5b3e0" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, - "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, - "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, - "lsp-zero.nvim": { "branch": "v3.x", "commit": "abac76482ec3012a2b359ba956a74e2ffd33d46f" }, - "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, + "diffview.nvim": { "branch": "main", "commit": "3afa6a053f680e9f1329c4a151db988a482306cd" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, + "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, - "nightfox.nvim": { "branch": "main", "commit": "a408e6bb101066952b81de9c11be367114bd561f" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lspconfig": { "branch": "master", "commit": "76251e810256dce4db531c98b8b746a38c0ed488" }, - "nvim-treesitter": { "branch": "master", "commit": "10d79b5dbbdffc3edf307b189284fb62e2e79a3e" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f2ef98cd18fca352448756d3feb6e58d82583274" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, - "nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" }, - "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, + "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, + "nvim-lspconfig": { "branch": "master", "commit": "38de86f82efd9ba0881203767d6a8e1815abca28" }, + "nvim-treesitter": { "branch": "master", "commit": "5c924407cf110e9da4f3ba02ffed127b4198ad89" }, + "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, + "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, + "oil.nvim": { "branch": "master", "commit": "2cb39e838e9dcd8b374f09a3a87a2e5ec9d372f6" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "rose-pine": { "branch": "main", "commit": "87aa437172357ad8f916942bca249ceadc6c68b1" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, - "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, + "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, + "trouble.nvim": { "branch": "main", "commit": "971ad925ff6fdb57950d7c5d4c5d65e2cdbaecec" }, "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, - "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, + "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" } } \ No newline at end of file diff --git a/lua/weeheavy/plugins/catppuccin.lua b/lua/weeheavy/plugins/catppuccin.lua index e2833a7..2d13f2b 100644 --- a/lua/weeheavy/plugins/catppuccin.lua +++ b/lua/weeheavy/plugins/catppuccin.lua @@ -3,6 +3,7 @@ return { name = "catppuccin", tag = "stable", lazy = false, + enabled = false, priority = 1000, opts = {}, -- config = function() diff --git a/lua/weeheavy/plugins/diffview.lua b/lua/weeheavy/plugins/diffview.lua index bfbc3be..355ef43 100644 --- a/lua/weeheavy/plugins/diffview.lua +++ b/lua/weeheavy/plugins/diffview.lua @@ -1,6 +1,6 @@ return { "sindrets/diffview.nvim", - tag = "main", + branch = "main", --event = "VeryLazy", opts = {}, } diff --git a/lua/weeheavy/plugins/kanagawa.lua b/lua/weeheavy/plugins/kanagawa.lua deleted file mode 100644 index ebfd669..0000000 --- a/lua/weeheavy/plugins/kanagawa.lua +++ /dev/null @@ -1,27 +0,0 @@ -return { - "rebelot/kanagawa.nvim", - tag = "master", - lazy = false, - priority = 1000, - opts = {}, - config = function() - require("kanagawa").setup({ - colors = { - palette = { - -- change all usages of these colors - sumiInk0 = "#000000", - fujiWhite = "#FFFFFF", - }, - theme = { - all = { - ui = { - bg_gutter = "none", - --bg_visual = "#8a9a7b", - bg_visual = "#938056", - }, - }, - }, - }, - }) - end, -} diff --git a/lua/weeheavy/plugins/lualine.lua b/lua/weeheavy/plugins/lualine.lua index 587d2d0..5dfe50d 100644 --- a/lua/weeheavy/plugins/lualine.lua +++ b/lua/weeheavy/plugins/lualine.lua @@ -53,10 +53,9 @@ return { }, }, lualine_c = { - { "searchcount" }, + --{ "searchcount" }, { "buffers", - --show_filename_only = false, show_filename_only = true, --fmt = function(str) -- return str:sub(1, 1) diff --git a/lua/weeheavy/plugins/nightfox.lua b/lua/weeheavy/plugins/nightfox.lua index bd91c63..a7d78df 100644 --- a/lua/weeheavy/plugins/nightfox.lua +++ b/lua/weeheavy/plugins/nightfox.lua @@ -1,9 +1,10 @@ -return { - 'EdenEast/nightfox.nvim', - lazy = true, - priority = 1000, - opts = {}, - --config = function() - -- vim.cmd.colorscheme 'duskfox' - --end +return { + "EdenEast/nightfox.nvim", + lazy = true, + priority = 1000, + enabled = false, + opts = {}, + --config = function() + -- vim.cmd.colorscheme 'duskfox' + --end } diff --git a/lua/weeheavy/plugins/oil.lua b/lua/weeheavy/plugins/oil.lua index 9de3a3f..779d3cb 100644 --- a/lua/weeheavy/plugins/oil.lua +++ b/lua/weeheavy/plugins/oil.lua @@ -11,7 +11,8 @@ return { local oil = require("oil") oil.setup({ -- Leave netrw there, so we can open link with `gx` - default_file_explorer = false, + --default_file_explorer = false, + default_file_explorer = true, columns = { --"size", "icon", diff --git a/lua/weeheavy/plugins/rosepine.lua b/lua/weeheavy/plugins/rosepine.lua new file mode 100644 index 0000000..8f8c9c5 --- /dev/null +++ b/lua/weeheavy/plugins/rosepine.lua @@ -0,0 +1,9 @@ +return { + "rose-pine/neovim", + name = "rose-pine", + branch = "main", + lazy = false, + enabled = false, + priority = 1000, + opts = {}, +} diff --git a/lua/weeheavy/plugins/tokyonight.lua b/lua/weeheavy/plugins/tokyonight.lua index 3115f73..af252ed 100644 --- a/lua/weeheavy/plugins/tokyonight.lua +++ b/lua/weeheavy/plugins/tokyonight.lua @@ -2,6 +2,7 @@ return { "folke/tokyonight.nvim", tag = "stable", lazy = false, + enabled = true, priority = 1000, opts = {}, config = function() diff --git a/lua/weeheavy/plugins/treesitter.lua b/lua/weeheavy/plugins/treesitter.lua index c29ac3d..470d77f 100644 --- a/lua/weeheavy/plugins/treesitter.lua +++ b/lua/weeheavy/plugins/treesitter.lua @@ -44,6 +44,7 @@ return { "go", "gomod", "gosum", + "tcl", }, incremental_selection = { enable = true, diff --git a/lua/weeheavy/plugins/troube.lua b/lua/weeheavy/plugins/troube.lua deleted file mode 100644 index 5b7be24..0000000 --- a/lua/weeheavy/plugins/troube.lua +++ /dev/null @@ -1,9 +0,0 @@ --- A pretty diagnostics, references, telescope results, quickfix and location --- list to help you solve all the trouble your code is causing. --- https://github.com/folke/trouble.nvim -return { - "folke/trouble.nvim", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, -} diff --git a/lua/weeheavy/plugins/trouble.lua b/lua/weeheavy/plugins/trouble.lua new file mode 100644 index 0000000..2b99dde --- /dev/null +++ b/lua/weeheavy/plugins/trouble.lua @@ -0,0 +1,24 @@ +-- A pretty diagnostics, references, telescope results, quickfix and location +-- list to help you solve all the trouble your code is causing. +-- https://github.com/folke/trouble.nvim +return { + "folke/trouble.nvim", + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + lazy = false, + keys = { + -- TODO: add more keymaps + { + "qq", + "Trouble diagnostics toggle", + desc = "Diagnostics (Trouble)", + }, + { + "qq", + "Trouble diagnostics toggle focus=true", + desc = "Diagnostics (Trouble)", + }, + }, + opts = {}, +} diff --git a/lua/weeheavy/plugins/zenmode.lua b/lua/weeheavy/plugins/zenmode.lua index 8d82ad8..f603c8a 100644 --- a/lua/weeheavy/plugins/zenmode.lua +++ b/lua/weeheavy/plugins/zenmode.lua @@ -5,9 +5,52 @@ return { dependencies = { "folke/twilight.nvim", opts = { + treesitter = true, context = 2, }, }, event = { "BufReadPre", "BufNewFile" }, - opts = {}, + opts = { + window = { + backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal + width = 0.75, -- width of the Zen window + height = 1, -- height of the Zen window + -- by default, no options are changed for the Zen window + -- uncomment any of the options below, or add other vim.wo options you want to apply + options = { + signcolumn = "no", -- disable signcolumn + number = false, -- disable number column + relativenumber = false, -- disable relative numbers + cursorline = false, -- disable cursorline + cursorcolumn = false, -- disable cursor column + foldcolumn = "0", -- disable fold column + list = false, -- disable whitespace characters + }, + }, + plugins = { + -- disable some global vim options (vim.o...) + -- comment the lines to not apply the options + options = { + enabled = true, + ruler = false, -- disables the ruler text in the cmd line area + showcmd = false, -- disables the command in the last line of the screen + -- you may turn on/off statusline in zen mode by setting 'laststatus' + -- statusline will be shown only if 'laststatus' == 3 + laststatus = 0, -- turn off the statusline in zen mode + }, + twilight = { enabled = true }, -- enable to start Twilight when zen mode opens + gitsigns = { enabled = false }, -- disables git signs + -- this will change the font size on alacritty when in zen mode + -- requires Alacritty Version 0.10.0 or higher + -- uses `alacritty msg` subcommand to change font size + alacritty = { + enabled = true, + font = "20", -- font size + }, + }, + -- callback where you can add custom code when the Zen window opens + on_open = function(win) end, + -- callback where you can add custom code when the Zen window closes + on_close = function() end, + }, }