From 9eae74aacc099a921e6054ba8b75aad49b9a12cb Mon Sep 17 00:00:00 2001 From: Steven Medeiros Melo <63684299+stevenmelo588@users.noreply.github.com> Date: Sat, 22 Feb 2025 23:25:53 -0500 Subject: [PATCH] Changed the main theme added some extension to telescope --- lazy-lock.json | 18 +- lua/stevenmm/lazy/colorful_winsep.lua | 16 ++ lua/stevenmm/lazy/colors.lua | 44 ++--- lua/stevenmm/lazy/emoji.lua | 28 ++++ lua/stevenmm/lazy/harpoon.lua | 15 +- lua/stevenmm/lazy/lsp.lua | 12 +- lua/stevenmm/lazy/lualine.lua | 229 ++++++++++++++------------ lua/stevenmm/lazy/telescope.lua | 1 + lua/stevenmm/lazy/winbar.lua | 27 +++ lua/stevenmm/lazy_init.lua | 3 +- lua/stevenmm/remap.lua | 1 + lua/stevenmm/variables.lua | 10 ++ 12 files changed, 266 insertions(+), 138 deletions(-) create mode 100644 lua/stevenmm/lazy/colorful_winsep.lua create mode 100644 lua/stevenmm/lazy/emoji.lua create mode 100644 lua/stevenmm/lazy/winbar.lua create mode 100644 lua/stevenmm/variables.lua diff --git a/lazy-lock.json b/lazy-lock.json index 3f2aced..eb31647 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,8 +5,11 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "colorful-winsep.nvim": { "branch": "alpha", "commit": "0070484536ea55ec64a8453d41e3badace04a61a" }, + "emoji.nvim": { "branch": "main", "commit": "5c68359b56d2470583832b6b2b559566c5b39dc8" }, "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, - "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, + "fzf-lua": { "branch": "main", "commit": "9b84b53f3297d4912d7eb95b979e9b27e2e61281" }, + "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }, "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, @@ -17,17 +20,18 @@ "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" }, "mini.surround": { "branch": "main", "commit": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "7af2c37192deae28d1305ae9e68544f7fb5408e1" }, - "nvim-tree.lua": { "branch": "master", "commit": "80523101f0ae48b7f1990e907b685a3d79776c01" }, - "nvim-treesitter": { "branch": "master", "commit": "00a513f87ee3c339c2024b08db3eb63ba7736ed6" }, + "nvim-lspconfig": { "branch": "master", "commit": "6b63bdf2399b9bedf93297d98419550523a9ad68" }, + "nvim-tree.lua": { "branch": "master", "commit": "6709463b2d18e77f7a946027917aa00d4aaed6f4" }, + "nvim-treesitter": { "branch": "master", "commit": "5774e7d3da4f681296a87fcd85d17779ad362a4f" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-ts-autotag": { "branch": "main", "commit": "4c00b86bd1246ba9c4cd50a823d8296cd2eb9663" }, + "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" }, "plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "rose-pine": { "branch": "main", "commit": "20c7940da844aa4f162a64e552ae3c7e9fdc3b93" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" }, "telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" }, "vim-prettier": { "branch": "master", "commit": "7dbdbb12c50a9f4ba72390cce2846248e4368fd0" }, - "which-key.nvim": { "branch": "main", "commit": "5bf7a73fe851896d5ac26d313db849bf00f45b78" } + "vscode": { "branch": "main", "commit": "298c5ce4750a256ea208b72d7a472b8824ef2a49" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, + "winbar.nvim": { "branch": "main", "commit": "13739fdb31be51a1000486189662596f07a59a31" } } diff --git a/lua/stevenmm/lazy/colorful_winsep.lua b/lua/stevenmm/lazy/colorful_winsep.lua new file mode 100644 index 0000000..7b9f895 --- /dev/null +++ b/lua/stevenmm/lazy/colorful_winsep.lua @@ -0,0 +1,16 @@ +require("stevenmm.variables") +return { + 'nvim-zh/colorful-winsep.nvim', + config = function () + local winsep = require("colorful-winsep") + local bg = require("vscode.colors").get_colors().vscBack + winsep.setup({ + highlight = { + fg = "#A066E8", + bg = bg, + }, + no_exec_files = EXCLUDED_FILETYPES_ARRAY, + symbols = { "─", "│", "╭", "╮", "╰", "╯" }, + }) + end +} diff --git a/lua/stevenmm/lazy/colors.lua b/lua/stevenmm/lazy/colors.lua index 5fdb773..783fc82 100644 --- a/lua/stevenmm/lazy/colors.lua +++ b/lua/stevenmm/lazy/colors.lua @@ -1,5 +1,6 @@ function ColorMyPencils(color) - color = color or "rose-pine-moon" + -- color = color or "rose-pine-moon" + color = color or "vscode" vim.cmd.colorscheme(color) vim.api.nvim_set_hl(0, "Normal", {bg = "none" }) @@ -7,24 +8,29 @@ function ColorMyPencils(color) end return { - { - "rose-pine/neovim", - name = "rose-pine", - config = function() - require("rose-pine").setup({ - variant = "moon", + { + -- "rose-pine/neovim", + "Mofiqul/vscode.nvim", + -- name = "rose-pine", + name = "vscode", + lazy = false, + prority = 1000, + config = function() + -- require("rose-pine").setup({ + require("vscode").setup({ + transparent = true, + italic_comments = true, + -- styles = { + -- bold = false, + -- italic = false, + -- transparency = true, + -- }, + -- disable_background = true, + }) - styles = { - bold = true, - italic = false, - transparency = true, - }, - disable_background = true, - }) + vim.cmd("colorscheme vscode") - vim.cmd("colorscheme rose-pine") - - ColorMyPencils() - end - }, + ColorMyPencils() + end + }, } diff --git a/lua/stevenmm/lazy/emoji.lua b/lua/stevenmm/lazy/emoji.lua new file mode 100644 index 0000000..9b1f6a9 --- /dev/null +++ b/lua/stevenmm/lazy/emoji.lua @@ -0,0 +1,28 @@ +return { + "allaman/emoji.nvim", + version = "1.0.0", -- optionally pin to a tag + ft = "markdown", -- adjust to your needs + dependencies = { + -- util for handling paths + "nvim-lua/plenary.nvim", + -- optional for nvim-cmp integration + "hrsh7th/nvim-cmp", + -- optional for telescope integration + "nvim-telescope/telescope.nvim", + -- optional for fzf-lua integration via vim.ui.select + "ibhagwan/fzf-lua", + }, + -- opts = { + -- -- default is false, also needed for blink.cmp integration! + -- enable_cmp_integration = true, + -- -- optional if your plugin installation directory + -- -- is not vim.fn.stdpath("data") .. "/lazy/ + -- plugin_path = vim.fn.expand("$HOME/plugins/"), + -- }, + config = function() + require("emoji").setup() + -- optional for telescope integration + -- local ts = require('telescope').load_extension 'emoji' + -- vim.keymap.set('n', 'se', ts.emoji, { desc = '[S]earch [E]moji' }) + end, +} diff --git a/lua/stevenmm/lazy/harpoon.lua b/lua/stevenmm/lazy/harpoon.lua index d5aeb2e..b906d38 100644 --- a/lua/stevenmm/lazy/harpoon.lua +++ b/lua/stevenmm/lazy/harpoon.lua @@ -1,9 +1,20 @@ return { "ThePrimeagen/harpoon", - + branch = "harpoon2", + -- dependencies = { + -- "nvim-lua/plenary.nvim" + -- }, global_settings = { - } + }, + + -- config = function () + -- local harpoon = require('harpoon') + -- harpoon:setup({}) + -- + -- -- vim.keymap.set("n", "a", function () harpoon:list():add() end) + -- + -- end } diff --git a/lua/stevenmm/lazy/lsp.lua b/lua/stevenmm/lazy/lsp.lua index 1263fee..8bdf667 100644 --- a/lua/stevenmm/lazy/lsp.lua +++ b/lua/stevenmm/lazy/lsp.lua @@ -112,10 +112,10 @@ return { -- virtual_text = false, signs = { text = { - [vim.diagnostic.severity.ERROR] = '', - [vim.diagnostic.severity.WARN] = '', - [vim.diagnostic.severity.INFO] = '󰋼', - [vim.diagnostic.severity.HINT] = '', + [vim.diagnostic.severity.ERROR] = '', + [vim.diagnostic.severity.WARN] = '', + [vim.diagnostic.severity.INFO] = '', + [vim.diagnostic.severity.HINT] = '󰌶', } }, update_in_insert = true, @@ -129,8 +129,8 @@ return { }, }) - vim.o.updatetime = 250 - vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]] + -- vim.o.updatetime = 250 + -- vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]] end } diff --git a/lua/stevenmm/lazy/lualine.lua b/lua/stevenmm/lazy/lualine.lua index 64abf2c..6fca356 100644 --- a/lua/stevenmm/lazy/lualine.lua +++ b/lua/stevenmm/lazy/lualine.lua @@ -1,131 +1,154 @@ -- lua/plugins/lualine.lua +require("stevenmm.variables") + local nvimtree = { filetypes = { "NvimTree" }, sections = { - lualine_c = { "buffers" }, + lualine_c = { "" }, }, } +-- local excluded_filetypes_array = { +-- "lsp-installer", +-- "lspinfo", +-- "lazy", +-- "help", +-- "netrw", +-- "man", +-- "checkhealth", +-- } return { "nvim-lualine/lualine.nvim", - dependencies = { + -- "lua.stevenmm.variables", "nvim-tree/nvim-web-devicons", }, - + lazy = false, + priority = 999, config = function() local lualine = require('lualine') lualine.setup({ - options = { - theme = 'rose-pine', - globalstatus = true, - -- fmt = default, - -- fmt = string.upper, --- disabled_filetypes = { --- "NvimTree" --- }, - ignore_focus = { - + options = { + theme = 'auto', + section_separators = { left = "", right = "" }, + -- always_show_tabline = false, + -- ignore_focus = {}, + -- icons_enabled = true, + -- refresh = { + -- statusline = 100, + -- tabline = 100, + -- winbar = 100, + -- }, + disabled_filetypes = { + statusline = EXCLUDED_FILETYPES_ARRAY, + winbar = EXCLUDED_FILETYPES_ARRAY, + }, + globalstatus = true, }, - - refresh = { - statusline = 100, - tabline = 100, - winbar = 100, - }, - }, - sections = { - lualine_a = { --- { --- 'windows' --- }, - { - 'diff', - colored = false, - diff_color = { - added = 'LuaLineDiffAdd', - modified = 'LuaLineDiffChange', - removed = 'LuaLineDiffDelete', + sections = { + lualine_a = { + -- { + -- 'buffers', + -- show_filename_only = true, + -- show_modified_status = false, + -- mode = 4, + -- filetype_names = { + -- NvimTree = 'NvimTree' + -- }, + -- }, + { + 'mode', + -- fmt = function(str) return '[' .. str:sub(1,2) .. ']' end, + -- separator = "|" }, }, --- { --- 'buffers', --- show_filename_only = true, --- show_modified_status = false, --- --- mode = 4, --- --- filetype_names = { --- NvimTree = 'NvimTree' --- }, --- }, - { - 'mode', --- fmt = function(str) return '[' .. str:sub(1,1) .. ']' end, - }, - }, - lualine_b = { - { 'branch' } - }, - lualine_c = { - { - 'filetype', - icons_enabled = true, - icon_only = true, - icon = { align = 'center' }, - separator = "", - }, - { - 'filename', - file_status = true, - newfile_status = false, - path = 0, - fmt = string.lower, - shorting_target = 40, - - symbols = { - modified = '[+]', - readonly = '[-]', - unamed = '[No Name]', - newfile = '[New]', + lualine_b = { + { + 'branch', + separator = "" + }, + { + 'diff', }, - } - }, - lualine_x = { - { - require("lazy.status").updates, - cond = require("lazy.status").has_updates, - color = { fg = "#ff9e64" }, }, - { - 'diagnostics', + lualine_c = { + { + 'filetype', + -- icons_enabled = true, + icon_only = false, + icon = { align = 'left' }, + separator = "", + }, + -- { + -- -- 'filetype', + -- 'filename', + -- -- icons_enabled = true, + -- -- file_status = false, + -- -- newfile_status = false, + -- -- path = 0, + -- -- fmt = string.lower, + -- -- shorting_target = 40, + -- + -- symbols = { + -- modified = '[+]', + -- readonly = '[-]', + -- unamed = '[No Name]', + -- newfile = '[New]', + -- }, + -- } }, --- { --- 'filetype', --- colored = true, --- icons_enabled = true, --- icon_only = true, --- icon = { align = 'center' } --- } - }, - lualine_y = { - { - 'location', + lualine_x = { + { + require("lazy.status").updates, + cond = require("lazy.status").has_updates, + color = { fg = "#ff9e64" }, + }, + { + 'diagnostics', + update_in_insert = true, + separator = "", + }, + }, + lualine_y = { + { + 'location', + }, + }, + lualine_z = { + { + 'datetime', + -- icons_enabled = true, + -- icon = { '' }, + -- separator = "🌴", + style = '%H:%M:%S', + }, }, }, - lualine_z = { - { - 'datetime', - icons_enabled = true, - icon = { '' }, - style = '%H:%M:%S', + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { + { + "filetypes", + icon_only = true, + }, + { + "filename", + path = 1, + -- fmt = format_name + + }, }, + lualine_x = {}, + lualine_y = {}, + lualine_z = {}, }, - }, - extensions = { - nvimtree - } - }) + winbar = { + }, + extensions = { + nvimtree + }, + }) end, } diff --git a/lua/stevenmm/lazy/telescope.lua b/lua/stevenmm/lazy/telescope.lua index 9412946..e3c6d63 100644 --- a/lua/stevenmm/lazy/telescope.lua +++ b/lua/stevenmm/lazy/telescope.lua @@ -15,6 +15,7 @@ return { -- -- }) telescope.load_extension('harpoon') + telescope.load_extension('emoji') end -- extensions = { -- diff --git a/lua/stevenmm/lazy/winbar.lua b/lua/stevenmm/lazy/winbar.lua new file mode 100644 index 0000000..8fc144b --- /dev/null +++ b/lua/stevenmm/lazy/winbar.lua @@ -0,0 +1,27 @@ +return { + "fgheng/winbar.nvim", + + config = function () + require('winbar').setup({ + enabled = true, + show_file_path = false, + show_symbols = true, + colors = { + path = '', + file_name = '#ffffff', + symbols = '', + }, + icons = { + file_icon_default = '', + separator = '', + editor_state = '', + lock_icon = '', + }, + -- separator = '', + exclude_filetype = { + 'help', + 'NvimTree' + } + }) + end +} diff --git a/lua/stevenmm/lazy_init.lua b/lua/stevenmm/lazy_init.lua index 9d4b60b..07dd3e1 100644 --- a/lua/stevenmm/lazy_init.lua +++ b/lua/stevenmm/lazy_init.lua @@ -13,5 +13,6 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup({ spec = "stevenmm.lazy", - change_detection = { notify = false } + change_detection = { notify = false }, + -- "nvim-lua/plenary.nvim" }) diff --git a/lua/stevenmm/remap.lua b/lua/stevenmm/remap.lua index 454fa72..1e7f019 100644 --- a/lua/stevenmm/remap.lua +++ b/lua/stevenmm/remap.lua @@ -7,3 +7,4 @@ keyset("n", "ma", ":Mason", { silent = true }) keyset("n", "na", ":NvimTreeToggle", { silent = true }) keyset("n", "fb", ":Telescope file_browser path=%:p:h", { noremap = true, silent = true }) keyset("n", "ha", ":Telescope harpoon marks", { noremap = true, silent = true }) +keyset('n', 'se', ":Telescope emoji", { desc = '[S]earch [E]moji' }) diff --git a/lua/stevenmm/variables.lua b/lua/stevenmm/variables.lua new file mode 100644 index 0000000..d3df614 --- /dev/null +++ b/lua/stevenmm/variables.lua @@ -0,0 +1,10 @@ +EXCLUDED_FILETYPES_ARRAY = { + "lsp-installer", + "lspinfo", + "lazy", + "help", + "netrw", + "man", + "checkhealth", + "TelescopePrompt" +}