diff --git a/nvim/init.lua b/nvim/init.lua index d7456f7..12c6998 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -32,3 +32,4 @@ vim.wo.number = true vim.opt.fillchars = { vert = " " } +vim.opt.confirm = true diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 6fbc275..a0f484f 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,24 +1,26 @@ { - "LuaSnip": { "branch": "master", "commit": "cab667e2674881001a86a7478fff7dc7791c63f5" }, - "bufferline.nvim": { "branch": "main", "commit": "9e8d2f695dd50ab6821a6a53a840c32d2067a78a" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "LazyVim": { "branch": "main", "commit": "b47c65f4087c4d82720ab7439f395aba5d6b5f40" }, + "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, - "dracula.nvim": { "branch": "master", "commit": "2f396b6ba988ad4b3961c2e40d1b9ae436b8c26c" }, - "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" }, - "mkdnflow.nvim": { "branch": "main", "commit": "d10908058836afe3ec2867cf3f603c1fd78dd8fb" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "230ff118613fa07138ba579b89d13ec2201530b9" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, - "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" }, - "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, - "nvim-lspconfig": { "branch": "master", "commit": "addad5176dbbe8bcc82ef91c51c5f1bf6629ec2d" }, - "nvim-treesitter": { "branch": "master", "commit": "7da3cb6323d1e1fbfc4d7dc05cac74946458b8a0" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-web-devicons": { "branch": "master", "commit": "cdbcca210cf3655aa9b31ebf2422763ecd85ee5c" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, - "telescope.nvim": { "branch": "master", "commit": "f336f8cfab38a82f9f00df380d28f0c2a572f862" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" } + "dashboard-nvim": { "branch": "master", "commit": "b88c997f468a1bacb1e9b13ff3b567638caa06e6" }, + "dracula.nvim": { "branch": "master", "commit": "194f10d0312236164f3865d404b4bcdcfd41deb7" }, + "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, + "lazy.nvim": { "branch": "main", "commit": "bc620783663ab09d16bff9fdecc07da65b2a1528" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "mkdnflow.nvim": { "branch": "main", "commit": "8065d69e73a2623203138bca9dc436df7784ef11" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, + "nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-lspconfig": { "branch": "master", "commit": "9baca6a403b3b2098224010fda6ff5615ae6e782" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-treesitter": { "branch": "master", "commit": "122b4d3db1616c1f1305b847c5ed2217c4c329f1" }, + "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" }, + "trouble.nvim": { "branch": "main", "commit": "2d8610a07033f2b367e71230ab128f8b89c2639d" } } \ No newline at end of file diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json new file mode 100644 index 0000000..b1aed37 --- /dev/null +++ b/nvim/lazyvim.json @@ -0,0 +1,9 @@ +{ + "extras": [ + + ], + "news": { + "NEWS.md": "6077" + }, + "version": 6 +} \ No newline at end of file diff --git a/nvim/lua/plugins/dracula.lua b/nvim/lua/plugins/dracula.lua index f157d8d..7564eaf 100644 --- a/nvim/lua/plugins/dracula.lua +++ b/nvim/lua/plugins/dracula.lua @@ -1,11 +1,53 @@ -return { +return { { 'maxmx03/dracula.nvim', lazy = false, + priority = 1000, config = function () - local dracula = require 'dracula' - dracula.setup() + ---@type dracula + local dracula = require "dracula" + + dracula.setup({ + transparent = false, + on_colors = function (colors, color) + ---@type dracula.palette + return { + -- override or create new colors + mycolor = "#ffffff", + } + end, + on_highlights = function (colors, color) + ---@type dracula.highlights + return { + ---@type vim.api.keyset.highlight + Normal = { fg = colors.mycolor } + } + end, + plugins = { + ["nvim-treesitter"] = true, + ["nvim-lspconfig"] = true, + ["nvim-navic"] = true, + ["nvim-cmp"] = true, + ["indent-blankline.nvim"] = true, + ["neo-tree.nvim"] = true, + ["nvim-tree.lua"] = true, + ["which-key.nvim"] = true, + ["dashboard-nvim"] = true, + ["gitsigns.nvim"] = true, + ["neogit"] = true, + ["todo-comments.nvim"] = true, + ["lazy.nvim"] = true, + ["telescope.nvim"] = true, + ["noice.nvim"] = true, + ["hop.nvim"] = true, + ["mini.statusline"] = true, + ["mini.tabline"] = true, + ["mini.starter"] = true, + ["mini.cursorword"] = true, + } + }) vim.cmd.colorscheme 'dracula' + vim.cmd.colorscheme 'dracula-soft' end } } diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua index 29b3c8a..824d384 100644 --- a/nvim/lua/plugins/lspconfig.lua +++ b/nvim/lua/plugins/lspconfig.lua @@ -13,6 +13,7 @@ return { lsp.cssls.setup{} lsp.cssmodules_ls.setup{} lsp.astro.setup{} + lsp.yamlls.setup{} vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('UserLspConfig', {}), callback = function(ev) diff --git a/nvim/lua/plugins/notify.lua b/nvim/lua/plugins/notify.lua new file mode 100644 index 0000000..94863a8 --- /dev/null +++ b/nvim/lua/plugins/notify.lua @@ -0,0 +1,3 @@ +return { + 'rcarriga/nvim-notify' +} diff --git a/nvim/lua/plugins/trouble.lua b/nvim/lua/plugins/trouble.lua index c2eaee3..35bf2bd 100644 --- a/nvim/lua/plugins/trouble.lua +++ b/nvim/lua/plugins/trouble.lua @@ -3,7 +3,8 @@ return { "folke/trouble.nvim", dependencies = { "nvim-tree/nvim-web-devicons" }, opts = { - auto_open = true, + auto_open = false, + auto_preview = false, auto_close = true, height = 3, padding = false