From 70fa6519abe34d9251b4cef6122257fc0edbd4aa Mon Sep 17 00:00:00 2001 From: Marcelo Date: Sun, 30 Mar 2025 04:26:45 -0300 Subject: Moved plugin files into ux.lua and skin.lua. For usability and appearance related, respectively. --- lua/config/plugins/colorizer.lua | 14 ----- lua/config/plugins/colorscheme.lua | 64 -------------------- lua/config/plugins/comments.lua | 7 --- lua/config/plugins/icons.lua | 36 ----------- lua/config/plugins/lastplace.lua | 17 ------ lua/config/plugins/skin.lua | 119 +++++++++++++++++++++++++++++++++++++ lua/config/plugins/ux.lua | 37 ++++++++++++ lua/config/plugins/whichkey.lua | 13 ---- 8 files changed, 156 insertions(+), 151 deletions(-) delete mode 100644 lua/config/plugins/colorizer.lua delete mode 100644 lua/config/plugins/colorscheme.lua delete mode 100644 lua/config/plugins/comments.lua delete mode 100644 lua/config/plugins/icons.lua delete mode 100644 lua/config/plugins/lastplace.lua create mode 100644 lua/config/plugins/skin.lua create mode 100644 lua/config/plugins/ux.lua delete mode 100644 lua/config/plugins/whichkey.lua diff --git a/lua/config/plugins/colorizer.lua b/lua/config/plugins/colorizer.lua deleted file mode 100644 index b3ba3c8..0000000 --- a/lua/config/plugins/colorizer.lua +++ /dev/null @@ -1,14 +0,0 @@ -return { - { - "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup({ - css = { css = true }, - sass = { css = true }, - javascript = { rgb_fn = true }, - "haml", - "html", - }) - end, - }, -} diff --git a/lua/config/plugins/colorscheme.lua b/lua/config/plugins/colorscheme.lua deleted file mode 100644 index 056e4b6..0000000 --- a/lua/config/plugins/colorscheme.lua +++ /dev/null @@ -1,64 +0,0 @@ -return { - -- NeoVim dark colorscheme inspired by the colors of the famous painting by Katsushika Hokusai. - { - "rebelot/kanagawa.nvim", - dependencies = { "nvim-treesitter/nvim-treesitter" }, - config = function() - require("kanagawa").setup({ - compile = false, - undercurl = true, - commentStyle = { italic = true }, - functionStyle = {}, - keywordStyle = { italic = true }, - statementStyle = { bold = true }, - typeStyle = {}, - transparent = false, - dimInactive = true, - terminalColors = true, - colors = { - palette = {}, - theme = { wave = {}, lotus = {}, dragon = {}, all = {} }, - }, - theme = "dragon", - background = { - dark = "wave", - light = "lotus" - }, - overrides = function(colors) - local theme = colors.theme - local makeDiagnosticColor = function(color) - local c = require("kanagawa.lib.color") - return { fg = color, bg = c(color):blend(theme.ui.bg, 0.95):to_hex() } - end - return { - DiagnosticVirtualTextHint = makeDiagnosticColor(theme.diag.hint), - DiagnosticVirtualTextInfo = makeDiagnosticColor(theme.diag.info), - DiagnosticVirtualTextWarn = makeDiagnosticColor(theme.diag.warning), - DiagnosticVirtualTextError = makeDiagnosticColor(theme.diag.error), - - NormalFloat = { bg = "none" }, - FloatBorder = { bg = "none" }, - FloatTitle = { bg = "none" }, - - NormalDark = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m3 }, - LazyNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, - - Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1 }, -- add `blend = vim.o.pumblend` to enable transparency - PmenuSel = { fg = "NONE", bg = theme.ui.bg_p2 }, - PmenuSbar = { bg = theme.ui.bg_m1 }, - PmenuThumb = { bg = theme.ui.bg_p2 }, - - TelescopeTitle = { fg = theme.ui.special, bold = true }, - TelescopePromptNormal = { bg = theme.ui.bg_p1 }, - TelescopePromptBorder = { fg = theme.ui.bg_p1, bg = theme.ui.bg_p1 }, - TelescopeResultsNormal = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m1 }, - TelescopeResultsBorder = { fg = theme.ui.bg_m1, bg = theme.ui.bg_m1 }, - TelescopePreviewNormal = { bg = theme.ui.bg_dim }, - TelescopePreviewBorder = { bg = theme.ui.bg_dim, fg = theme.ui.bg_dim }, - } - end, - }) - vim.cmd.colorscheme("kanagawa") - end, - }, -} diff --git a/lua/config/plugins/comments.lua b/lua/config/plugins/comments.lua deleted file mode 100644 index 1ec45f1..0000000 --- a/lua/config/plugins/comments.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - { - "folke/todo-comments.nvim", - dependencies = { "nvim-lua/plenary.nvim" }, - opts = {}, - }, -} diff --git a/lua/config/plugins/icons.lua b/lua/config/plugins/icons.lua deleted file mode 100644 index 54a924e..0000000 --- a/lua/config/plugins/icons.lua +++ /dev/null @@ -1,36 +0,0 @@ -return { - { - "nvim-tree/nvim-web-devicons", - lazy = false, - config = function() - require("nvim-web-devicons").setup({ - color_icons = true, - default = true, - strict = true, - variant = "dark", - override = { - zsh = { - icon = "", - color = "#428850", - cterm_color = "65", - name = "Zsh" - }, - }, - override_by_filename = { - [".gitignore"] = { - icon = "", - color = "#f1502f", - name = "Gitignore" - }, - }, - override_by_extension = { - ["log"] = { - icon = "", - color = "#81e043", - name = "Log" - }, - }, - }) - end, - }, -} diff --git a/lua/config/plugins/lastplace.lua b/lua/config/plugins/lastplace.lua deleted file mode 100644 index f409397..0000000 --- a/lua/config/plugins/lastplace.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - -- Intelligently reopen files at your last edit position in Vim. - { - "ethanholz/nvim-lastplace", - config = function() - require("nvim-lastplace").setup({ - lastplace_ignore_buftype = { "quickfix", "nofile", "help" }, - lastplace_ignore_filetype = { "gitcommit", "gitrebase" }, - lastplace_open_folds = true - }) - end - }, - - -- vim-fetch enables Vim to process line and column jump specifications - -- in file paths as found in stack traces and similar output. - { "wsdjeg/vim-fetch" }, -} diff --git a/lua/config/plugins/skin.lua b/lua/config/plugins/skin.lua new file mode 100644 index 0000000..5ed13b1 --- /dev/null +++ b/lua/config/plugins/skin.lua @@ -0,0 +1,119 @@ +return { + -- NeoVim dark colorscheme inspired by the colors of the famous painting by Katsushika Hokusai. + { + "rebelot/kanagawa.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + config = function() + require("kanagawa").setup({ + compile = false, + undercurl = true, + commentStyle = { italic = true }, + functionStyle = {}, + keywordStyle = { italic = true }, + statementStyle = { bold = true }, + typeStyle = {}, + transparent = false, + dimInactive = true, + terminalColors = true, + colors = { + palette = {}, + theme = { wave = {}, lotus = {}, dragon = {}, all = {} }, + }, + theme = "dragon", + background = { + dark = "wave", + light = "lotus" + }, + overrides = function(colors) + local theme = colors.theme + local makeDiagnosticColor = function(color) + local c = require("kanagawa.lib.color") + return { fg = color, bg = c(color):blend(theme.ui.bg, 0.95):to_hex() } + end + return { + DiagnosticVirtualTextHint = makeDiagnosticColor(theme.diag.hint), + DiagnosticVirtualTextInfo = makeDiagnosticColor(theme.diag.info), + DiagnosticVirtualTextWarn = makeDiagnosticColor(theme.diag.warning), + DiagnosticVirtualTextError = makeDiagnosticColor(theme.diag.error), + + NormalFloat = { bg = "none" }, + FloatBorder = { bg = "none" }, + FloatTitle = { bg = "none" }, + + NormalDark = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m3 }, + LazyNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim }, + + Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1 }, -- add `blend = vim.o.pumblend` to enable transparency + PmenuSel = { fg = "NONE", bg = theme.ui.bg_p2 }, + PmenuSbar = { bg = theme.ui.bg_m1 }, + PmenuThumb = { bg = theme.ui.bg_p2 }, + + TelescopeTitle = { fg = theme.ui.special, bold = true }, + TelescopePromptNormal = { bg = theme.ui.bg_p1 }, + TelescopePromptBorder = { fg = theme.ui.bg_p1, bg = theme.ui.bg_p1 }, + TelescopeResultsNormal = { fg = theme.ui.fg_dim, bg = theme.ui.bg_m1 }, + TelescopeResultsBorder = { fg = theme.ui.bg_m1, bg = theme.ui.bg_m1 }, + TelescopePreviewNormal = { bg = theme.ui.bg_dim }, + TelescopePreviewBorder = { bg = theme.ui.bg_dim, fg = theme.ui.bg_dim }, + } + end, + }) + vim.cmd.colorscheme("kanagawa") + end, + }, + + { + "norcalli/nvim-colorizer.lua", + config = function() + require("colorizer").setup({ + css = { css = true }, + sass = { css = true }, + javascript = { rgb_fn = true }, + "haml", + "html", + }) + end, + }, + + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + }, + + { + "nvim-tree/nvim-web-devicons", + lazy = false, + config = function() + require("nvim-web-devicons").setup({ + color_icons = true, + default = true, + strict = true, + variant = "dark", + override = { + zsh = { + icon = "", + color = "#428850", + cterm_color = "65", + name = "Zsh" + }, + }, + override_by_filename = { + [".gitignore"] = { + icon = "", + color = "#f1502f", + name = "Gitignore" + }, + }, + override_by_extension = { + ["log"] = { + icon = "", + color = "#81e043", + name = "Log" + }, + }, + }) + end, + }, +} + diff --git a/lua/config/plugins/ux.lua b/lua/config/plugins/ux.lua new file mode 100644 index 0000000..d69db36 --- /dev/null +++ b/lua/config/plugins/ux.lua @@ -0,0 +1,37 @@ +return { + -- WhichKey is a lua plugin that displays a popup with possible keybindings of the command you started typing. + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 10000 + end, + opts = { + }, + }, + + -- Delete buffers and close files in Vim without closing your windows or messing up your layout. + { + 'moll/vim-bbye', + keys = { + { 'q', 'Bdelete', desc = 'Delete buffers and close files' }, + }, + }, + + -- Intelligently reopen files at your last edit position in Vim. + { + "ethanholz/nvim-lastplace", + config = function() + require("nvim-lastplace").setup({ + lastplace_ignore_buftype = { "quickfix", "nofile", "help" }, + lastplace_ignore_filetype = { "gitcommit", "gitrebase" }, + lastplace_open_folds = true + }) + end + }, + + -- vim-fetch enables Vim to process line and column jump specifications + -- in file paths as found in stack traces and similar output. + { "wsdjeg/vim-fetch" }, +} diff --git a/lua/config/plugins/whichkey.lua b/lua/config/plugins/whichkey.lua deleted file mode 100644 index beff180..0000000 --- a/lua/config/plugins/whichkey.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - -- WhichKey is a lua plugin that displays a popup with possible keybindings of the command you started typing. - { - "folke/which-key.nvim", - event = "VeryLazy", - init = function() - vim.o.timeout = true - vim.o.timeoutlen = 10000 - end, - opts = { - }, - }, -} -- cgit v1.2.3