diff --git a/lazy-lock.json b/lazy-lock.json index 1c3147a..1ae5866 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,12 +1,11 @@ { "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, "colorful-menu.nvim": { "branch": "master", "commit": "f80feb8a6706f965321aff24d0ed3849f02a7f77" }, - "conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" }, - "everforest-nvim": { "branch": "main", "commit": "135cc21a45756e688dd1a3cbeb1c80a04b569b46" }, + "conform.nvim": { "branch": "master", "commit": "b1a75324ddf96b7bb84963a297b1ed334db087c0" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, @@ -14,23 +13,21 @@ "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mellifluous.nvim": { "branch": "main", "commit": "9add9975a067e448da077dab92b70473aab41a76" }, - "mini.icons": { "branch": "main", "commit": "86a633f0dffcfd80110bac86681dbf4b5c37ba5c" }, - "mini.nvim": { "branch": "main", "commit": "939da402095a6ec4229e4de644451cda5bbc3fce" }, + "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, + "mini.nvim": { "branch": "main", "commit": "d570e0b01aabfe949c097983ed6386af60db32ed" }, + "modus-themes.nvim": { "branch": "master", "commit": "b6c46f8066b2d96cb75d5bc7202a9a4c097b5e9f" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" }, - "nordic.nvim": { "branch": "main", "commit": "62acfd4eb008153180670daf81874eb47dd37739" }, "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, "nvim-bufdel": { "branch": "main", "commit": "523d58e94e7212fff3e05c247b962dc8f93bcfde" }, - "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" }, - "nvim-lspconfig": { "branch": "master", "commit": "0a1ac55d7d4ec2b2ed9616dfc5406791234d1d2b" }, + "nvim-cmp": { "branch": "main", "commit": "059e89495b3ec09395262f16b1ad441a38081d04" }, + "nvim-lspconfig": { "branch": "master", "commit": "f757438ead92b2ee7a0eb6bc1b18e1ead513a825" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-treesitter": { "branch": "master", "commit": "86768fdd002c75833414010052a1e95a4760ee32" }, + "nvim-treesitter": { "branch": "master", "commit": "523a9e148919f58eb5a013f76787e57696e00c93" }, "nvim-web-devicons": { "branch": "master", "commit": "4c3a5848ee0b09ecdea73adcd2a689190aeb728c" }, - "oil.nvim": { "branch": "master", "commit": "ab887d926c2665a708fbe9e6c4654042cc5f4c60" }, + "oil.nvim": { "branch": "master", "commit": "302bbaceeafc690e6419e0c8296e804d60cb9446" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "vesper.nvim": { "branch": "main", "commit": "4e96a753a964192b5904598e64366a93eef5449d" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, - "zenbones.nvim": { "branch": "main", "commit": "dbd485fa5d5230d175e024374d41dab5ad71b119" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index d08d8f0..1c91aa5 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -187,7 +187,7 @@ return { { "SmiteshP/nvim-navic", config = function() - vim.o.winbar = "%{%v:lua.require'nvim-navic'.get_location()%}" + -- vim.o.winbar = "%{%v:lua.require'nvim-navic'.get_location()%}" end, }, { diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index c919c00..f022843 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -1,106 +1,106 @@ return { - { - "folke/trouble.nvim", - keys = { - { - "", - function() - require("trouble").next { jump = true, skip_groups = true } - end, - }, - { - "", - function() - require("trouble").prev { jump = true, skip_groups = true } - end, - }, - }, - }, - { - "nvim-telescope/telescope.nvim", - tag = "0.1.8", - dependencies = { "nvim-lua/plenary.nvim" }, - keys = { - { - "dd", - function() - require("telescope.builtin").diagnostics() - end, - desc = "[D]iagnostics", - }, - { - "gd", - function() - require("telescope.builtin").lsp_definitions() - end, - desc = "LSP def", - }, - { - "gr", - function() - require("telescope.builtin").lsp_references() - end, - desc = "[L]SP, Find [R]eferences", - }, - { - "ws", - function() - require("telescope.builtin").lsp_workspace_symbols() - end, - desc = "LSP, [W]orkspace [S]ymbols", - }, - { - "gi", - function() - require("telescope.builtin").lsp_implementations() - end, - desc = "[L]sp, [I]mplementations", - }, - { - "gt", - function() - require("telescope.builtin").lsp_type_definitions() - end, - desc = "[L]SP, Type Definitions", - }, - { - "ff", - function() - local builtin = require "telescope.builtin" - builtin.find_files() - end, - desc = "Telescope: Find files", - }, - { - "fg", - function() - local builtin = require "telescope.builtin" - builtin.buffers() - end, - }, - { - "fg", - function() - local builtin = require "telescope.builtin" - builtin.live_grep() - end, - }, - }, - - config = function() - local builtin = require "telescope.builtin" - local open_with_trouble = require("trouble.sources.telescope").open - - -- Search with telescope and open with trouble - local telescope = require "telescope" - telescope.setup { - defaults = { - mappings = { - i = { [""] = open_with_trouble }, - n = { [""] = open_with_trouble }, - }, + { + "folke/trouble.nvim", + keys = { + { + "", + function() + require("trouble").next { jump = true, skip_groups = true } + end, + }, + { + "", + function() + require("trouble").prev { jump = true, skip_groups = true } + end, + }, }, - } - end, - }, + }, + { + "nvim-telescope/telescope.nvim", + tag = "0.1.8", + dependencies = { "nvim-lua/plenary.nvim" }, + keys = { + { + "dd", + function() + require("telescope.builtin").diagnostics() + end, + desc = "[D]iagnostics", + }, + { + "gd", + function() + require("telescope.builtin").lsp_definitions() + end, + desc = "LSP def", + }, + { + "gr", + function() + require("telescope.builtin").lsp_references() + end, + desc = "[L]SP, Find [R]eferences", + }, + { + "ws", + function() + require("telescope.builtin").lsp_workspace_symbols() + end, + desc = "LSP, [W]orkspace [S]ymbols", + }, + { + "gi", + function() + require("telescope.builtin").lsp_implementations() + end, + desc = "[L]sp, [I]mplementations", + }, + { + "gt", + function() + require("telescope.builtin").lsp_type_definitions() + end, + desc = "[L]SP, Type Definitions", + }, + { + "ff", + function() + local builtin = require "telescope.builtin" + builtin.find_files() + end, + desc = "Telescope: Find files", + }, + { + "fg", + function() + local builtin = require "telescope.builtin" + builtin.buffers() + end, + }, + { + "fg", + function() + local builtin = require "telescope.builtin" + builtin.live_grep() + end, + }, + }, + + config = function() + local builtin = require "telescope.builtin" + local open_with_trouble = require("trouble.sources.telescope").open + + -- Search with telescope and open with trouble + local telescope = require "telescope" + telescope.setup { + defaults = { + mappings = { + i = { [""] = open_with_trouble }, + n = { [""] = open_with_trouble }, + }, + }, + } + end, + }, } diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 4a2e913..7068b56 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -1,70 +1,16 @@ return { { - "ramojus/mellifluous.nvim", + "miikanissi/modus-themes.nvim", lazy = false, priority = 1000, - enabled = false, + enabled = true, config = function() - require("mellifluous").setup { - --colorset = "alduin", - colorset = "mellifluous" - } -- optional, see configuration section. - - vim.cmd [[ colorscheme mellifluous ]] - end, - }, - { - "zenbones-theme/zenbones.nvim", - lazy = false, - priority = 1000, - enabled = false, - dependencies = "rktjmp/lush.nvim", - config = function() - vim.g.zenwritten = { darkness = "stark", solid_vert_split = true, solid_line_nr = true } - vim.cmd [[ colorscheme zenwritten ]] - end, - }, - { - "neanias/everforest-nvim", - version = false, - lazy = false, - priority = 1000, -- make sure to load this before all the other start plugins - -- Optional; default configuration will be used if setup isn't called. - config = function() - require("everforest").setup({ - italics = true, - background = "hard", - dim_inactive_windows = false, - disable_italic_comments = false + require("modus-themes").setup({ + line_nr_column_background = false }) - - vim.cmd [[colorscheme everforest]] + vim.cmd [[ colorscheme modus ]] end }, - { - "datsfilipe/vesper.nvim", - lazy = false, - priority = 1000, - enabled = false, - config = function() - require("vesper").setup { - transparent = false, - } - - vim.cmd [[ colorscheme vesper ]] - end, - }, - { - "AlexvZyl/nordic.nvim", - lazy = false, - priority = 1000, - enabled = false, - config = function() - require("nordic").load { - bright_border = true, - } - end, - }, { "akinsho/bufferline.nvim", version = "*", @@ -105,6 +51,7 @@ return { opts = { diagnostics = "nvim_lsp", + separator_style = "thin", diagnostics_indicator = function(count, level, diagnostics_dict, context) local icon = level:match "error" and " " or " "