diff --git a/config/nvim/lazyvim.json b/config/nvim/lazyvim.json index 77aabaf4..4210abb8 100644 --- a/config/nvim/lazyvim.json +++ b/config/nvim/lazyvim.json @@ -20,7 +20,6 @@ "plugins.extras.editor.git.diffview", "plugins.extras.editor.live-server", "plugins.extras.editor.marks.grapple", - "plugins.extras.editor.outline-extended", "plugins.extras.editor.package-info", "plugins.extras.editor.search-replace", "plugins.extras.editor.suda", diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/lua/config/keymaps.lua index 3633afd1..0b0da0c2 100644 --- a/config/nvim/lua/config/keymaps.lua +++ b/config/nvim/lua/config/keymaps.lua @@ -23,6 +23,10 @@ map("n", "E", "ge") map("n", "+", "") map("n", "-", "") +-- Spelling +map("n", "!", "zg", { desc = "Add Word to Dictionary" }) +map("n", "@", "zug", { desc = "Remove Word from Dictionary" }) + -- Tabs map("n", "]", "tabnext", { desc = "Next Tab" }) map("n", "[", "tabprevious", { desc = "Previous Tab" }) diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index 7b2c88ad..11b6d2b8 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -6,7 +6,7 @@ vim.loader.enable() -- Define leader key go.mapleader = " " -go.maplocalleader = "\\" +go.maplocalleader = " " -- Autoformat on save (Global) go.autoformat = true @@ -45,3 +45,5 @@ if vim.fn.has("nvim-0.10") == 1 then end o.conceallevel = 2 + +vim.g.lazyvim_python_lsp = "basedpyright" diff --git a/config/nvim/lua/plugins/extras/editor/carbon-now.lua b/config/nvim/lua/plugins/extras/editor/carbon-now.lua index b3f5dc6a..f382ca53 100644 --- a/config/nvim/lua/plugins/extras/editor/carbon-now.lua +++ b/config/nvim/lua/plugins/extras/editor/carbon-now.lua @@ -1,7 +1,4 @@ return { "kristijanhusak/vim-carbon-now-sh", - cmd = { "CarbonNowSh" }, - keys = { - { "cS", ":CarbonNowSh", mode = { "n", "v" }, desc = "Screenshot Code", silent = true }, - }, + cmd = "CarbonNowSh", } diff --git a/config/nvim/lua/plugins/extras/editor/fold.lua b/config/nvim/lua/plugins/extras/editor/fold.lua index e510503c..92d9ce19 100644 --- a/config/nvim/lua/plugins/extras/editor/fold.lua +++ b/config/nvim/lua/plugins/extras/editor/fold.lua @@ -1,5 +1,5 @@ return { - { -- better fold + { "kevinhwang91/nvim-ufo", event = { "LazyFile" }, dependencies = { "kevinhwang91/promise-async" }, @@ -27,7 +27,6 @@ return { local hlGroup = chunk[2] table.insert(newVirtText, { chunkText, hlGroup }) chunkWidth = vim.fn.strdisplaywidth(chunkText) - -- str width returned from truncate() may less than 2nd argument, need padding if curWidth + chunkWidth < targetWidth then suffix = suffix .. (" "):rep(targetWidth - curWidth - chunkWidth) end @@ -45,7 +44,7 @@ return { return { "treesitter", "indent" } end, open_fold_hl_timeout = 400, - close_fold_kinds = { "imports", "comment" }, + close_fold_kinds_for_ft = { "imports", "comment" }, preview = { win_config = { border = { "", "─", "", "", "", "─", "", "" }, winblend = 0 }, mappings = { @@ -57,9 +56,6 @@ return { }, } end, - config = function(_, opts) - require("ufo").setup(opts) - end, keys = { { "zp", @@ -69,7 +65,7 @@ return { vim.lsp.buf.hover() end end, - desc = "Peek folded line", + desc = "Peek Folded Line", }, }, }, diff --git a/config/nvim/lua/plugins/extras/lang/web/html-css.lua b/config/nvim/lua/plugins/extras/lang/web/html-css.lua index 873d84d0..477c010c 100644 --- a/config/nvim/lua/plugins/extras/lang/web/html-css.lua +++ b/config/nvim/lua/plugins/extras/lang/web/html-css.lua @@ -48,6 +48,7 @@ return { "emmet-language-server", "html-lsp", "cssmodules-language-server", + "css-variables-language-server", "css-lsp", "htmlhint", "stylelint", diff --git a/config/nvim/lua/plugins/extras/lazyvim/noice.lua b/config/nvim/lua/plugins/extras/lazyvim/noice.lua index 3ee57811..6cd87119 100644 --- a/config/nvim/lua/plugins/extras/lazyvim/noice.lua +++ b/config/nvim/lua/plugins/extras/lazyvim/noice.lua @@ -7,9 +7,42 @@ return { find = "No information available", }, opts = { - skip = true, + require("noice").setup({ + views = { + cmdline_popup = { + position = { + row = 5, + col = "50%", + }, + size = { + width = 60, + height = "auto", + }, + }, + popupmenu = { + relative = "editor", + position = { + row = 8, + col = "50%", + }, + size = { + width = 60, + height = 10, + }, + border = { + style = "rounded", + padding = { 0, 1 }, + }, + win_options = { + winhighlight = { Normal = "Normal", FloatBorder = "DiagnosticInfo" }, + }, + }, + }, + }) }, }) + + opts.presets.lsp_doc_border = true opts.presets.bottom_search = false end, diff --git a/config/nvim/lua/plugins/extras/lazyvim/telescope.lua b/config/nvim/lua/plugins/extras/lazyvim/telescope.lua index e909aef1..c496d6e0 100644 --- a/config/nvim/lua/plugins/extras/lazyvim/telescope.lua +++ b/config/nvim/lua/plugins/extras/lazyvim/telescope.lua @@ -44,9 +44,9 @@ return { { "fh", LazyVim.telescope("find_files", { hidden = true }), desc = "Find Files (hidden)" }, { "", LazyVim.telescope("find_files", { hidden = true }), desc = "Find Files (hidden)" }, { "gf", "Telescope git_bcommits", desc = "File History" }, - { "gS", "Telescope git_stash", desc = "stash" }, - { "gb", "Telescope git_branches", desc = "branches" }, - { "cs", "Telescope spell_suggest", desc = "Spelling" }, + { "gS", "Telescope git_stash", desc = "Stash" }, + { "gb", "Telescope git_branches", desc = "Branches" }, + { "S", "Telescope spell_suggest", desc = "Spelling" }, }, opts = { defaults = { @@ -115,8 +115,8 @@ return { "folke/which-key.nvim", opts = { defaults = { - ["sS"] = { name = "Goto Symbols (Workspace)" }, - ["ss"] = { name = "Goto Symbols" }, + ["sS"] = { name = "goto symbols (Workspace)" }, + ["ss"] = { name = "goto symbols" }, }, }, }, diff --git a/config/nvim/lua/plugins/extras/ui/zen-mode.lua b/config/nvim/lua/plugins/extras/ui/zen-mode.lua index f90439be..782e9aea 100644 --- a/config/nvim/lua/plugins/extras/ui/zen-mode.lua +++ b/config/nvim/lua/plugins/extras/ui/zen-mode.lua @@ -15,7 +15,7 @@ return { executeCommandIfExists(":SatelliteDisable") executeCommandIfExists(":ScrollViewDisable") executeCommandIfExists(":LspLensOff") - executeCommandIfExists(":NvimContextVtDisable") + executeCommandIfExists(":NvimContextVtToggle") executeCommandIfExists(":IBLDisable") LazyVim.toggle.inlay_hints() executeCommandIfExists(":Gitsigns toggle_current_line_blame") @@ -26,7 +26,7 @@ return { executeCommandIfExists(":SatelliteEnable") executeCommandIfExists(":ScrollViewEnable") executeCommandIfExists(":LspLensOn") - executeCommandIfExists(":NvimContextVtEnable") + executeCommandIfExists(":NvimContextVtToggle") executeCommandIfExists(":IBLEnable") LazyVim.toggle.inlay_hints() executeCommandIfExists(":Gitsigns toggle_current_line_blame") diff --git a/config/nvim/spell/en.utf-8.add b/config/nvim/spell/en.utf-8.add index 4c2b6f33..65fceaa2 100644 --- a/config/nvim/spell/en.utf-8.add +++ b/config/nvim/spell/en.utf-8.add @@ -4,3 +4,4 @@ cmd dir stylua Smoothscroll +config diff --git a/config/nvim/spell/en.utf-8.add.spl b/config/nvim/spell/en.utf-8.add.spl index 9f126f9b..65588c7b 100644 Binary files a/config/nvim/spell/en.utf-8.add.spl and b/config/nvim/spell/en.utf-8.add.spl differ