diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 269253b..053abe0 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,37 +1,37 @@ { - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, + "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, "barbar.nvim": { "branch": "master", "commit": "c20691d686addb0d6ea87896d186c082324b01f8" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "d31323db3fa4a33d203dcb05150d98bd0153c42c" }, + "conform.nvim": { "branch": "master", "commit": "0ebe875d9c306f5fc829db38492ffff2a70d8e9d" }, "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dracula.nvim": { "branch": "main", "commit": "fdf503e52ec1c8aae07353604d891fe5a3ed5201" }, "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, + "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, - "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, + "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "legendary.nvim": { "branch": "master", "commit": "d2665ca760253c087a217b5e3968bbcc98f074de" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mkdnflow.nvim": { "branch": "main", "commit": "4b8df635b0386d76544af2cbb0848d3d8a9cca8a" }, + "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, + "neogit": { "branch": "master", "commit": "8a60ac4b97c1a7c667506425cb9d5ffca5b8dc8d" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" }, + "nvim-autopairs": { "branch": "master", "commit": "19606af7c039271d5aa96bceff101e7523af3136" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "a89de2e049b5f89a0ee55029d5a31213bd4de6f8" }, + "nvim-lspconfig": { "branch": "master", "commit": "3ad562700d0615818bf358268ac8914f6ce2b079" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "ec8776ed9ef56ffe7a61e67b64d5d6b6aba2c631" }, - "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, + "nvim-treesitter": { "branch": "master", "commit": "c7920f2bc5080e1d04708332f6a0e7e9368b2197" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "symbol-usage.nvim": { "branch": "main", "commit": "533846260d3d053aebbf224617cc5294c219a8b1" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "symbol-usage.nvim": { "branch": "main", "commit": "2842380132e87d31853851be48760de6fb78bdbb" }, "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" } } diff --git a/nvim/lua/plugins/conform.lua b/nvim/lua/plugins/conform.lua index 3e3d1df..884a6d5 100644 --- a/nvim/lua/plugins/conform.lua +++ b/nvim/lua/plugins/conform.lua @@ -8,6 +8,7 @@ return { formatters_by_ft = { lua = { "stylua" }, rust = { "rustfmt", lsp_format = "fallback" }, + gleam = { "gleam format --stdin" }, }, }, } diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua index a32ee13..31e886a 100644 --- a/nvim/lua/plugins/lualine.lua +++ b/nvim/lua/plugins/lualine.lua @@ -1,56 +1,54 @@ -return { - { - 'nvim-lualine/lualine.nvim', - config = function() - local colors_insert = { - line_background = '#282a36', - line_foreground = '#f8f8f2', - line_midtone = '#44475a', - pink = '#ff79c6', - ourple = '#bd93f9' - } +return { + { + "nvim-lualine/lualine.nvim", + config = function() + local colors_insert = { + line_background = "#282a36", + line_foreground = "#f8f8f2", + line_midtone = "#44475a", + pink = "#ff79c6", + ourple = "#bd93f9", + } - local cake_theme_dracula = { - insert = { - a = { fg = colors_insert.line_background, bg = colors_insert.pink }, - b = { fg = colors_insert.line_foreground, bg = colors_insert.line_background }, - z = { fg = colors_insert.line_foreground, bg = colors_insert.line_background } - }, - normal = { - a = { fg = colors_insert.line_background, bg = colors_insert.ourple }, - - b = { fg = colors_insert.fg, bg = colors_insert.line_background }, - - z = { fg = colors_insert.fg, bg = colors_insert.line_background } - }, - visual = { - }, - replace = { - } - } + local cake_theme_dracula = { + insert = { + a = { fg = colors_insert.line_background, bg = colors_insert.pink }, + b = { fg = colors_insert.line_foreground, bg = colors_insert.line_background }, + z = { fg = colors_insert.line_foreground, bg = colors_insert.line_background }, + }, + normal = { + a = { fg = colors_insert.line_background, bg = colors_insert.ourple }, - require('lualine').setup { - options = { - theme = cake_theme_dracula, - disabled_filetypes = { - statusline = { - "neo-tree", - "dashboard" - } - }, - section_separators = "", - component_separators = "", + b = { fg = colors_insert.fg, bg = colors_insert.line_background }, + + z = { fg = colors_insert.fg, bg = colors_insert.line_background }, + }, + visual = {}, + replace = {}, + } + + require("lualine").setup({ + options = { + theme = cake_theme_dracula, + disabled_filetypes = { + statusline = { + "neo-tree", + "dashboard", + }, + }, + section_separators = "", + component_separators = "", + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "filename", "location" }, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { "diff", "branch" }, + }, + }) + end, + dependencies = { { "nvim-tree/nvim-web-devicons" } }, }, - sections = { - lualine_a = {'mode'}, - lualine_b = {'filename', 'location'}, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = {'diff','branch'} - } - } - end, - dependencies = {{'nvim-tree/nvim-web-devicons'}}, - } } diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 4d3c5fc..e980c8b 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -7,16 +7,25 @@ return { configs.setup({ auto_install = false, ensure_installed = { - "c", "rust", "lua", - "vim", "vimdoc", "markdown", - "javascript", "typescript", "python", - "html", "astro", "tsx", - "gleam", "bash" + "c", + "rust", + "lua", + "vim", + "vimdoc", + "markdown", + "javascript", + "typescript", + "python", + "html", + "astro", + "tsx", + "gleam", + "bash", }, sync_install = false, highlight = { enable = true }, indent = { enable = true }, }) - end - } + end, + }, }