diff --git a/config/nvim/lua/config/options.lua b/config/nvim/lua/config/options.lua index bf9cb030..00e4bbba 100644 --- a/config/nvim/lua/config/options.lua +++ b/config/nvim/lua/config/options.lua @@ -19,15 +19,10 @@ go.gui_font_face = "JetBrainsMono Nerd Font" -- Enable EditorConfig integration go.editorconfig = true --- Disable some repl providers -for _, provider in ipairs({ "node", "perl", "python3", "ruby" }) do - go["loaded_" .. provider .. "_provider"] = 0 -end - -- Root dir detection go.root_spec = { "lsp", - { ".git", "lua", "package.json", "Makefile", "go.mod", "cargo.toml", "pyproject.toml", "src" }, + { ".git", "lua", ".obsidian", "package.json", "Makefile", "go.mod", "cargo.toml", "pyproject.toml", "src" }, "cwd", } @@ -38,7 +33,7 @@ o.cmdheight = 0 -- Enable spell checking o.spell = true -o.spelllang = { "en_us" } +o.spelllang = { "en" } -- Backspacing and indentation when wrapping o.backspace = { "start", "eol", "indent" } @@ -50,7 +45,3 @@ if vim.fn.has("nvim-0.10") == 1 then end o.conceallevel = 2 - --- LSP Server to use for Python. --- Set to "basedpyright" to use basedpyright instead of pyright. -vim.g.lazyvim_python_lsp = "basedpyright" diff --git a/config/nvim/lua/plugins/extras/coding/ai/copilot.lua b/config/nvim/lua/plugins/extras/coding/ai/copilot.lua index e087920a..823eb92c 100644 --- a/config/nvim/lua/plugins/extras/coding/ai/copilot.lua +++ b/config/nvim/lua/plugins/extras/coding/ai/copilot.lua @@ -1,7 +1,5 @@ return { - { - import = "lazyvim.plugins.extras.coding.copilot", - }, + { import = "lazyvim.plugins.extras.coding.copilot" }, { "zbirenbaum/copilot.lua", event = "InsertEnter", diff --git a/config/nvim/lua/plugins/extras/editor/rest-client.lua b/config/nvim/lua/plugins/extras/editor/rest-client.lua index 351c444d..f05a2ac9 100644 --- a/config/nvim/lua/plugins/extras/editor/rest-client.lua +++ b/config/nvim/lua/plugins/extras/editor/rest-client.lua @@ -9,13 +9,7 @@ return { }, { "rest-nvim/rest.nvim", - dependencies = { - { - "gennaro-tedesco/nvim-jqx", - ft = { "json", "yaml" }, - }, - }, - ft = { "http" }, + ft = "http", opts = { -- Open request results in a horizontal split result_split_horizontal = true, diff --git a/config/nvim/lua/plugins/extras/editor/telescope/undotree.lua b/config/nvim/lua/plugins/extras/editor/telescope/undotree.lua index 757cc809..a3020946 100644 --- a/config/nvim/lua/plugins/extras/editor/telescope/undotree.lua +++ b/config/nvim/lua/plugins/extras/editor/telescope/undotree.lua @@ -7,7 +7,6 @@ return { require("telescope").setup({ extensions = { undo = { - use_delta = true, side_by_side = true, layout_strategy = "vertical", layout_config = { diff --git a/config/nvim/lua/plugins/extras/lang/jason-extended.lua b/config/nvim/lua/plugins/extras/lang/jason-extended.lua new file mode 100644 index 00000000..72aad567 --- /dev/null +++ b/config/nvim/lua/plugins/extras/lang/jason-extended.lua @@ -0,0 +1,11 @@ +return { + { import = "lazyvim.plugins.extras.lang.json" }, + { + "gennaro-tedesco/nvim-jqx", + ft = { "json", "yaml" }, + cmd = { "JqxList", "JqxQuery" }, + keys = { + { "cj", ft = { "json", "yaml" }, "JqxList", desc = "Jqx List" }, + }, + }, +} diff --git a/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua b/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua index deea9356..3d317792 100644 --- a/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua +++ b/config/nvim/lua/plugins/extras/lang/web/typescript-extended.lua @@ -26,7 +26,7 @@ end return { { import = "lazyvim.plugins.extras.lang.typescript" }, - { import = "lazyvim.plugins.extras.lang.json" }, + { import = "plugins.extras.lang.json-extended" }, { "williamboman/mason.nvim", opts = function(_, opts) @@ -146,6 +146,7 @@ return { }, keys = { { "ct", ft = { "typescript", "typescriptreact" }, "TSC", desc = "Type Check" }, + { "xy", ft = { "typescript", "typescriptreact" }, "TSCOpen", desc = "Type Check Quickfix" }, }, ft = { "typescript", diff --git a/config/nvim/lua/plugins/extras/lang/web/vue.lua b/config/nvim/lua/plugins/extras/lang/web/vue.lua index b9fde587..75f1ee10 100644 --- a/config/nvim/lua/plugins/extras/lang/web/vue.lua +++ b/config/nvim/lua/plugins/extras/lang/web/vue.lua @@ -12,6 +12,25 @@ return { opts = { servers = { volar = {}, + tsserver = {}, + }, + setup = { + tsserver = function(_, opts) + local mason_registry = require("mason-registry") + local vue_language_server_path = mason_registry.get_package("vue-language-server"):get_install_path() + .. "/node_modules/@vue/language-server" + + opts.init_options = { + plugins = { + { + name = "@vue/typescript-plugin", + location = vue_language_server_path, + languages = { "vue" }, + }, + }, + } + opts.filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue" } + end, }, }, }, diff --git a/config/nvim/lua/plugins/extras/lazyvim/telescope.lua b/config/nvim/lua/plugins/extras/lazyvim/telescope.lua index ffd9761a..e909aef1 100644 --- a/config/nvim/lua/plugins/extras/lazyvim/telescope.lua +++ b/config/nvim/lua/plugins/extras/lazyvim/telescope.lua @@ -40,25 +40,26 @@ return { { "sSp", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Property" } }), desc = "Property" }, { "sSv", LazyVim.telescope("lsp_dynamic_workspace_symbols", { symbols = { "Variable", "Parameter" } }), desc = "Variable" }, { "sA", LazyVim.telescope("treesitter"), desc = "Treesitter Symbols" }, + { "sp", "Telescope builtin", desc = "Pickers (Telescope)" }, + { "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", function() - require('telescope.builtin').spell_suggest(require('telescope.themes').get_dropdown({}), { layout_config = { width=0.25, height=0.3 } }) - end, desc = "Spelling" }, + { "cs", "Telescope spell_suggest", desc = "Spelling" }, }, opts = { defaults = { mappings = { i = { [""] = actions.move_selection_previous, - [""] = actions.delete_buffer, [""] = actions.move_selection_next, [""] = actions.close, [""] = require("telescope.actions.layout").toggle_preview, + [""] = require("telescope.actions.layout").cycle_layout_next, + [""] = require("telescope.actions.layout").cycle_layout_prev, [""] = actions.cycle_history_next, [""] = actions.cycle_history_prev, - [""] = actions.close, }, }, file_ignore_patterns = { @@ -70,21 +71,42 @@ return { "*.git/*", "*/tmp/*", }, - pickers = { - find_files = { - hidden = false, + }, + pickers = { + find_files = { + hidden = false, + }, + buffers = { + layout_config = { + prompt_position = "top", + height = 0.5, + width = 0.6, + }, + sorting_strategy = "ascending", + mappings = { + i = { + [""] = require("telescope.actions").delete_buffer, + }, }, }, - extensions = { - fzf = { - fuzzy = true, - override_generic_sorter = true, - override_file_sorter = true, - case_mode = "smart_case", - }, - ["ui-select"] = { - require("telescope.themes").get_dropdown({}), + spell_suggest = { + layout_config = { + prompt_position = "top", + height = 0.3, + width = 0.25, }, + sorting_strategy = "ascending", + }, + }, + extensions = { + fzf = { + fuzzy = true, + override_generic_sorter = true, + override_file_sorter = true, + case_mode = "smart_case", + }, + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), }, }, },