diff --git a/config/nvim/lua/aleidk/options.lua b/config/nvim/lua/aleidk/options.lua index 47041ff..c2de18f 100644 --- a/config/nvim/lua/aleidk/options.lua +++ b/config/nvim/lua/aleidk/options.lua @@ -92,3 +92,24 @@ opt.updatetime = 200 -- Save swap file and trigger CursorHold opt.wildmode = "longest:full,full" -- Command-line completion mode opt.winminwidth = 5 -- Minimum window width opt.wrap = false -- Disable line wrap + +vim.filetype.add({ + -- Detect and assign filetype based on the extension of the filename + extension = { + mdx = "mdx", + log = "log", + conf = "conf", + env = "dotenv", + }, + -- Detect and apply filetypes based on the entire filename + filename = { + [".env"] = "dotenv", + ["env"] = "dotenv", + ["tsconfig.json"] = "jsonc", + }, + -- Detect and apply filetypes based on certain patterns of the filenames + pattern = { + -- INFO: Match filenames like - ".env.example", ".env.local" and so on + ["%.env%.[%w_.-]+"] = "dotenv", + }, +}) diff --git a/config/nvim/lua/aleidk/plugins/colorscheme.lua b/config/nvim/lua/aleidk/plugins/colorscheme.lua index 945f3ab..da23982 100644 --- a/config/nvim/lua/aleidk/plugins/colorscheme.lua +++ b/config/nvim/lua/aleidk/plugins/colorscheme.lua @@ -6,7 +6,6 @@ return { -- Change colors.none if not using a transparent background flavour = "macchiato", transparent_background = false, integrations = { - fidget = true, cmp = true, }, custom_highlights = function(colors) diff --git a/config/nvim/lua/aleidk/plugins/dressing.lua b/config/nvim/lua/aleidk/plugins/dressing.lua new file mode 100644 index 0000000..2073312 --- /dev/null +++ b/config/nvim/lua/aleidk/plugins/dressing.lua @@ -0,0 +1,9 @@ +return { + "stevearc/dressing.nvim", + opts = { + input = { + -- handle by noice + enabled = false, + }, + }, +} diff --git a/config/nvim/lua/aleidk/plugins/lsp.lua b/config/nvim/lua/aleidk/plugins/lsp.lua index f9e063d..c7e5b19 100644 --- a/config/nvim/lua/aleidk/plugins/lsp.lua +++ b/config/nvim/lua/aleidk/plugins/lsp.lua @@ -6,18 +6,6 @@ return { { "williamboman/mason.nvim" }, "williamboman/mason-lspconfig.nvim", - -- Useful status updates for LSP - { - "j-hui/fidget.nvim", - tag = "legacy", - event = "LspAttach", - opts = { - window = { - blend = 0, - }, - }, - }, - -- Additional lua configuration, makes nvim stuff amazing! { "folke/neodev.nvim", opts = {} }, }, diff --git a/config/nvim/lua/aleidk/plugins/lsp_signature.lua b/config/nvim/lua/aleidk/plugins/lsp_signature.lua deleted file mode 100644 index aef9c1b..0000000 --- a/config/nvim/lua/aleidk/plugins/lsp_signature.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - "ray-x/lsp_signature.nvim", - event = "VeryLazy", - opts = { - hint_enable = false, - }, - keys = { - { - "lK", - vim.lsp.buf.signature_help, - desc = "Toggle signature", - }, - }, -} diff --git a/config/nvim/lua/aleidk/plugins/mason.lua b/config/nvim/lua/aleidk/plugins/mason.lua index 95a9775..68a4c18 100644 --- a/config/nvim/lua/aleidk/plugins/mason.lua +++ b/config/nvim/lua/aleidk/plugins/mason.lua @@ -4,6 +4,7 @@ return { ensure_installed = { "typescript-language-server", "eslint_d", + "shellcheck", }, }, } diff --git a/config/nvim/lua/aleidk/plugins/noice.lua b/config/nvim/lua/aleidk/plugins/noice.lua index f1fb95d..9397ac6 100644 --- a/config/nvim/lua/aleidk/plugins/noice.lua +++ b/config/nvim/lua/aleidk/plugins/noice.lua @@ -11,10 +11,16 @@ return { "rcarriga/nvim-notify", opts = { background_colour = "#000000", - } + }, }, }, opts = { + presets = { + bottom_search = true, + -- command_palette = true, + long_message_to_split = true, + inc_rename = true, + }, lsp = { override = { ["vim.lsp.util.convert_input_to_markdown_lines"] = true, @@ -34,12 +40,43 @@ return { }, view = "mini", }, + { + filter = { + event = "msg_show", + kind = "search_count", + }, + opts = { skip = true }, + }, }, - presets = { - bottom_search = true, - command_palette = true, - long_message_to_split = true, - inc_rename = true, + 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" }, + }, + }, }, }, -- stylua: ignore diff --git a/config/nvim/lua/aleidk/plugins/treesitter.lua b/config/nvim/lua/aleidk/plugins/treesitter.lua index c706927..533f687 100644 --- a/config/nvim/lua/aleidk/plugins/treesitter.lua +++ b/config/nvim/lua/aleidk/plugins/treesitter.lua @@ -9,7 +9,22 @@ return { build = ":TSUpdate", opts = { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { "c", "cpp", "go", "lua", "python", "rust", "tsx", "typescript", "vimdoc", "vim" }, + ensure_installed = { + "bash", + "c", + "cpp", + "go", + "lua", + "markdown", + "markdown_inline", + "python", + "regex", + "rust", + "tsx", + "typescript", + "vim", + "vimdoc", + }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = true, highlight = { enable = true },