diff --git a/init.lua b/init.lua index f91afb78..d1eb412c 100644 --- a/init.lua +++ b/init.lua @@ -166,12 +166,14 @@ vim.keymap.set('n', 'fF', function() }) end, { desc = '[S]earch [F]iles (no ignore)' }) -vim.keymap.set('n', 'fi', telscopeb.git_files, { desc = 'Search [G]it [F]iles' }) -vim.keymap.set('n', 'ff', telscopeb.find_files, { desc = '[S]earch [F]iles' }) -vim.keymap.set('n', 'fh', telscopeb.help_tags, { desc = '[S]earch [H]elp' }) -vim.keymap.set('n', 'fw', telscopeb.grep_string, { desc = '[S]earch current [W]ord' }) -vim.keymap.set('n', 'fg', telscopeb.live_grep, { desc = '[S]earch by [G]rep' }) -vim.keymap.set('n', 'fd', telscopeb.diagnostics, { desc = '[S]earch [D]iagnostics' }) +vim.keymap.set('n', 'fG', telscopeb.git_files, { desc = '[F]ind [G]it' }) +vim.keymap.set('n', 'ff', telscopeb.find_files, { desc = '[F]ind [F]iles' }) +vim.keymap.set('n', 'fh', telscopeb.help_tags, { desc = '[F]ind [H]elp' }) +vim.keymap.set('n', 'fw', telscopeb.grep_string, { desc = '[F]ind current [W]ord' }) +vim.keymap.set('n', 'fg', telscopeb.live_grep, { desc = '[F]ind [g]rep' }) +vim.keymap.set('n', 'fd', telscopeb.diagnostics, { desc = '[F]ind [D]iagnostics' }) +vim.keymap.set('n', 'fk', telscopeb.keymaps, { desc = '[F]ind [K]eymap' }) +vim.keymap.set('n', 'fc', telscopeb.colorscheme, { desc = '[F]ind [C]olorscheme' }) -- [[ Configure Treesitter ]] -- See `:help nvim-treesitter` diff --git a/lazy-lock.json b/lazy-lock.json index f2627268..6e993969 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -7,7 +7,7 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "conjure": { "branch": "master", "commit": "f50d4db821489f66ff93afe58155eef42c273a5d" }, - "darcula-dark.nvim": { "branch": "main", "commit": "0b4b8f582bedfc1a21e8902561331313f3c9ee28" }, + "darcula-solid.nvim": { "branch": "main", "commit": "d950b9ca20096313c435a93e57af7815766f3d3d" }, "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, @@ -16,18 +16,19 @@ "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, + "lush.nvim": { "branch": "main", "commit": "2e8d34e748642621d761a65e3c2a198154b914e8" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, + "nvim-lspconfig": { "branch": "master", "commit": "f12f1b9e877b1e6e2ef7eae1a524d8253af4243d" }, "nvim-metals": { "branch": "main", "commit": "d90ea43ded7ec651606b0a533ae9740083436e58" }, "nvim-paredit": { "branch": "master", "commit": "d9bc8d34d440b4daa56aa16cc440b674facd8f89" }, "nvim-paredit-fennel": { "branch": "master", "commit": "33380e743109c89fae6823cea4b9f81e635dbeff" }, "nvim-paredit-scheme": { "branch": "master", "commit": "3e5838290dd57116457e4b11eb6ba21e83b260a4" }, "nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" }, - "nvim-treesitter": { "branch": "master", "commit": "cbf0dfd92f3149a378164ab781d0b0a13da5b04a" }, + "nvim-treesitter": { "branch": "master", "commit": "76700e147bfab7630e6b97f91b32397175e8153f" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, diff --git a/lua/custom/plugins/line.lua b/lua/custom/plugins/line.lua index 3d08f3c2..02138f02 100644 --- a/lua/custom/plugins/line.lua +++ b/lua/custom/plugins/line.lua @@ -5,7 +5,7 @@ return { opts = { options = { icons_enabled = true, - theme = 'jellybeans', + theme = 'auto', component_separators = '|', section_separators = '', }, diff --git a/lua/custom/plugins/theme.lua b/lua/custom/plugins/theme.lua index 3f511347..40923cf5 100644 --- a/lua/custom/plugins/theme.lua +++ b/lua/custom/plugins/theme.lua @@ -1,7 +1,12 @@ return { - 'xiantang/darcula-dark.nvim', - priority = 1000, - config = function() - vim.cmd.colorscheme 'darcula-dark' - end, + { + 'santos-gabriel-dario/darcula-solid.nvim', + priority = 1000, + dependencies = { + 'rktjmp/lush.nvim' + }, + config = function() + vim.cmd.colorscheme 'darcula-solid' + end, + }, }